Move unittests, #12 of ?

Change-Id: I218d69ecdefc7580ab192eb1aa36a0f000427c92
Reviewed-on: https://dart-review.googlesource.com/31485
Reviewed-by: Sigmund Cherem <sigmund@google.com>

pkg/compiler/testing_dart.json

@@ -67,15 +67,9 @@
       "^tests/compiler/dart2js/sourcemaps/stacktrace_test\\.dart",
       "^tests/compiler/dart2js/subtype_test\\.dart",
       "^tests/compiler/dart2js/subtypeset_test\\.dart",
-      "^tests/compiler/dart2js/tdiv_test\\.dart",
       "^tests/compiler/dart2js/token_naming_test\\.dart",
-      "^tests/compiler/dart2js/trust_type_annotations_test\\.dart",
-      "^tests/compiler/dart2js/type_checker_test\\.dart",
-      "^tests/compiler/dart2js/type_equals_test\\.dart",
-      "^tests/compiler/dart2js/type_inference8_test\\.dart",
-      "^tests/compiler/dart2js/type_mask2_test\\.dart",
-      "^tests/compiler/dart2js/type_mask_test\\.dart",
-      "^tests/compiler/dart2js/type_order_test\\.dart",
+      "^tests/compiler/dart2js/inference/type_inference8_test\\.dart",
+      "^tests/compiler/dart2js/inference/type_mask2_test\\.dart",
       "^tests/compiler/dart2js/type_representation_test\\.dart",
       "^tests/compiler/dart2js/type_substitution_test\\.dart",
       "^tests/compiler/dart2js/type_variable_occurrence_test\\.dart",

tests/compiler/dart2js/codegen/expect_annotations_test.dart

@@ -10,7 +10,7 @@ import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/js_backend/annotations.dart' as optimizerHints;
 import 'package:compiler/src/types/types.dart';
 import 'package:compiler/src/world.dart' show ClosedWorld;
-import '../type_mask_test_helper.dart';
+import '../inference/type_mask_test_helper.dart';
 import '../memory_compiler.dart';
 
 const Map MEMORY_SOURCE_FILES = const {

tests/compiler/dart2js/codegen/tdiv_test.dart

@@ -6,7 +6,7 @@ library tdiv_test;
 
 import 'dart:async';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST1 = r"""
 foo(param) {

tests/compiler/dart2js/codegen/top_level_closure_tree_shake_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 main() {

tests/compiler/dart2js/codegen/tree_shaking_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST = r"""
 class A {

tests/compiler/dart2js/codegen/trust_type_annotations2_test.dart

@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/commandline_options.dart';
-import 'memory_compiler.dart';
+import '../memory_compiler.dart';
 
 const MEMORY_SOURCE_FILES = const {
   'main.dart': '''

tests/compiler/dart2js/codegen/trust_type_annotations_test.dart

@@ -6,8 +6,8 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/elements/entities.dart';
-import 'compiler_helper.dart';
-import 'memory_compiler.dart';
+import '../compiler_helper.dart';
+import '../memory_compiler.dart';
 
 const String TEST = """
 class A {

tests/compiler/dart2js/codegen/type_guard_unuser_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 foo(a) {

tests/compiler/dart2js/codegen/type_inference2_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 sum(param0, param1) {

tests/compiler/dart2js/codegen/type_inference3_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 sum(param0, param1) {

tests/compiler/dart2js/codegen/type_inference4_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 foo(j) {

tests/compiler/dart2js/codegen/type_inference5_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST_ONE = r"""
 foo(j) {

tests/compiler/dart2js/inference/assert_message_throw_test.dart

@@ -11,8 +11,8 @@ import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/types/masks.dart';
 import 'package:compiler/src/world.dart' show ClosedWorld;
 import 'package:expect/expect.dart';
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 const String SOURCE = '''
 main(args) {

tests/compiler/dart2js/inference/call_site_simple_type_inferer_test.dart

@@ -10,8 +10,8 @@ import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/types/masks.dart';
 import 'package:expect/expect.dart';
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 void compileAndFind(String code, String className, String memberName,
     bool disableInlining, check(compiler, element)) {

tests/compiler/dart2js/inference/closure_tracer_28919_test.dart

@@ -14,8 +14,8 @@ import 'package:compiler/src/types/types.dart';
 import 'package:compiler/src/world.dart';
 import 'package:expect/expect.dart';
 
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 bool isContainer(TypeMask mask) {
   return mask is ContainerTypeMask;

tests/compiler/dart2js/inference/closure_tracer_test.dart

@@ -8,8 +8,8 @@
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = '''
 testFunctionStatement() {

tests/compiler/dart2js/inference/field_type_simple_inferer_test.dart

@@ -10,8 +10,8 @@ import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/types/types.dart' show TypeMask;
 import 'package:compiler/src/world.dart' show ClosedWorld;
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 void compileAndFind(String code, String className, String memberName,
     bool disableInlining, check(compiler, element)) {

tests/compiler/dart2js/inference/issue13354_test.dart

@@ -8,8 +8,8 @@ import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:expect/expect.dart';
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 bar() => 42;

tests/compiler/dart2js/inference/list_tracer2_test.dart

@@ -12,8 +12,8 @@ import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/types/types.dart' show ContainerTypeMask;
 import 'package:expect/expect.dart';
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = r'''
 var myList = [42];

tests/compiler/dart2js/inference/list_tracer3_test.dart

@@ -12,8 +12,8 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show ContainerTypeMask;
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = r'''
 var myList = [];

tests/compiler/dart2js/inference/list_tracer_test.dart

@@ -9,8 +9,8 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show ContainerTypeMask, TypeMask;
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 String generateTest(String listAllocation) {
   return """

tests/compiler/dart2js/inference/list_tracer_typed_data_length_test.dart

@@ -9,8 +9,8 @@ import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/types/types.dart' show TypeMask, ContainerTypeMask;
 import 'package:expect/expect.dart';
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 const TEST = const {
   'main.dart': r'''

tests/compiler/dart2js/inference/map_tracer_const_test.dart

@@ -8,8 +8,8 @@ import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:expect/expect.dart';
+import 'type_mask_test_helper.dart';
 import '../memory_compiler.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = '''
 int closure(int x) {

tests/compiler/dart2js/inference/map_tracer_test.dart

@@ -9,8 +9,8 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show MapTypeMask, TypeMask;
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 String generateTest(String mapAllocation) {
   return """

tests/compiler/dart2js/inference/simple_inferrer_and_or_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 class X {}

tests/compiler/dart2js/inference/simple_inferrer_closure_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 returnInt1() {

tests/compiler/dart2js/inference/simple_inferrer_const_closure3_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_const_closure4_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_const_closure5_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_const_closure_default_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_final_field3_test.dart

@@ -8,8 +8,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_final_field_test.dart

@@ -7,8 +7,8 @@
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_global_field_closure2_test.dart

@@ -6,8 +6,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_no_such_method_test.dart

@@ -6,10 +6,10 @@
 
 import 'package:expect/expect.dart';
 
-import "package:async_helper/async_helper.dart";
-import '../compiler_helper.dart';
+import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/types/types.dart';
-import '../type_mask_test_helper.dart';
+import 'type_mask_test_helper.dart';
+import '../compiler_helper.dart';
 
 const String TEST1 = """
 class A {

tests/compiler/dart2js/inference/simple_inferrer_postfix_prefix_test.dart

@@ -7,8 +7,8 @@
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 

tests/compiler/dart2js/inference/simple_inferrer_test.dart

@@ -7,8 +7,8 @@
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show TypeMask;
-import '../type_mask_test_helper.dart';
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
 
 const String TEST = """

tests/compiler/dart2js/inference/simple_inferrer_try_catch_test.dart

@@ -8,8 +8,8 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/types/types.dart' show TypeMask;
 
+import 'type_mask_test_helper.dart';
 import '../compiler_helper.dart';
-import '../type_mask_test_helper.dart';
 
 const String TEST = """
 returnInt1() {

tests/compiler/dart2js/inference/type_combination_test.dart

@@ -12,7 +12,7 @@ import 'package:compiler/src/types/types.dart';
 import 'package:compiler/src/world.dart';
 import 'package:compiler/src/universe/use.dart';
 import 'package:compiler/src/universe/world_impact.dart';
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 import 'type_mask_test_helper.dart';
 
 TypeMask nullType;

tests/compiler/dart2js/inference/type_inference6_test.dart

@@ -6,7 +6,7 @@
 
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 import 'type_mask_test_helper.dart';
 
 import 'dart:async';

tests/compiler/dart2js/inference/type_inference7_test.dart

@@ -6,7 +6,7 @@
 
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 import 'type_mask_test_helper.dart';
 import 'dart:async';
 

tests/compiler/dart2js/inference/type_inference8_test.dart

@@ -8,7 +8,7 @@ import "package:async_helper/async_helper.dart";
 import "package:compiler/src/constants/values.dart";
 import "package:compiler/src/types/types.dart";
 import "package:expect/expect.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 import 'dart:async';
 

tests/compiler/dart2js/inference/type_inference_switch_test.dart

@@ -6,7 +6,7 @@
 
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 import 'type_mask_test_helper.dart';
 
 import 'dart:async';

tests/compiler/dart2js/inference/type_mask2_test.dart

@@ -7,10 +7,10 @@ library type_mask2_test;
 import 'dart:async';
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'type_test_helper.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/types/types.dart';
 import 'package:compiler/src/world.dart' show ClosedWorld;
+import '../type_test_helper.dart';
 
 isCheckedMode() {
   try {

tests/compiler/dart2js/inference/type_mask_disjoint_test.dart

@@ -11,7 +11,7 @@ import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/types/types.dart';
 import 'package:compiler/src/world.dart';
 
-import 'memory_compiler.dart';
+import '../memory_compiler.dart';
 
 const String CODE = """
 class A {}

tests/compiler/dart2js/inference/type_mask_test.dart

@@ -10,7 +10,7 @@ import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/common_elements.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/world.dart';
-import 'memory_compiler.dart';
+import '../memory_compiler.dart';
 
 const String CODE = """
 class A {}

tests/compiler/dart2js/mirrors/mirror_final_field_inferrer2_test.dart

@@ -8,7 +8,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import '../memory_compiler.dart' show runCompiler;
 import '../compiler_helper.dart' show findElement;
-import '../type_mask_test_helper.dart';
+import '../inference/type_mask_test_helper.dart';
 
 const MEMORY_SOURCE_FILES = const <String, String>{
   'main.dart': """

tests/compiler/dart2js/mirrors/mirror_final_field_inferrer_test.dart

@@ -8,7 +8,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import '../memory_compiler.dart' show runCompiler;
 import '../compiler_helper.dart' show findElement;
-import '../type_mask_test_helper.dart';
+import '../inference/type_mask_test_helper.dart';
 
 const MEMORY_SOURCE_FILES = const <String, String>{
   'main.dart': """

tests/compiler/dart2js/old_frontend/tag_mapping_test.dart

@@ -6,7 +6,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import 'compiler_helper.dart';
+import '../compiler_helper.dart';
 
 const MAIN_CODE = """
 import 'library.dart';

tests/compiler/dart2js/old_frontend/type_checker_test.dart

@@ -21,8 +21,8 @@ import 'package:compiler/src/typechecker.dart';
 import 'package:compiler/src/script.dart';
 import 'package:compiler/src/util/util.dart';
 
-import 'old_frontend/mock_compiler.dart';
-import 'old_frontend/parser_helper.dart';
+import 'mock_compiler.dart';
+import 'parser_helper.dart';
 
 final MessageKind NOT_ASSIGNABLE = MessageKind.NOT_ASSIGNABLE;
 final MessageKind UNDEFINED_GETTER = MessageKind.UNDEFINED_GETTER;

tests/compiler/dart2js/old_frontend/type_equals_test.dart

@@ -5,7 +5,7 @@
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'package:compiler/src/elements/resolution_types.dart';
-import "compiler_helper.dart";
+import "../compiler_helper.dart";
 
 test(compiler, String name1, String name2, {bool expect}) {
   Expect.isTrue((expect != null), 'required parameter "expect" not given');

tests/compiler/dart2js/old_frontend/type_order_test.dart

@@ -6,7 +6,7 @@ library type_order_test;
 
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
-import 'type_test_helper.dart';
+import '../type_test_helper.dart';
 import 'package:compiler/src/elements/resolution_types.dart';
 import "package:compiler/src/elements/elements.dart"
     show ClassElement, TypedefElement;

tests/compiler/dart2js/old_frontend/type_promotion_test.dart

@@ -6,7 +6,7 @@
 // promotion language tests. This ensures that the analyzer and dart2js agrees
 // on these tests.
 
-import 'warnings_checker.dart';
+import '../warnings_checker.dart';
 
 /// Map from test files to a map of their expected status. If the status map is
 /// `null` no warnings must be missing or unexpected, otherwise the status map