From d9eae90196fca6e45f31e022266d8d4ebdf2b6a0 Mon Sep 17 00:00:00 2001
From: "sigmund@google.com" <sigmund@google.com>
Date: Fri, 27 Apr 2012 18:06:37 +0000
Subject: [PATCH] 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
---
 ...erVMTest.dart => big_integer_vm_test.dart} |  0
 ...romTest.dart => collection_from_test.dart} |  0
 ...st.dart => collection_to_string_test.dart} |  0
 ...Test.dart => const_list_literal_test.dart} |  0
 ...dart => const_list_remove_range_test.dart} |  0
 ...st.dart => const_list_set_range_test.dart} |  0
 ...Test.dart => core_runtime_types_test.dart} |  0
 tests/corelib/corelib-leg.status              | 28 ---------
 tests/corelib/corelib.status                  | 63 ++++++++++++-------
 .../DateTimeTest.dart => date_time_test.dart} |  0
 ...pareTest.dart => double_compare_test.dart} |  0
 ...art => exception_implementation_test.dart} |  0
 ...pressionTest.dart => expression_test.dart} |  0
 .../{src/ForInTest.dart => for_in_test.dart}  |  0
 .../{src/FutureTest.dart => future_test.dart} |  0
 .../FuturesTest.dart => futures_test.dart}    |  0
 ...rt => growable_object_array2_vm_test.dart} |  0
 ...art => growable_object_array_vm_test.dart} |  0
 .../HashMapTest.dart => hash_map_test.dart}   |  0
 ...=> index_out_of_range_exception_test.dart} |  0
 ...est.dart => indexed_list_access_test.dart} |  0
 ...dart => integer_to_radix_string_test.dart} |  0
 ...dart => is_operator_basic_types_test.dart} |  0
 ...MapTest.dart => linked_hash_map_test.dart} |  0
 ...angeTest.dart => list_get_range_test.dart} |  0
 ...dexOfTest.dart => list_index_of_test.dart} |  0
 ...eTest.dart => list_insert_range_test.dart} |  0
 ...torsTest.dart => list_iterators_test.dart} |  0
 ...art => list_literal_is_growable_test.dart} |  0
 ...iteralTest.dart => list_literal_test.dart} |  0
 ...eTest.dart => list_remove_range_test.dart} |  0
 ...angeTest.dart => list_set_range_test.dart} |  0
 .../ListSortTest.dart => list_sort_test.dart} |  2 +-
 .../{src/ListTest.dart => list_test.dart}     |  0
 .../MapFromTest.dart => map_from_test.dart}   |  0
 .../{src/MapTest.dart => map_test.dart}       |  0
 .../{src/MapsTest.dart => maps_test.dart}     |  0
 ...eTest.dart => math_parse_double_test.dart} |  0
 .../{src/MathTest.dart => math_test.dart}     |  0
 ...finityTest.dart => nan_infinity_test.dart} |  0
 ...atorTest.dart => queue_iterator_test.dart} |  0
 .../{src/QueueTest.dart => queue_test.dart}   |  0
 .../RegExp1Test.dart => reg_exp1_test.dart}   |  0
 .../RegExp4Test.dart => reg_exp4_test.dart}   |  0
 .../RegExp5Test.dart => reg_exp5_test.dart}   |  0
 ...est.dart => reg_exp_all_matches_test.dart} |  0
 ...est.dart => reg_exp_first_match_test.dart} |  0
 ...GroupTest.dart => reg_exp_group_test.dart} |  0
 ...oupsTest.dart => reg_exp_groups_test.dart} |  0
 ...hTest.dart => reg_exp_has_match_test.dart} |  0
 ...dTest.dart => reg_exp_start_end_test.dart} |  0
 ...st.dart => reg_exp_string_match_test.dart} |  0
 ...eratorTest.dart => set_iterator_test.dart} |  0
 .../{src/SetTest.dart => set_test.dart}       |  0
 .../{src/SortHelper.dart => sort_helper.dart} |  0
 .../{src/SortTest.dart => sort_test.dart}     |  2 +-
 ...playTreeTest.dart => splay_tree_test.dart} |  0
 ...StopwatchTest.dart => stopwatch_test.dart} |  0
 ...seVMTest.dart => string_base_vm_test.dart} |  0
 ...ufferTest.dart => string_buffer_test.dart} |  0
 ...ingCaseTest.dart => string_case_test.dart} |  0
 ...stTest.dart => string_from_list_test.dart} |  0
 ...ternTest.dart => string_pattern_test.dart} |  0
 ...laceTest.dart => string_replace_test.dart} |  0
 ...st.dart => string_split_reg_exp_test.dart} |  0
 ...gSplitTest.dart => string_split_test.dart} |  0
 ...ngTest.dart => string_substring_test.dart} |  0
 .../{src/StringTest.dart => string_test.dart} |  0
 ...ingTrimTest.dart => string_trim_test.dart} |  0
 .../StringsTest.dart => strings_test.dart}    |  0
 tests/corelib/test_config.dart                | 16 -----
 .../UnicodeTest.dart => unicode_test.dart}    |  0
 tools/test-runtime.dart                       | 29 ++++++---
 tools/test.dart                               |  4 +-
 74 files changed, 66 insertions(+), 78 deletions(-)
 rename tests/corelib/{src/BigIntegerVMTest.dart => big_integer_vm_test.dart} (100%)
 rename tests/corelib/{src/CollectionFromTest.dart => collection_from_test.dart} (100%)
 rename tests/corelib/{src/CollectionToStringTest.dart => collection_to_string_test.dart} (100%)
 rename tests/corelib/{src/ConstListLiteralTest.dart => const_list_literal_test.dart} (100%)
 rename tests/corelib/{src/ConstListRemoveRangeTest.dart => const_list_remove_range_test.dart} (100%)
 rename tests/corelib/{src/ConstListSetRangeTest.dart => const_list_set_range_test.dart} (100%)
 rename tests/corelib/{src/CoreRuntimeTypesTest.dart => core_runtime_types_test.dart} (100%)
 delete mode 100644 tests/corelib/corelib-leg.status
 rename tests/corelib/{src/DateTimeTest.dart => date_time_test.dart} (100%)
 rename tests/corelib/{src/DoubleCompareTest.dart => double_compare_test.dart} (100%)
 rename tests/corelib/{src/ExceptionImplementationTest.dart => exception_implementation_test.dart} (100%)
 rename tests/corelib/{src/ExpressionTest.dart => expression_test.dart} (100%)
 rename tests/corelib/{src/ForInTest.dart => for_in_test.dart} (100%)
 rename tests/corelib/{src/FutureTest.dart => future_test.dart} (100%)
 rename tests/corelib/{src/FuturesTest.dart => futures_test.dart} (100%)
 rename tests/corelib/{src/GrowableObjectArray2VMTest.dart => growable_object_array2_vm_test.dart} (100%)
 rename tests/corelib/{src/GrowableObjectArrayVMTest.dart => growable_object_array_vm_test.dart} (100%)
 rename tests/corelib/{src/HashMapTest.dart => hash_map_test.dart} (100%)
 rename tests/corelib/{src/IndexOutOfRangeExceptionTest.dart => index_out_of_range_exception_test.dart} (100%)
 rename tests/corelib/{src/IndexedListAccessTest.dart => indexed_list_access_test.dart} (100%)
 rename tests/corelib/{src/IntegerToRadixStringTest.dart => integer_to_radix_string_test.dart} (100%)
 rename tests/corelib/{src/IsOperatorBasicTypesTest.dart => is_operator_basic_types_test.dart} (100%)
 rename tests/corelib/{src/LinkedHashMapTest.dart => linked_hash_map_test.dart} (100%)
 rename tests/corelib/{src/ListGetRangeTest.dart => list_get_range_test.dart} (100%)
 rename tests/corelib/{src/ListIndexOfTest.dart => list_index_of_test.dart} (100%)
 rename tests/corelib/{src/ListInsertRangeTest.dart => list_insert_range_test.dart} (100%)
 rename tests/corelib/{src/ListIteratorsTest.dart => list_iterators_test.dart} (100%)
 rename tests/corelib/{src/ListLiteralIsGrowableTest.dart => list_literal_is_growable_test.dart} (100%)
 rename tests/corelib/{src/ListLiteralTest.dart => list_literal_test.dart} (100%)
 rename tests/corelib/{src/ListRemoveRangeTest.dart => list_remove_range_test.dart} (100%)
 rename tests/corelib/{src/ListSetRangeTest.dart => list_set_range_test.dart} (100%)
 rename tests/corelib/{src/ListSortTest.dart => list_sort_test.dart} (95%)
 rename tests/corelib/{src/ListTest.dart => list_test.dart} (100%)
 rename tests/corelib/{src/MapFromTest.dart => map_from_test.dart} (100%)
 rename tests/corelib/{src/MapTest.dart => map_test.dart} (100%)
 rename tests/corelib/{src/MapsTest.dart => maps_test.dart} (100%)
 rename tests/corelib/{src/MathParseDoubleTest.dart => math_parse_double_test.dart} (100%)
 rename tests/corelib/{src/MathTest.dart => math_test.dart} (100%)
 rename tests/corelib/{src/NanInfinityTest.dart => nan_infinity_test.dart} (100%)
 rename tests/corelib/{src/QueueIteratorTest.dart => queue_iterator_test.dart} (100%)
 rename tests/corelib/{src/QueueTest.dart => queue_test.dart} (100%)
 rename tests/corelib/{src/RegExp1Test.dart => reg_exp1_test.dart} (100%)
 rename tests/corelib/{src/RegExp4Test.dart => reg_exp4_test.dart} (100%)
 rename tests/corelib/{src/RegExp5Test.dart => reg_exp5_test.dart} (100%)
 rename tests/corelib/{src/RegExpAllMatchesTest.dart => reg_exp_all_matches_test.dart} (100%)
 rename tests/corelib/{src/RegExpFirstMatchTest.dart => reg_exp_first_match_test.dart} (100%)
 rename tests/corelib/{src/RegExpGroupTest.dart => reg_exp_group_test.dart} (100%)
 rename tests/corelib/{src/RegExpGroupsTest.dart => reg_exp_groups_test.dart} (100%)
 rename tests/corelib/{src/RegExpHasMatchTest.dart => reg_exp_has_match_test.dart} (100%)
 rename tests/corelib/{src/RegExpStartEndTest.dart => reg_exp_start_end_test.dart} (100%)
 rename tests/corelib/{src/RegExpStringMatchTest.dart => reg_exp_string_match_test.dart} (100%)
 rename tests/corelib/{src/SetIteratorTest.dart => set_iterator_test.dart} (100%)
 rename tests/corelib/{src/SetTest.dart => set_test.dart} (100%)
 rename tests/corelib/{src/SortHelper.dart => sort_helper.dart} (100%)
 rename tests/corelib/{src/SortTest.dart => sort_test.dart} (98%)
 rename tests/corelib/{src/SplayTreeTest.dart => splay_tree_test.dart} (100%)
 rename tests/corelib/{src/StopwatchTest.dart => stopwatch_test.dart} (100%)
 rename tests/corelib/{src/StringBaseVMTest.dart => string_base_vm_test.dart} (100%)
 rename tests/corelib/{src/StringBufferTest.dart => string_buffer_test.dart} (100%)
 rename tests/corelib/{src/StringCaseTest.dart => string_case_test.dart} (100%)
 rename tests/corelib/{src/StringFromListTest.dart => string_from_list_test.dart} (100%)
 rename tests/corelib/{src/StringPatternTest.dart => string_pattern_test.dart} (100%)
 rename tests/corelib/{src/StringReplaceTest.dart => string_replace_test.dart} (100%)
 rename tests/corelib/{src/StringSplitRegExpTest.dart => string_split_reg_exp_test.dart} (100%)
 rename tests/corelib/{src/StringSplitTest.dart => string_split_test.dart} (100%)
 rename tests/corelib/{src/StringSubstringTest.dart => string_substring_test.dart} (100%)
 rename tests/corelib/{src/StringTest.dart => string_test.dart} (100%)
 rename tests/corelib/{src/StringTrimTest.dart => string_trim_test.dart} (100%)
 rename tests/corelib/{src/StringsTest.dart => strings_test.dart} (100%)
 delete mode 100644 tests/corelib/test_config.dart
 rename tests/corelib/{src/UnicodeTest.dart => unicode_test.dart} (100%)

diff --git a/tests/corelib/src/BigIntegerVMTest.dart b/tests/corelib/big_integer_vm_test.dart
similarity index 100%
rename from tests/corelib/src/BigIntegerVMTest.dart
rename to tests/corelib/big_integer_vm_test.dart
diff --git a/tests/corelib/src/CollectionFromTest.dart b/tests/corelib/collection_from_test.dart
similarity index 100%
rename from tests/corelib/src/CollectionFromTest.dart
rename to tests/corelib/collection_from_test.dart
diff --git a/tests/corelib/src/CollectionToStringTest.dart b/tests/corelib/collection_to_string_test.dart
similarity index 100%
rename from tests/corelib/src/CollectionToStringTest.dart
rename to tests/corelib/collection_to_string_test.dart
diff --git a/tests/corelib/src/ConstListLiteralTest.dart b/tests/corelib/const_list_literal_test.dart
similarity index 100%
rename from tests/corelib/src/ConstListLiteralTest.dart
rename to tests/corelib/const_list_literal_test.dart
diff --git a/tests/corelib/src/ConstListRemoveRangeTest.dart b/tests/corelib/const_list_remove_range_test.dart
similarity index 100%
rename from tests/corelib/src/ConstListRemoveRangeTest.dart
rename to tests/corelib/const_list_remove_range_test.dart
diff --git a/tests/corelib/src/ConstListSetRangeTest.dart b/tests/corelib/const_list_set_range_test.dart
similarity index 100%
rename from tests/corelib/src/ConstListSetRangeTest.dart
rename to tests/corelib/const_list_set_range_test.dart
diff --git a/tests/corelib/src/CoreRuntimeTypesTest.dart b/tests/corelib/core_runtime_types_test.dart
similarity index 100%
rename from tests/corelib/src/CoreRuntimeTypesTest.dart
rename to tests/corelib/core_runtime_types_test.dart
diff --git a/tests/corelib/corelib-leg.status b/tests/corelib/corelib-leg.status
deleted file mode 100644
index a626ebaebee..00000000000
--- a/tests/corelib/corelib-leg.status
+++ /dev/null
@@ -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
diff --git a/tests/corelib/corelib.status b/tests/corelib/corelib.status
index 5e0d7dc7a0b..f9256b0f995 100644
--- a/tests/corelib/corelib.status
+++ b/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
diff --git a/tests/corelib/src/DateTimeTest.dart b/tests/corelib/date_time_test.dart
similarity index 100%
rename from tests/corelib/src/DateTimeTest.dart
rename to tests/corelib/date_time_test.dart
diff --git a/tests/corelib/src/DoubleCompareTest.dart b/tests/corelib/double_compare_test.dart
similarity index 100%
rename from tests/corelib/src/DoubleCompareTest.dart
rename to tests/corelib/double_compare_test.dart
diff --git a/tests/corelib/src/ExceptionImplementationTest.dart b/tests/corelib/exception_implementation_test.dart
similarity index 100%
rename from tests/corelib/src/ExceptionImplementationTest.dart
rename to tests/corelib/exception_implementation_test.dart
diff --git a/tests/corelib/src/ExpressionTest.dart b/tests/corelib/expression_test.dart
similarity index 100%
rename from tests/corelib/src/ExpressionTest.dart
rename to tests/corelib/expression_test.dart
diff --git a/tests/corelib/src/ForInTest.dart b/tests/corelib/for_in_test.dart
similarity index 100%
rename from tests/corelib/src/ForInTest.dart
rename to tests/corelib/for_in_test.dart
diff --git a/tests/corelib/src/FutureTest.dart b/tests/corelib/future_test.dart
similarity index 100%
rename from tests/corelib/src/FutureTest.dart
rename to tests/corelib/future_test.dart
diff --git a/tests/corelib/src/FuturesTest.dart b/tests/corelib/futures_test.dart
similarity index 100%
rename from tests/corelib/src/FuturesTest.dart
rename to tests/corelib/futures_test.dart
diff --git a/tests/corelib/src/GrowableObjectArray2VMTest.dart b/tests/corelib/growable_object_array2_vm_test.dart
similarity index 100%
rename from tests/corelib/src/GrowableObjectArray2VMTest.dart
rename to tests/corelib/growable_object_array2_vm_test.dart
diff --git a/tests/corelib/src/GrowableObjectArrayVMTest.dart b/tests/corelib/growable_object_array_vm_test.dart
similarity index 100%
rename from tests/corelib/src/GrowableObjectArrayVMTest.dart
rename to tests/corelib/growable_object_array_vm_test.dart
diff --git a/tests/corelib/src/HashMapTest.dart b/tests/corelib/hash_map_test.dart
similarity index 100%
rename from tests/corelib/src/HashMapTest.dart
rename to tests/corelib/hash_map_test.dart
diff --git a/tests/corelib/src/IndexOutOfRangeExceptionTest.dart b/tests/corelib/index_out_of_range_exception_test.dart
similarity index 100%
rename from tests/corelib/src/IndexOutOfRangeExceptionTest.dart
rename to tests/corelib/index_out_of_range_exception_test.dart
diff --git a/tests/corelib/src/IndexedListAccessTest.dart b/tests/corelib/indexed_list_access_test.dart
similarity index 100%
rename from tests/corelib/src/IndexedListAccessTest.dart
rename to tests/corelib/indexed_list_access_test.dart
diff --git a/tests/corelib/src/IntegerToRadixStringTest.dart b/tests/corelib/integer_to_radix_string_test.dart
similarity index 100%
rename from tests/corelib/src/IntegerToRadixStringTest.dart
rename to tests/corelib/integer_to_radix_string_test.dart
diff --git a/tests/corelib/src/IsOperatorBasicTypesTest.dart b/tests/corelib/is_operator_basic_types_test.dart
similarity index 100%
rename from tests/corelib/src/IsOperatorBasicTypesTest.dart
rename to tests/corelib/is_operator_basic_types_test.dart
diff --git a/tests/corelib/src/LinkedHashMapTest.dart b/tests/corelib/linked_hash_map_test.dart
similarity index 100%
rename from tests/corelib/src/LinkedHashMapTest.dart
rename to tests/corelib/linked_hash_map_test.dart
diff --git a/tests/corelib/src/ListGetRangeTest.dart b/tests/corelib/list_get_range_test.dart
similarity index 100%
rename from tests/corelib/src/ListGetRangeTest.dart
rename to tests/corelib/list_get_range_test.dart
diff --git a/tests/corelib/src/ListIndexOfTest.dart b/tests/corelib/list_index_of_test.dart
similarity index 100%
rename from tests/corelib/src/ListIndexOfTest.dart
rename to tests/corelib/list_index_of_test.dart
diff --git a/tests/corelib/src/ListInsertRangeTest.dart b/tests/corelib/list_insert_range_test.dart
similarity index 100%
rename from tests/corelib/src/ListInsertRangeTest.dart
rename to tests/corelib/list_insert_range_test.dart
diff --git a/tests/corelib/src/ListIteratorsTest.dart b/tests/corelib/list_iterators_test.dart
similarity index 100%
rename from tests/corelib/src/ListIteratorsTest.dart
rename to tests/corelib/list_iterators_test.dart
diff --git a/tests/corelib/src/ListLiteralIsGrowableTest.dart b/tests/corelib/list_literal_is_growable_test.dart
similarity index 100%
rename from tests/corelib/src/ListLiteralIsGrowableTest.dart
rename to tests/corelib/list_literal_is_growable_test.dart
diff --git a/tests/corelib/src/ListLiteralTest.dart b/tests/corelib/list_literal_test.dart
similarity index 100%
rename from tests/corelib/src/ListLiteralTest.dart
rename to tests/corelib/list_literal_test.dart
diff --git a/tests/corelib/src/ListRemoveRangeTest.dart b/tests/corelib/list_remove_range_test.dart
similarity index 100%
rename from tests/corelib/src/ListRemoveRangeTest.dart
rename to tests/corelib/list_remove_range_test.dart
diff --git a/tests/corelib/src/ListSetRangeTest.dart b/tests/corelib/list_set_range_test.dart
similarity index 100%
rename from tests/corelib/src/ListSetRangeTest.dart
rename to tests/corelib/list_set_range_test.dart
diff --git a/tests/corelib/src/ListSortTest.dart b/tests/corelib/list_sort_test.dart
similarity index 95%
rename from tests/corelib/src/ListSortTest.dart
rename to tests/corelib/list_sort_test.dart
index 42afc2588d3..48e0b0cecc0 100644
--- a/tests/corelib/src/ListSortTest.dart
+++ b/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() {
diff --git a/tests/corelib/src/ListTest.dart b/tests/corelib/list_test.dart
similarity index 100%
rename from tests/corelib/src/ListTest.dart
rename to tests/corelib/list_test.dart
diff --git a/tests/corelib/src/MapFromTest.dart b/tests/corelib/map_from_test.dart
similarity index 100%
rename from tests/corelib/src/MapFromTest.dart
rename to tests/corelib/map_from_test.dart
diff --git a/tests/corelib/src/MapTest.dart b/tests/corelib/map_test.dart
similarity index 100%
rename from tests/corelib/src/MapTest.dart
rename to tests/corelib/map_test.dart
diff --git a/tests/corelib/src/MapsTest.dart b/tests/corelib/maps_test.dart
similarity index 100%
rename from tests/corelib/src/MapsTest.dart
rename to tests/corelib/maps_test.dart
diff --git a/tests/corelib/src/MathParseDoubleTest.dart b/tests/corelib/math_parse_double_test.dart
similarity index 100%
rename from tests/corelib/src/MathParseDoubleTest.dart
rename to tests/corelib/math_parse_double_test.dart
diff --git a/tests/corelib/src/MathTest.dart b/tests/corelib/math_test.dart
similarity index 100%
rename from tests/corelib/src/MathTest.dart
rename to tests/corelib/math_test.dart
diff --git a/tests/corelib/src/NanInfinityTest.dart b/tests/corelib/nan_infinity_test.dart
similarity index 100%
rename from tests/corelib/src/NanInfinityTest.dart
rename to tests/corelib/nan_infinity_test.dart
diff --git a/tests/corelib/src/QueueIteratorTest.dart b/tests/corelib/queue_iterator_test.dart
similarity index 100%
rename from tests/corelib/src/QueueIteratorTest.dart
rename to tests/corelib/queue_iterator_test.dart
diff --git a/tests/corelib/src/QueueTest.dart b/tests/corelib/queue_test.dart
similarity index 100%
rename from tests/corelib/src/QueueTest.dart
rename to tests/corelib/queue_test.dart
diff --git a/tests/corelib/src/RegExp1Test.dart b/tests/corelib/reg_exp1_test.dart
similarity index 100%
rename from tests/corelib/src/RegExp1Test.dart
rename to tests/corelib/reg_exp1_test.dart
diff --git a/tests/corelib/src/RegExp4Test.dart b/tests/corelib/reg_exp4_test.dart
similarity index 100%
rename from tests/corelib/src/RegExp4Test.dart
rename to tests/corelib/reg_exp4_test.dart
diff --git a/tests/corelib/src/RegExp5Test.dart b/tests/corelib/reg_exp5_test.dart
similarity index 100%
rename from tests/corelib/src/RegExp5Test.dart
rename to tests/corelib/reg_exp5_test.dart
diff --git a/tests/corelib/src/RegExpAllMatchesTest.dart b/tests/corelib/reg_exp_all_matches_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpAllMatchesTest.dart
rename to tests/corelib/reg_exp_all_matches_test.dart
diff --git a/tests/corelib/src/RegExpFirstMatchTest.dart b/tests/corelib/reg_exp_first_match_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpFirstMatchTest.dart
rename to tests/corelib/reg_exp_first_match_test.dart
diff --git a/tests/corelib/src/RegExpGroupTest.dart b/tests/corelib/reg_exp_group_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpGroupTest.dart
rename to tests/corelib/reg_exp_group_test.dart
diff --git a/tests/corelib/src/RegExpGroupsTest.dart b/tests/corelib/reg_exp_groups_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpGroupsTest.dart
rename to tests/corelib/reg_exp_groups_test.dart
diff --git a/tests/corelib/src/RegExpHasMatchTest.dart b/tests/corelib/reg_exp_has_match_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpHasMatchTest.dart
rename to tests/corelib/reg_exp_has_match_test.dart
diff --git a/tests/corelib/src/RegExpStartEndTest.dart b/tests/corelib/reg_exp_start_end_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpStartEndTest.dart
rename to tests/corelib/reg_exp_start_end_test.dart
diff --git a/tests/corelib/src/RegExpStringMatchTest.dart b/tests/corelib/reg_exp_string_match_test.dart
similarity index 100%
rename from tests/corelib/src/RegExpStringMatchTest.dart
rename to tests/corelib/reg_exp_string_match_test.dart
diff --git a/tests/corelib/src/SetIteratorTest.dart b/tests/corelib/set_iterator_test.dart
similarity index 100%
rename from tests/corelib/src/SetIteratorTest.dart
rename to tests/corelib/set_iterator_test.dart
diff --git a/tests/corelib/src/SetTest.dart b/tests/corelib/set_test.dart
similarity index 100%
rename from tests/corelib/src/SetTest.dart
rename to tests/corelib/set_test.dart
diff --git a/tests/corelib/src/SortHelper.dart b/tests/corelib/sort_helper.dart
similarity index 100%
rename from tests/corelib/src/SortHelper.dart
rename to tests/corelib/sort_helper.dart
diff --git a/tests/corelib/src/SortTest.dart b/tests/corelib/sort_test.dart
similarity index 98%
rename from tests/corelib/src/SortTest.dart
rename to tests/corelib/sort_test.dart
index 18199c51c95..a7cee149c33 100644
--- a/tests/corelib/src/SortTest.dart
+++ b/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);
diff --git a/tests/corelib/src/SplayTreeTest.dart b/tests/corelib/splay_tree_test.dart
similarity index 100%
rename from tests/corelib/src/SplayTreeTest.dart
rename to tests/corelib/splay_tree_test.dart
diff --git a/tests/corelib/src/StopwatchTest.dart b/tests/corelib/stopwatch_test.dart
similarity index 100%
rename from tests/corelib/src/StopwatchTest.dart
rename to tests/corelib/stopwatch_test.dart
diff --git a/tests/corelib/src/StringBaseVMTest.dart b/tests/corelib/string_base_vm_test.dart
similarity index 100%
rename from tests/corelib/src/StringBaseVMTest.dart
rename to tests/corelib/string_base_vm_test.dart
diff --git a/tests/corelib/src/StringBufferTest.dart b/tests/corelib/string_buffer_test.dart
similarity index 100%
rename from tests/corelib/src/StringBufferTest.dart
rename to tests/corelib/string_buffer_test.dart
diff --git a/tests/corelib/src/StringCaseTest.dart b/tests/corelib/string_case_test.dart
similarity index 100%
rename from tests/corelib/src/StringCaseTest.dart
rename to tests/corelib/string_case_test.dart
diff --git a/tests/corelib/src/StringFromListTest.dart b/tests/corelib/string_from_list_test.dart
similarity index 100%
rename from tests/corelib/src/StringFromListTest.dart
rename to tests/corelib/string_from_list_test.dart
diff --git a/tests/corelib/src/StringPatternTest.dart b/tests/corelib/string_pattern_test.dart
similarity index 100%
rename from tests/corelib/src/StringPatternTest.dart
rename to tests/corelib/string_pattern_test.dart
diff --git a/tests/corelib/src/StringReplaceTest.dart b/tests/corelib/string_replace_test.dart
similarity index 100%
rename from tests/corelib/src/StringReplaceTest.dart
rename to tests/corelib/string_replace_test.dart
diff --git a/tests/corelib/src/StringSplitRegExpTest.dart b/tests/corelib/string_split_reg_exp_test.dart
similarity index 100%
rename from tests/corelib/src/StringSplitRegExpTest.dart
rename to tests/corelib/string_split_reg_exp_test.dart
diff --git a/tests/corelib/src/StringSplitTest.dart b/tests/corelib/string_split_test.dart
similarity index 100%
rename from tests/corelib/src/StringSplitTest.dart
rename to tests/corelib/string_split_test.dart
diff --git a/tests/corelib/src/StringSubstringTest.dart b/tests/corelib/string_substring_test.dart
similarity index 100%
rename from tests/corelib/src/StringSubstringTest.dart
rename to tests/corelib/string_substring_test.dart
diff --git a/tests/corelib/src/StringTest.dart b/tests/corelib/string_test.dart
similarity index 100%
rename from tests/corelib/src/StringTest.dart
rename to tests/corelib/string_test.dart
diff --git a/tests/corelib/src/StringTrimTest.dart b/tests/corelib/string_trim_test.dart
similarity index 100%
rename from tests/corelib/src/StringTrimTest.dart
rename to tests/corelib/string_trim_test.dart
diff --git a/tests/corelib/src/StringsTest.dart b/tests/corelib/strings_test.dart
similarity index 100%
rename from tests/corelib/src/StringsTest.dart
rename to tests/corelib/strings_test.dart
diff --git a/tests/corelib/test_config.dart b/tests/corelib/test_config.dart
deleted file mode 100644
index b3d19a3ffc3..00000000000
--- a/tests/corelib/test_config.dart
+++ /dev/null
@@ -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"]);
-}
diff --git a/tests/corelib/src/UnicodeTest.dart b/tests/corelib/unicode_test.dart
similarity index 100%
rename from tests/corelib/src/UnicodeTest.dart
rename to tests/corelib/unicode_test.dart
diff --git a/tools/test-runtime.dart b/tools/test-runtime.dart
index 7e50a1743fa..4db92d024f1 100755
--- a/tools/test-runtime.dart
+++ b/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;
   }
 
diff --git a/tools/test.dart b/tools/test.dart
index 185847c63ac..be9f636f434 100755
--- a/tools/test.dart
+++ b/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') {