OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/json/json_string_value_serializer.h" | 8 #include "base/json/json_string_value_serializer.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 // Get the test results. | 223 // Get the test results. |
224 ASSERT_TRUE(GetTestCount(tab.get(), test_count)); | 224 ASSERT_TRUE(GetTestCount(tab.get(), test_count)); |
225 ASSERT_TRUE(GetTestsFailed(tab.get(), tests_failed)); | 225 ASSERT_TRUE(GetTestsFailed(tab.get(), tests_failed)); |
226 ASSERT_GT(*test_count, 0); | 226 ASSERT_GT(*test_count, 0); |
227 } | 227 } |
228 | 228 |
229 DISALLOW_COPY_AND_ASSIGN(DomCheckerTest); | 229 DISALLOW_COPY_AND_ASSIGN(DomCheckerTest); |
230 }; | 230 }; |
231 | 231 |
232 // Always fails, see but http://crbug.com/21321 | 232 // Always fails, see but http://crbug.com/21321 |
233 TEST_F(DomCheckerTest, FAILS_File) { | 233 TEST_F(DomCheckerTest, DISABLED_File) { |
234 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest)) | 234 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest)) |
235 return; | 235 return; |
236 | 236 |
237 ResultsList new_passes, new_failures; | 237 ResultsList new_passes, new_failures; |
238 RunTest(false, &new_passes, &new_failures); | 238 RunTest(false, &new_passes, &new_failures); |
239 PrintResults(new_passes, new_failures); | 239 PrintResults(new_passes, new_failures); |
240 } | 240 } |
241 | 241 |
242 // This test was previously failing because it was looking for an | 242 // This test was previously failing because it was looking for an |
243 // expected results file that didn't exist. Fixing that bug revealed | 243 // expected results file that didn't exist. Fixing that bug revealed |
244 // that the expected results weren't correct anyway. | 244 // that the expected results weren't correct anyway. |
245 // http://crbug.com/21321 | 245 // http://crbug.com/21321 |
246 TEST_F(DomCheckerTest, FAILS_Http) { | 246 TEST_F(DomCheckerTest, DISABLED_Http) { |
247 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest)) | 247 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest)) |
248 return; | 248 return; |
249 | 249 |
250 ResultsList new_passes, new_failures; | 250 ResultsList new_passes, new_failures; |
251 RunTest(true, &new_passes, &new_failures); | 251 RunTest(true, &new_passes, &new_failures); |
252 PrintResults(new_passes, new_failures); | 252 PrintResults(new_passes, new_failures); |
253 } | 253 } |
254 | 254 |
255 } // namespace | 255 } // namespace |
OLD | NEW |