[cfe] Move test/fasta/ subfolders to test/

Change-Id: Ie65105f3d68e6545ccf2c4cde3b2523014083a40
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394445
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>

DEPS

@@ -641,7 +641,7 @@ deps = {
     "dep_type": "cipd",
   },
 
-  Var("dart_root") + "/pkg/front_end/test/fasta/types/benchmark_data": {
+  Var("dart_root") + "/pkg/front_end/test/types/benchmark_data": {
     "packages": [
       {
         "package": "dart/cfe/benchmark_data",

pkg/front_end/test/fasta/expression_suite.dart

@@ -54,7 +54,7 @@ import "package:yaml/yaml.dart" show YamlMap, YamlList, loadYamlNode;
 import '../testing_utils.dart' show checkEnvironment;
 import '../utils/kernel_chain.dart' show runDiff, openWrite;
 import 'suite_utils.dart';
-import 'testing/environment_keys.dart';
+import '../testing/environment_keys.dart';
 
 class Context extends ChainContext {
   final CompilerContext compilerContext;

pkg/front_end/test/fasta/modular_suite.dart

@@ -5,8 +5,8 @@
 library fasta.test.modular_suite;
 
 import 'suite_utils.dart' show internalMain;
-import 'testing/environment_keys.dart';
-import 'testing/suite.dart';
+import '../testing/environment_keys.dart';
+import '../testing/suite.dart';
 
 Future<FastaContext> createContext(
     Chain suite, Map<String, String> environment) {

pkg/front_end/test/fasta/outline_suite.dart

@@ -5,8 +5,8 @@
 library fasta.test.outline_suite;
 
 import 'suite_utils.dart' show internalMain;
-import 'testing/environment_keys.dart';
-import 'testing/suite.dart';
+import '../testing/environment_keys.dart';
+import '../testing/suite.dart';
 
 Future<FastaContext> createContext(
     Chain suite, Map<String, String> environment) {

pkg/front_end/test/fasta/strong_suite.dart

@@ -5,8 +5,8 @@
 library fasta.test.strong_suite;
 
 import 'suite_utils.dart' show internalMain;
-import 'testing/environment_keys.dart';
-import 'testing/suite.dart';
+import '../testing/environment_keys.dart';
+import '../testing/suite.dart';
 
 Future<FastaContext> createContext(
     Chain suite, Map<String, String> environment) {

pkg/front_end/test/fasta/suite_utils.dart

@@ -12,7 +12,7 @@ import 'package:testing/src/suite.dart' as testing show Suite;
 import 'package:testing/testing.dart' show Step, TestDescription;
 
 import '../coverage_helper.dart';
-import 'testing/suite.dart';
+import '../testing/suite.dart';
 
 const String limitToArgument = "--limitTo=";
 

pkg/front_end/test/fasta/textual_outline_suite.dart

@@ -25,8 +25,8 @@ import 'package:testing/testing.dart'
 
 import '../utils/kernel_chain.dart' show MatchContext;
 import 'suite_utils.dart';
-import 'testing/environment_keys.dart';
-import 'testing/folder_options.dart';
+import '../testing/environment_keys.dart';
+import '../testing/folder_options.dart';
 
 const int minSupportedMajorVersion = 2;
 const int minSupportedMinorVersion = 12;

pkg/front_end/test/fasta/weak_suite.dart

@@ -5,8 +5,8 @@
 library fasta.test.weak_suite;
 
 import 'suite_utils.dart' show internalMain;
-import 'testing/environment_keys.dart';
-import 'testing/suite.dart';
+import '../testing/environment_keys.dart';
+import '../testing/suite.dart';
 
 Future<FastaContext> createContext(
     Chain suite, Map<String, String> environment) {

pkg/front_end/test/incremental_suite.dart

@@ -70,7 +70,7 @@ import "package:yaml/yaml.dart" show YamlMap, loadYamlNode;
 
 import 'binary_md_dill_reader.dart' show DillComparer;
 import 'fasta/suite_utils.dart';
-import 'fasta/testing/environment_keys.dart';
+import 'testing/environment_keys.dart';
 import "incremental_utils.dart" as util;
 import 'test_utils.dart';
 import 'testing_utils.dart' show checkEnvironment;

pkg/front_end/test/outline_extractor_suite.dart

@@ -16,7 +16,7 @@ import 'package:testing/testing.dart'
     show Chain, ChainContext, ExpectationSet, Result, Step, TestDescription;
 
 import 'fasta/suite_utils.dart';
-import 'fasta/testing/environment_keys.dart';
+import 'testing/environment_keys.dart';
 import 'incremental_suite.dart' as helper;
 import 'testing_utils.dart' show checkEnvironment;
 import 'utils/kernel_chain.dart' show MatchContext;

pkg/front_end/test/parser/parser_ast_test.dart

@@ -26,7 +26,7 @@ void main(List<String> args) {
 
 void canParseTopLevelIshOfAllFrontendFiles() {
   Stopwatch stopwatch = new Stopwatch()..start();
-  Directory directory = new Directory.fromUri(base.resolve("../../../"));
+  Directory directory = new Directory.fromUri(base.resolve("../../"));
   int processed = 0;
   int errors = 0;
   for (FileSystemEntity entry in directory.listSync(recursive: true)) {

pkg/front_end/test/parser_suite.dart

@@ -30,7 +30,7 @@ import 'package:testing/testing.dart'
     show Chain, ChainContext, ExpectationSet, Result, Step, TestDescription;
 
 import 'fasta/suite_utils.dart';
-import 'fasta/testing/environment_keys.dart';
+import 'testing/environment_keys.dart';
 import 'parser_test_listener.dart' show ParserTestListener;
 import 'parser_test_parser.dart' show TestParser;
 import 'testing_utils.dart' show checkEnvironment;

pkg/front_end/test/testing/suite.dart

@@ -123,9 +123,9 @@ import 'package:testing/testing.dart'
         StdioProcess;
 import 'package:vm/modular/target/vm.dart' show VmTarget;
 
-import '../../incremental_suite.dart' show TestRecorderForTesting;
-import '../../testing_utils.dart' show checkEnvironment;
-import '../../utils/kernel_chain.dart'
+import '../incremental_suite.dart' show TestRecorderForTesting;
+import '../testing_utils.dart' show checkEnvironment;
+import '../utils/kernel_chain.dart'
     show
         ComponentResult,
         ErrorCommentChecker,
@@ -134,7 +134,7 @@ import '../../utils/kernel_chain.dart'
         Print,
         TypeCheck,
         WriteDill;
-import '../../utils/validating_instrumentation.dart'
+import '../utils/validating_instrumentation.dart'
     show ValidatingInstrumentation;
 import 'environment_keys.dart';
 import 'folder_options.dart';

pkg/front_end/test/utils/kernel_chain.dart

@@ -52,7 +52,7 @@ import 'package:testing/testing.dart'
         Step,
         TestDescription;
 
-import '../fasta/testing/suite.dart' show CompilationSetup, CompileMode;
+import '../testing/suite.dart' show CompilationSetup, CompileMode;
 import '../test_utils.dart';
 
 final Uri platformBinariesLocation = computePlatformBinariesLocation();

pkg/front_end/testing.json

@@ -328,7 +328,7 @@
       "exclude": [
         "lib/",
         "test/fasta/super_mixins_test\\.dart$",
-        "test/fasta/types/subtypes_benchmark\\.dart$",
+        "test/types/subtypes_benchmark\\.dart$",
         "test/fasta/unlinked_scope_test\\.dart$",
         "test/memory_file_system_test\\.dart$",
         "test/scanner_fasta_test\\.dart$",

pkg/kernel/lib/src/ast/types.dart

@@ -1613,9 +1613,9 @@ class IntersectionType extends DartType {
             // replicated in nnbd_mixed/type_parameter_nullability
             (leftNullability == Nullability.nullable &&
                 rightNullability == Nullability.nonNullable) ||
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
+            // pkg/front_end/test/types/kernel_type_parser_test
             // pkg/front_end/test/fasta/incremental_hello_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/fasta_types_test
             // pkg/front_end/tool/fasta_perf_test
             // nnbd/issue42089
             // replicated in nnbd_mixed/type_parameter_nullability
@@ -1623,7 +1623,7 @@ class IntersectionType extends DartType {
                 rightNullability == Nullability.nullable) ||
             // pkg/front_end/test/dill_round_trip_test
             // pkg/front_end/test/compile_dart2js_with_no_sdk_test
-            // pkg/front_end/test/fasta/types/large_app_benchmark_test
+            // pkg/front_end/test/types/large_app_benchmark_test
             // pkg/front_end/test/incremental_dart2js_test
             // pkg/front_end/test/read_dill_from_binary_md_test
             // pkg/front_end/test/static_types/static_type_test
@@ -1645,16 +1645,16 @@ class IntersectionType extends DartType {
             // These are only observed in tests and might be artifacts of the
             // tests rather than real situations:
             //
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/kernel_type_parser_test
+            // pkg/front_end/test/types/fasta_types_test
             (leftNullability == Nullability.legacy &&
                 rightNullability == Nullability.nullable) ||
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/kernel_type_parser_test
+            // pkg/front_end/test/types/fasta_types_test
             (leftNullability == Nullability.nonNullable &&
                 rightNullability == Nullability.nullable) ||
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/kernel_type_parser_test
+            // pkg/front_end/test/types/fasta_types_test
             (leftNullability == Nullability.undetermined &&
                 rightNullability == Nullability.legacy) ||
             // pkg/kernel/test/clone_test
@@ -1775,16 +1775,16 @@ class IntersectionType extends DartType {
             // pkg/front_end/test/id_tests/type_promotion_test
             (lhsNullability == Nullability.nullable &&
                 rhsNullability == Nullability.nonNullable) ||
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
+            // pkg/front_end/test/types/kernel_type_parser_test
             // pkg/front_end/test/fasta/incremental_hello_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/fasta_types_test
             // pkg/front_end/tool/fasta_perf_test
             // nnbd/issue42089
             (lhsNullability == Nullability.nullable &&
                 rhsNullability == Nullability.nullable) ||
             // pkg/front_end/test/dill_round_trip_test
             // pkg/front_end/test/compile_dart2js_with_no_sdk_test
-            // pkg/front_end/test/fasta/types/large_app_benchmark_test
+            // pkg/front_end/test/types/large_app_benchmark_test
             // pkg/front_end/test/incremental_dart2js_test
             // pkg/front_end/test/read_dill_from_binary_md_test
             // pkg/front_end/test/static_types/static_type_test
@@ -1807,12 +1807,12 @@ class IntersectionType extends DartType {
             // (lhsNullability == Nullability.legacy &&
             //     rhsNullability == Nullability.nullable) ||
 
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/kernel_type_parser_test
+            // pkg/front_end/test/types/fasta_types_test
             (lhsNullability == Nullability.undetermined &&
                 rhsNullability == Nullability.legacy) ||
-            // pkg/front_end/test/fasta/types/kernel_type_parser_test
-            // pkg/front_end/test/fasta/types/fasta_types_test
+            // pkg/front_end/test/types/kernel_type_parser_test
+            // pkg/front_end/test/types/fasta_types_test
             (lhsNullability == Nullability.nonNullable &&
                 rhsNullability == Nullability.nullable),
         "Unexpected nullabilities for: LHS nullability = $lhsNullability, "