From 717c52383bf735d6db5144136dade2c28401df60 Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Tue, 12 Nov 2024 14:16:01 +0000 Subject: [PATCH] [cfe] Move test/fasta/ subfolders to test/ Change-Id: Ie65105f3d68e6545ccf2c4cde3b2523014083a40 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394445 Commit-Queue: Johnni Winther Reviewed-by: Jens Johansen --- DEPS | 2 +- .../test/fasta/expression_suite.dart | 2 +- pkg/front_end/test/fasta/modular_suite.dart | 4 +-- pkg/front_end/test/fasta/outline_suite.dart | 4 +-- pkg/front_end/test/fasta/strong_suite.dart | 4 +-- pkg/front_end/test/fasta/suite_utils.dart | 2 +- .../test/fasta/textual_outline_suite.dart | 4 +-- pkg/front_end/test/fasta/weak_suite.dart | 4 +-- pkg/front_end/test/incremental_suite.dart | 2 +- .../test/outline_extractor_suite.dart | 2 +- .../parser/literal_entry_info_test.dart | 0 .../util => parser}/parser_ast_test.dart | 2 +- .../parser_ast_test_data/class.txt | 0 .../parser_ast_test_data/mixin.txt | 0 .../parser_ast_test_data/script_handle.txt | 0 .../parser_ast_test_data/top_level_stuff.txt | 0 .../top_level_stuff_helper.txt | 0 .../parser/token_stream_rewriter_test.dart | 0 .../{fasta => }/parser/type_info_test.dart | 0 pkg/front_end/test/parser_suite.dart | 2 +- .../{fasta => }/testing/environment_keys.dart | 0 .../{fasta => }/testing/folder_options.dart | 0 .../test/{fasta => }/testing/suite.dart | 8 ++--- .../{fasta => }/testing/test_options.dart | 0 .../type_inference/factor_type_test.dart | 0 .../type_constraint_gatherer_nnbd_test.dart | 0 .../type_constraint_gatherer_test.dart | 0 .../type_inference_engine_test.dart | 0 .../type_schema_elimination_nnbd_test.dart | 0 .../type_schema_elimination_test.dart | 0 .../type_schema_environment_nnbd_test.dart | 0 .../type_schema_environment_test.dart | 0 .../type_schema_environment_test_base.dart | 0 .../type_inference/type_schema_test.dart | 0 .../test/{fasta => }/types/.gitignore | 0 .../test/{fasta => }/types/README.md | 0 .../types/benchmark_data.tar.gz.sha1 | 0 .../{fasta => }/types/dart2js_benchmark.dart | 0 .../types/dart2js_benchmark_test.dart | 0 .../types/dill_hierarchy_test.dart | 0 .../{fasta => }/types/fasta_types_test.dart | 0 .../test/{fasta => }/types/hashcode_test.dart | 0 .../types/kernel_legacy_upper_bound_test.dart | 0 .../types/kernel_type_parser_test.dart | 0 .../types/large_app_benchmark.dart | 0 .../types/large_app_benchmark_test.dart | 0 .../types/legacy_upper_bound_helper.dart | 0 .../{fasta => }/types/shared_type_tests.dart | 0 .../{fasta => }/types/subtypes_benchmark.dart | 0 pkg/front_end/test/utils/kernel_chain.dart | 2 +- pkg/front_end/testing.json | 2 +- pkg/kernel/lib/src/ast/types.dart | 32 +++++++++---------- 52 files changed, 39 insertions(+), 39 deletions(-) rename pkg/front_end/test/{fasta => }/parser/literal_entry_info_test.dart (100%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test.dart (99%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test_data/class.txt (100%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test_data/mixin.txt (100%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test_data/script_handle.txt (100%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test_data/top_level_stuff.txt (100%) rename pkg/front_end/test/{fasta/util => parser}/parser_ast_test_data/top_level_stuff_helper.txt (100%) rename pkg/front_end/test/{fasta => }/parser/token_stream_rewriter_test.dart (100%) rename pkg/front_end/test/{fasta => }/parser/type_info_test.dart (100%) rename pkg/front_end/test/{fasta => }/testing/environment_keys.dart (100%) rename pkg/front_end/test/{fasta => }/testing/folder_options.dart (100%) rename pkg/front_end/test/{fasta => }/testing/suite.dart (99%) rename pkg/front_end/test/{fasta => }/testing/test_options.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/factor_type_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_constraint_gatherer_nnbd_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_constraint_gatherer_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_inference_engine_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_elimination_nnbd_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_elimination_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_environment_nnbd_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_environment_test.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_environment_test_base.dart (100%) rename pkg/front_end/test/{fasta => }/type_inference/type_schema_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/.gitignore (100%) rename pkg/front_end/test/{fasta => }/types/README.md (100%) rename pkg/front_end/test/{fasta => }/types/benchmark_data.tar.gz.sha1 (100%) rename pkg/front_end/test/{fasta => }/types/dart2js_benchmark.dart (100%) rename pkg/front_end/test/{fasta => }/types/dart2js_benchmark_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/dill_hierarchy_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/fasta_types_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/hashcode_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/kernel_legacy_upper_bound_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/kernel_type_parser_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/large_app_benchmark.dart (100%) rename pkg/front_end/test/{fasta => }/types/large_app_benchmark_test.dart (100%) rename pkg/front_end/test/{fasta => }/types/legacy_upper_bound_helper.dart (100%) rename pkg/front_end/test/{fasta => }/types/shared_type_tests.dart (100%) rename pkg/front_end/test/{fasta => }/types/subtypes_benchmark.dart (100%) diff --git a/DEPS b/DEPS index f95d2c1a6f9..723bc3edb73 100644 --- a/DEPS +++ b/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", diff --git a/pkg/front_end/test/fasta/expression_suite.dart b/pkg/front_end/test/fasta/expression_suite.dart index 95c5f125aa5..26b1c0a07dd 100644 --- a/pkg/front_end/test/fasta/expression_suite.dart +++ b/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; diff --git a/pkg/front_end/test/fasta/modular_suite.dart b/pkg/front_end/test/fasta/modular_suite.dart index 6decce047ff..0898dd031ef 100644 --- a/pkg/front_end/test/fasta/modular_suite.dart +++ b/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 createContext( Chain suite, Map environment) { diff --git a/pkg/front_end/test/fasta/outline_suite.dart b/pkg/front_end/test/fasta/outline_suite.dart index 8c20d540f8d..5e38e7b510e 100644 --- a/pkg/front_end/test/fasta/outline_suite.dart +++ b/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 createContext( Chain suite, Map environment) { diff --git a/pkg/front_end/test/fasta/strong_suite.dart b/pkg/front_end/test/fasta/strong_suite.dart index f5605ed1029..bbfcc137b33 100644 --- a/pkg/front_end/test/fasta/strong_suite.dart +++ b/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 createContext( Chain suite, Map environment) { diff --git a/pkg/front_end/test/fasta/suite_utils.dart b/pkg/front_end/test/fasta/suite_utils.dart index e45b3dfbef9..1debbac3d67 100644 --- a/pkg/front_end/test/fasta/suite_utils.dart +++ b/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="; diff --git a/pkg/front_end/test/fasta/textual_outline_suite.dart b/pkg/front_end/test/fasta/textual_outline_suite.dart index 116f40c5a27..a8724344e19 100644 --- a/pkg/front_end/test/fasta/textual_outline_suite.dart +++ b/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; diff --git a/pkg/front_end/test/fasta/weak_suite.dart b/pkg/front_end/test/fasta/weak_suite.dart index 171095fe153..e6bd6741fc7 100644 --- a/pkg/front_end/test/fasta/weak_suite.dart +++ b/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 createContext( Chain suite, Map environment) { diff --git a/pkg/front_end/test/incremental_suite.dart b/pkg/front_end/test/incremental_suite.dart index c8168dda2d5..3f025c60c82 100644 --- a/pkg/front_end/test/incremental_suite.dart +++ b/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; diff --git a/pkg/front_end/test/outline_extractor_suite.dart b/pkg/front_end/test/outline_extractor_suite.dart index eaf1ac2c5d5..7e1d93d550f 100644 --- a/pkg/front_end/test/outline_extractor_suite.dart +++ b/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; diff --git a/pkg/front_end/test/fasta/parser/literal_entry_info_test.dart b/pkg/front_end/test/parser/literal_entry_info_test.dart similarity index 100% rename from pkg/front_end/test/fasta/parser/literal_entry_info_test.dart rename to pkg/front_end/test/parser/literal_entry_info_test.dart diff --git a/pkg/front_end/test/fasta/util/parser_ast_test.dart b/pkg/front_end/test/parser/parser_ast_test.dart similarity index 99% rename from pkg/front_end/test/fasta/util/parser_ast_test.dart rename to pkg/front_end/test/parser/parser_ast_test.dart index 09ca9fb7697..cb8c013fa5e 100644 --- a/pkg/front_end/test/fasta/util/parser_ast_test.dart +++ b/pkg/front_end/test/parser/parser_ast_test.dart @@ -26,7 +26,7 @@ void main(List 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)) { diff --git a/pkg/front_end/test/fasta/util/parser_ast_test_data/class.txt b/pkg/front_end/test/parser/parser_ast_test_data/class.txt similarity index 100% rename from pkg/front_end/test/fasta/util/parser_ast_test_data/class.txt rename to pkg/front_end/test/parser/parser_ast_test_data/class.txt diff --git a/pkg/front_end/test/fasta/util/parser_ast_test_data/mixin.txt b/pkg/front_end/test/parser/parser_ast_test_data/mixin.txt similarity index 100% rename from pkg/front_end/test/fasta/util/parser_ast_test_data/mixin.txt rename to pkg/front_end/test/parser/parser_ast_test_data/mixin.txt diff --git a/pkg/front_end/test/fasta/util/parser_ast_test_data/script_handle.txt b/pkg/front_end/test/parser/parser_ast_test_data/script_handle.txt similarity index 100% rename from pkg/front_end/test/fasta/util/parser_ast_test_data/script_handle.txt rename to pkg/front_end/test/parser/parser_ast_test_data/script_handle.txt diff --git a/pkg/front_end/test/fasta/util/parser_ast_test_data/top_level_stuff.txt b/pkg/front_end/test/parser/parser_ast_test_data/top_level_stuff.txt similarity index 100% rename from pkg/front_end/test/fasta/util/parser_ast_test_data/top_level_stuff.txt rename to pkg/front_end/test/parser/parser_ast_test_data/top_level_stuff.txt diff --git a/pkg/front_end/test/fasta/util/parser_ast_test_data/top_level_stuff_helper.txt b/pkg/front_end/test/parser/parser_ast_test_data/top_level_stuff_helper.txt similarity index 100% rename from pkg/front_end/test/fasta/util/parser_ast_test_data/top_level_stuff_helper.txt rename to pkg/front_end/test/parser/parser_ast_test_data/top_level_stuff_helper.txt diff --git a/pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart b/pkg/front_end/test/parser/token_stream_rewriter_test.dart similarity index 100% rename from pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart rename to pkg/front_end/test/parser/token_stream_rewriter_test.dart diff --git a/pkg/front_end/test/fasta/parser/type_info_test.dart b/pkg/front_end/test/parser/type_info_test.dart similarity index 100% rename from pkg/front_end/test/fasta/parser/type_info_test.dart rename to pkg/front_end/test/parser/type_info_test.dart diff --git a/pkg/front_end/test/parser_suite.dart b/pkg/front_end/test/parser_suite.dart index c60766e67e5..b6f6dab2f6e 100644 --- a/pkg/front_end/test/parser_suite.dart +++ b/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; diff --git a/pkg/front_end/test/fasta/testing/environment_keys.dart b/pkg/front_end/test/testing/environment_keys.dart similarity index 100% rename from pkg/front_end/test/fasta/testing/environment_keys.dart rename to pkg/front_end/test/testing/environment_keys.dart diff --git a/pkg/front_end/test/fasta/testing/folder_options.dart b/pkg/front_end/test/testing/folder_options.dart similarity index 100% rename from pkg/front_end/test/fasta/testing/folder_options.dart rename to pkg/front_end/test/testing/folder_options.dart diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/testing/suite.dart similarity index 99% rename from pkg/front_end/test/fasta/testing/suite.dart rename to pkg/front_end/test/testing/suite.dart index 5d3838980e2..9367a51e152 100644 --- a/pkg/front_end/test/fasta/testing/suite.dart +++ b/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'; diff --git a/pkg/front_end/test/fasta/testing/test_options.dart b/pkg/front_end/test/testing/test_options.dart similarity index 100% rename from pkg/front_end/test/fasta/testing/test_options.dart rename to pkg/front_end/test/testing/test_options.dart diff --git a/pkg/front_end/test/fasta/type_inference/factor_type_test.dart b/pkg/front_end/test/type_inference/factor_type_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/factor_type_test.dart rename to pkg/front_end/test/type_inference/factor_type_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_nnbd_test.dart b/pkg/front_end/test/type_inference/type_constraint_gatherer_nnbd_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_nnbd_test.dart rename to pkg/front_end/test/type_inference/type_constraint_gatherer_nnbd_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart b/pkg/front_end/test/type_inference/type_constraint_gatherer_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart rename to pkg/front_end/test/type_inference/type_constraint_gatherer_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_inference_engine_test.dart b/pkg/front_end/test/type_inference/type_inference_engine_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_inference_engine_test.dart rename to pkg/front_end/test/type_inference/type_inference_engine_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_elimination_nnbd_test.dart b/pkg/front_end/test/type_inference/type_schema_elimination_nnbd_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_elimination_nnbd_test.dart rename to pkg/front_end/test/type_inference/type_schema_elimination_nnbd_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_elimination_test.dart b/pkg/front_end/test/type_inference/type_schema_elimination_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_elimination_test.dart rename to pkg/front_end/test/type_inference/type_schema_elimination_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_environment_nnbd_test.dart b/pkg/front_end/test/type_inference/type_schema_environment_nnbd_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_environment_nnbd_test.dart rename to pkg/front_end/test/type_inference/type_schema_environment_nnbd_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart b/pkg/front_end/test/type_inference/type_schema_environment_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart rename to pkg/front_end/test/type_inference/type_schema_environment_test.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_environment_test_base.dart b/pkg/front_end/test/type_inference/type_schema_environment_test_base.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_environment_test_base.dart rename to pkg/front_end/test/type_inference/type_schema_environment_test_base.dart diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_test.dart b/pkg/front_end/test/type_inference/type_schema_test.dart similarity index 100% rename from pkg/front_end/test/fasta/type_inference/type_schema_test.dart rename to pkg/front_end/test/type_inference/type_schema_test.dart diff --git a/pkg/front_end/test/fasta/types/.gitignore b/pkg/front_end/test/types/.gitignore similarity index 100% rename from pkg/front_end/test/fasta/types/.gitignore rename to pkg/front_end/test/types/.gitignore diff --git a/pkg/front_end/test/fasta/types/README.md b/pkg/front_end/test/types/README.md similarity index 100% rename from pkg/front_end/test/fasta/types/README.md rename to pkg/front_end/test/types/README.md diff --git a/pkg/front_end/test/fasta/types/benchmark_data.tar.gz.sha1 b/pkg/front_end/test/types/benchmark_data.tar.gz.sha1 similarity index 100% rename from pkg/front_end/test/fasta/types/benchmark_data.tar.gz.sha1 rename to pkg/front_end/test/types/benchmark_data.tar.gz.sha1 diff --git a/pkg/front_end/test/fasta/types/dart2js_benchmark.dart b/pkg/front_end/test/types/dart2js_benchmark.dart similarity index 100% rename from pkg/front_end/test/fasta/types/dart2js_benchmark.dart rename to pkg/front_end/test/types/dart2js_benchmark.dart diff --git a/pkg/front_end/test/fasta/types/dart2js_benchmark_test.dart b/pkg/front_end/test/types/dart2js_benchmark_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/dart2js_benchmark_test.dart rename to pkg/front_end/test/types/dart2js_benchmark_test.dart diff --git a/pkg/front_end/test/fasta/types/dill_hierarchy_test.dart b/pkg/front_end/test/types/dill_hierarchy_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/dill_hierarchy_test.dart rename to pkg/front_end/test/types/dill_hierarchy_test.dart diff --git a/pkg/front_end/test/fasta/types/fasta_types_test.dart b/pkg/front_end/test/types/fasta_types_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/fasta_types_test.dart rename to pkg/front_end/test/types/fasta_types_test.dart diff --git a/pkg/front_end/test/fasta/types/hashcode_test.dart b/pkg/front_end/test/types/hashcode_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/hashcode_test.dart rename to pkg/front_end/test/types/hashcode_test.dart diff --git a/pkg/front_end/test/fasta/types/kernel_legacy_upper_bound_test.dart b/pkg/front_end/test/types/kernel_legacy_upper_bound_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/kernel_legacy_upper_bound_test.dart rename to pkg/front_end/test/types/kernel_legacy_upper_bound_test.dart diff --git a/pkg/front_end/test/fasta/types/kernel_type_parser_test.dart b/pkg/front_end/test/types/kernel_type_parser_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/kernel_type_parser_test.dart rename to pkg/front_end/test/types/kernel_type_parser_test.dart diff --git a/pkg/front_end/test/fasta/types/large_app_benchmark.dart b/pkg/front_end/test/types/large_app_benchmark.dart similarity index 100% rename from pkg/front_end/test/fasta/types/large_app_benchmark.dart rename to pkg/front_end/test/types/large_app_benchmark.dart diff --git a/pkg/front_end/test/fasta/types/large_app_benchmark_test.dart b/pkg/front_end/test/types/large_app_benchmark_test.dart similarity index 100% rename from pkg/front_end/test/fasta/types/large_app_benchmark_test.dart rename to pkg/front_end/test/types/large_app_benchmark_test.dart diff --git a/pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart b/pkg/front_end/test/types/legacy_upper_bound_helper.dart similarity index 100% rename from pkg/front_end/test/fasta/types/legacy_upper_bound_helper.dart rename to pkg/front_end/test/types/legacy_upper_bound_helper.dart diff --git a/pkg/front_end/test/fasta/types/shared_type_tests.dart b/pkg/front_end/test/types/shared_type_tests.dart similarity index 100% rename from pkg/front_end/test/fasta/types/shared_type_tests.dart rename to pkg/front_end/test/types/shared_type_tests.dart diff --git a/pkg/front_end/test/fasta/types/subtypes_benchmark.dart b/pkg/front_end/test/types/subtypes_benchmark.dart similarity index 100% rename from pkg/front_end/test/fasta/types/subtypes_benchmark.dart rename to pkg/front_end/test/types/subtypes_benchmark.dart diff --git a/pkg/front_end/test/utils/kernel_chain.dart b/pkg/front_end/test/utils/kernel_chain.dart index 9783c876316..7641ba13c21 100644 --- a/pkg/front_end/test/utils/kernel_chain.dart +++ b/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(); diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json index 77b1d4a75ad..02b24c5368e 100644 --- a/pkg/front_end/testing.json +++ b/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$", diff --git a/pkg/kernel/lib/src/ast/types.dart b/pkg/kernel/lib/src/ast/types.dart index 6ba943663b8..3073854a124 100644 --- a/pkg/kernel/lib/src/ast/types.dart +++ b/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, "