From fd35dc4667e0c69110cd01e27b1d33b6a9e99167 Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Wed, 13 Nov 2024 09:24:12 +0000 Subject: [PATCH] [cfe] Move individual tests from test/fasta/ to test/ Change-Id: Iee49ecf801a046b83d44b6998135411ca447be04 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394861 Reviewed-by: Jens Johansen Commit-Queue: Johnni Winther --- pkg/front_end/messages.yaml | 6 +++--- pkg/front_end/test/{fasta => }/ambiguous_export_test.dart | 2 +- pkg/front_end/test/{fasta => }/analyze_git_test.dart | 0 .../test/{fasta => }/analyze_src_with_lints_git_test.dart | 0 pkg/front_end/test/{fasta => }/assert_locations_test.dart | 0 pkg/front_end/test/{fasta => }/bootstrap_test.dart | 0 .../test/{fasta => }/generator_to_string_test.dart | 2 +- pkg/front_end/test/{fasta => }/incremental_hello_test.dart | 0 pkg/front_end/test/{fasta => }/link_test.dart | 0 pkg/front_end/test/{fasta => }/object_supertype_test.dart | 0 pkg/front_end/test/{fasta => }/reexport_test.dart | 0 pkg/front_end/test/spell_checking_list_tests.txt | 1 + pkg/front_end/test/{fasta => }/super_mixins_test.dart | 2 +- pkg/front_end/test/{fasta => }/tool_git_test.dart | 0 pkg/front_end/test/{fasta => }/uri_translator_test.dart | 0 15 files changed, 7 insertions(+), 6 deletions(-) rename pkg/front_end/test/{fasta => }/ambiguous_export_test.dart (97%) rename pkg/front_end/test/{fasta => }/analyze_git_test.dart (100%) rename pkg/front_end/test/{fasta => }/analyze_src_with_lints_git_test.dart (100%) rename pkg/front_end/test/{fasta => }/assert_locations_test.dart (100%) rename pkg/front_end/test/{fasta => }/bootstrap_test.dart (100%) rename pkg/front_end/test/{fasta => }/generator_to_string_test.dart (99%) rename pkg/front_end/test/{fasta => }/incremental_hello_test.dart (100%) rename pkg/front_end/test/{fasta => }/link_test.dart (100%) rename pkg/front_end/test/{fasta => }/object_supertype_test.dart (100%) rename pkg/front_end/test/{fasta => }/reexport_test.dart (100%) rename pkg/front_end/test/{fasta => }/super_mixins_test.dart (97%) rename pkg/front_end/test/{fasta => }/tool_git_test.dart (100%) rename pkg/front_end/test/{fasta => }/uri_translator_test.dart (100%) diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml index 75f59568a25e..12c1cbab8faf 100644 --- a/pkg/front_end/messages.yaml +++ b/pkg/front_end/messages.yaml @@ -4895,17 +4895,17 @@ TypeOriginWithFileUri: ObjectExtends: problemMessage: "The class 'Object' can't have a superclass." frontendInternal: true - external: test/fasta/object_supertype_test.dart + external: test/object_supertype_test.dart ObjectImplements: problemMessage: "The class 'Object' can't implement anything." frontendInternal: true - external: test/fasta/object_supertype_test.dart + external: test/object_supertype_test.dart ObjectMixesIn: problemMessage: "The class 'Object' can't use mixins." frontendInternal: true - external: test/fasta/object_supertype_test.dart + external: test/object_supertype_test.dart StaticAndInstanceConflict: problemMessage: "This static member conflicts with an instance member." diff --git a/pkg/front_end/test/fasta/ambiguous_export_test.dart b/pkg/front_end/test/ambiguous_export_test.dart similarity index 97% rename from pkg/front_end/test/fasta/ambiguous_export_test.dart rename to pkg/front_end/test/ambiguous_export_test.dart index 8bb2806420f4..fad06687daba 100644 --- a/pkg/front_end/test/fasta/ambiguous_export_test.dart +++ b/pkg/front_end/test/ambiguous_export_test.dart @@ -15,7 +15,7 @@ import 'package:kernel/ast.dart' Future main() async { await asyncTest(() async { - Uri uri = Uri.parse("org.dartlang.fasta:library"); + Uri uri = Uri.parse("org.dartlang.cfe:library"); Library library = new Library(uri, fileUri: uri); Field field = new Field.immutable( new Name(unserializableExportName, library), diff --git a/pkg/front_end/test/fasta/analyze_git_test.dart b/pkg/front_end/test/analyze_git_test.dart similarity index 100% rename from pkg/front_end/test/fasta/analyze_git_test.dart rename to pkg/front_end/test/analyze_git_test.dart diff --git a/pkg/front_end/test/fasta/analyze_src_with_lints_git_test.dart b/pkg/front_end/test/analyze_src_with_lints_git_test.dart similarity index 100% rename from pkg/front_end/test/fasta/analyze_src_with_lints_git_test.dart rename to pkg/front_end/test/analyze_src_with_lints_git_test.dart diff --git a/pkg/front_end/test/fasta/assert_locations_test.dart b/pkg/front_end/test/assert_locations_test.dart similarity index 100% rename from pkg/front_end/test/fasta/assert_locations_test.dart rename to pkg/front_end/test/assert_locations_test.dart diff --git a/pkg/front_end/test/fasta/bootstrap_test.dart b/pkg/front_end/test/bootstrap_test.dart similarity index 100% rename from pkg/front_end/test/fasta/bootstrap_test.dart rename to pkg/front_end/test/bootstrap_test.dart diff --git a/pkg/front_end/test/fasta/generator_to_string_test.dart b/pkg/front_end/test/generator_to_string_test.dart similarity index 99% rename from pkg/front_end/test/fasta/generator_to_string_test.dart rename to pkg/front_end/test/generator_to_string_test.dart index a1107c2c159a..b3fbb1415adb 100644 --- a/pkg/front_end/test/fasta/generator_to_string_test.dart +++ b/pkg/front_end/test/generator_to_string_test.dart @@ -54,7 +54,7 @@ import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/core_types.dart'; import 'package:kernel/target/targets.dart' show NoneTarget, TargetFlags; -import '../mock_file_system.dart'; +import 'mock_file_system.dart'; void check(String expected, Object generator) { Expect.stringEquals(expected, "$generator"); diff --git a/pkg/front_end/test/fasta/incremental_hello_test.dart b/pkg/front_end/test/incremental_hello_test.dart similarity index 100% rename from pkg/front_end/test/fasta/incremental_hello_test.dart rename to pkg/front_end/test/incremental_hello_test.dart diff --git a/pkg/front_end/test/fasta/link_test.dart b/pkg/front_end/test/link_test.dart similarity index 100% rename from pkg/front_end/test/fasta/link_test.dart rename to pkg/front_end/test/link_test.dart diff --git a/pkg/front_end/test/fasta/object_supertype_test.dart b/pkg/front_end/test/object_supertype_test.dart similarity index 100% rename from pkg/front_end/test/fasta/object_supertype_test.dart rename to pkg/front_end/test/object_supertype_test.dart diff --git a/pkg/front_end/test/fasta/reexport_test.dart b/pkg/front_end/test/reexport_test.dart similarity index 100% rename from pkg/front_end/test/fasta/reexport_test.dart rename to pkg/front_end/test/reexport_test.dart diff --git a/pkg/front_end/test/spell_checking_list_tests.txt b/pkg/front_end/test/spell_checking_list_tests.txt index fe7411795061..e1781699280c 100644 --- a/pkg/front_end/test/spell_checking_list_tests.txt +++ b/pkg/front_end/test/spell_checking_list_tests.txt @@ -456,6 +456,7 @@ introducer inv involves ioo +irrespective ish it'll italic diff --git a/pkg/front_end/test/fasta/super_mixins_test.dart b/pkg/front_end/test/super_mixins_test.dart similarity index 97% rename from pkg/front_end/test/fasta/super_mixins_test.dart rename to pkg/front_end/test/super_mixins_test.dart index b88a9ca9e4e2..ac3dcca83a72 100644 --- a/pkg/front_end/test/fasta/super_mixins_test.dart +++ b/pkg/front_end/test/super_mixins_test.dart @@ -68,7 +68,7 @@ DiagnosticMessageHandler _makeDiagnosticMessageHandler(Set names) { } /// Check that by default an error is reported for all unresolved super -/// invocations: independently of weather they target abstract super members +/// invocations: independently of whether they target abstract super members /// or nonexistent targets. Future testSuperMixins() async { var missingSuperMethodNames = new Set(); diff --git a/pkg/front_end/test/fasta/tool_git_test.dart b/pkg/front_end/test/tool_git_test.dart similarity index 100% rename from pkg/front_end/test/fasta/tool_git_test.dart rename to pkg/front_end/test/tool_git_test.dart diff --git a/pkg/front_end/test/fasta/uri_translator_test.dart b/pkg/front_end/test/uri_translator_test.dart similarity index 100% rename from pkg/front_end/test/fasta/uri_translator_test.dart rename to pkg/front_end/test/uri_translator_test.dart