test rename overhaul: step 7 - corelib tests

Review URL: https://chromiumcodereview.appspot.com//10244009

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@7096 260f80e4-7a28-3924-810f-c04153c831b5

tests/corelib/corelib-leg.status

@@ -1,28 +0,0 @@
-# Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-[ $compiler == dart2js && $checked ]
-*: Skip
-
-
-[ $compiler == dart2js ]
-MathParseDoubleTest: Fail # Expect.equals(expected: <78187493520>, actual: <0>)
-
-
-# Bad test, assumes RegExp.allMatches returns a Collection.
-RegExpAllMatchesTest: Fail, OK # NoSuchMethodException : method not found: 'forEach'
-
-RegExp4Test: Fail, OK # Expects exception from const constructor.
-
-
-BigIntegerVMTest: Fail, OK # VM specific test.
-GrowableObjectArray2VMTest: Fail, OK # VM specific test.
-GrowableObjectArrayVMTest: Fail, OK # VM specific test.
-StringBaseVMTest: Fail, OK # VM specific test.
-
-[ $compiler == dart2js && $runtime == none ]
-*: Fail, Pass # TODO(ahe): Triage these tests.
-
-[ $compiler == dart2js && $runtime == drt ]
-ListSortTest: Fail, Pass # Issue 2667

tests/corelib/corelib.status

@@ -3,44 +3,44 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler == none ]
-UnicodeTest: Fail        # Bug 5163868
-*DartcTest: Skip
+unicode_test: Fail        # Bug 5163868
+*dartc_test: Skip
 
 [ $arch == ia32 ]
 
 
 [ $compiler == dartc ]
-*VMTest: Skip
+*vm_test: Skip
 
 [ $compiler == frog ]
 # VM or DartC specific tests not to be run by Frog. See language.status.
-*VMTest: Skip
-*VMNegativeTest: Skip
-*DartcTest: Skip
-*DartcNegativeTest: Skip
+*vm_test: Skip
+*vm_negative_test: Skip
+*dartc_test: Skip
+*dartc_negative_test: Skip
 # Note: Correctly skips 4 VMTests that rely on VM internals
 
-ConstList*: Fail # 'const' is not currently checked.
-CoreRuntimeTypesTest: Fail
-ForInTest: Fail
-ListTest: Fail
-MapsTest: Fail
-MathParseDoubleTest: Fail
-RegExpAllMatchesTest: Fail
-RegExp4Test: Fail # New test added on 10/28.
-StopwatchTest: Pass,Fail # Issue 2398
-StringPatternTest: Fail
-StringSubstringTest: Fail
-StringTest: Fail  # Needs index out of range checks.
+const_list_*: Fail # 'const' is not currently checked.
+core_runtime_types_test: Fail
+for_in_test: Fail
+list_test: Fail
+maps_test: Fail
+math_parse_double_test: Fail
+reg_exp_all_matches_test: Fail
+reg_exp4_test: Fail # New test added on 10/28.
+stopwatch_test: Pass,Fail # Issue 2398
+string_pattern_test: Fail
+string_substring_test: Fail
+string_test: Fail  # Needs index out of range checks.
 
 [ $compiler == frog && $runtime == drt ]
-ListSortTest: Fail, Pass # Issue 2667
+list_sort_test: Fail, Pass # Issue 2667
 
 [ $compiler == frog && $runtime == none ]
 *: Skip
 
 [ $runtime == ff || $runtime == ie ]
-UnicodeTest: Fail
+unicode_test: Fail
 
 # TODO(jmesserly): now that we have a bot, we need to set up Opera testing.
 [ $runtime == opera ]
@@ -58,3 +58,24 @@ UnicodeTest: Fail
 [ $arch == arm ]
 *: Skip
 
+[ $compiler == dart2js && $checked ]
+*: Skip
+
+[ $compiler == dart2js ]
+math_parse_double_test: Fail # Expect.equals(expected: <78187493520>, actual: <0>)
+
+# Bad test, assumes RegExp.allMatches returns a Collection.
+reg_exp_all_matches_test: Fail, OK # NoSuchMethodException : method not found: 'forEach'
+
+reg_exp4_test: Fail, OK # Expects exception from const constructor.
+
+big_integer_vm_test: Fail, OK # VM specific test.
+growable_object_array2_vm_test: Fail, OK # VM specific test.
+growable_object_array_vm_test: Fail, OK # VM specific test.
+string_base_vm_test: Fail, OK # VM specific test.
+
+[ $compiler == dart2js && $runtime == none ]
+*: Fail, Pass # TODO(ahe): Triage these tests.
+
+[ $compiler == dart2js && $runtime == drt ]
+list_sort_test: Fail, Pass # Issue 2667

tests/corelib/list_sort_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #library("ListSortTest.dart");
-#source("SortHelper.dart");
+#source("sort_helper.dart");
 
 class ListSortTest {
   static void testMain() {

tests/corelib/sort_test.dart

@@ -5,7 +5,7 @@
 // Dart test for sort routines.
 #library("SortTest.dart");
 #import("dart:coreimpl");
-#source("SortHelper.dart");
+#source("sort_helper.dart");
 
 main() {
   var compare = (a, b) => a.compareTo(b);

tests/corelib/test_config.dart

@@ -1,16 +0,0 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-#library("corelib_test_config");
-
-#import("../../tools/testing/dart/test_suite.dart");
-
-class CorelibTestSuite extends StandardTestSuite {
-  CorelibTestSuite(Map configuration)
-      : super(configuration,
-              "corelib",
-              "tests/corelib/src",
-              ["tests/corelib/corelib.status",
-               "tests/corelib/corelib-leg.status"]);
-}

tools/test-runtime.dart

@@ -12,16 +12,27 @@
 
 #import("testing/dart/test_runner.dart");
 #import("testing/dart/test_options.dart");
+#import("testing/dart/test_suite.dart");
 
 #import("../tests/co19/test_config.dart");
-#import("../tests/corelib/test_config.dart");
-#import("../tests/isolate/test_config.dart");
 #import("../tests/language/test_config.dart");
 #import("../tests/lib/test_config.dart");
 #import("../tests/standalone/test_config.dart");
 #import("../tests/utils/test_config.dart");
 #import("../runtime/tests/vm/test_config.dart");
 
+/**
+ * The directories that contain test suites which follow the conventions
+ * required by [StandardTestSuite]'s forDirectory constructor.
+ * New test suites should follow this convention because it makes it much
+ * simpler to add them to test.dart.  Existing test suites should be
+ * moved to here, if possible.
+*/
+final TEST_SUITE_DIRECTORIES = const [
+  'tests/corelib',
+  'tests/isolate',
+];
+
 main() {
   var startTime = new Date.now();
   var optionsParser = new TestOptionsParser();
@@ -62,9 +73,6 @@ main() {
     if (selectors.containsKey('standalone')) {
       queue.addTestSuite(new StandaloneTestSuite(conf));
     }
-    if (selectors.containsKey('corelib')) {
-      queue.addTestSuite(new CorelibTestSuite(conf));
-    }
     if (selectors.containsKey('co19')) {
       queue.addTestSuite(new Co19TestSuite(conf));
     }
@@ -74,9 +82,6 @@ main() {
     if (selectors.containsKey('lib')) {
       queue.addTestSuite(new LibTestSuite(conf));
     }
-    if (selectors.containsKey('isolate')) {
-      queue.addTestSuite(new IsolateTestSuite(conf));
-    }
     if (selectors.containsKey('utils')) {
       queue.addTestSuite(new UtilsTestSuite(conf));
     }
@@ -85,6 +90,14 @@ main() {
       queue.addTestSuite(new VMDartTestSuite(conf));
     }
 
+    for (final testSuiteDir in TEST_SUITE_DIRECTORIES) {
+      final name = testSuiteDir.substring(testSuiteDir.lastIndexOf('/') + 1);
+      if (selectors.containsKey(name)) {
+        queue.addTestSuite(
+            new StandardTestSuite.forDirectory(conf, testSuiteDir));
+      }
+    }
+
     return true;
   }
 

tools/test.dart

@@ -35,7 +35,6 @@
 #import("../runtime/tests/vm/test_config.dart");
 #import("../samples/tests/samples/test_config.dart");
 #import("../tests/co19/test_config.dart");
-#import("../tests/corelib/test_config.dart");
 #import("../tests/language/test_config.dart");
 #import("../tests/lib/test_config.dart");
 #import("../tests/standalone/test_config.dart");
@@ -54,6 +53,7 @@ final TEST_SUITE_DIRECTORIES = const [
   'frog/tests/leg',
   'frog/tests/leg_only',
   'tests/benchmark_smoke',
+  'tests/corelib',
   'tests/dom',
   'tests/html',
   'tests/isolate',
@@ -105,8 +105,6 @@ main() {
         queue.addTestSuite(new SamplesTestSuite(conf));
       } else if (key == 'standalone') {
         queue.addTestSuite(new StandaloneTestSuite(conf));
-      } else if (key == 'corelib') {
-        queue.addTestSuite(new CorelibTestSuite(conf));
       } else if (key == 'co19') {
         queue.addTestSuite(new Co19TestSuite(conf));
       } else if (key == 'language') {