Simplify test fixtures

dwds/test/common/chrome_proxy_service_common.dart

@@ -2067,7 +2067,7 @@ void runTests({
         expect(
           resolvedUris.uris,
           containsAll([
-            contains('/_testSound/example/hello_world/main.dart'),
+            contains('/_test/example/hello_world/main.dart'),
             contains('/lib/path.dart'),
             contains('/lib/src/path_set.dart'),
           ]),

dwds/test/fixtures/project.dart

@@ -22,7 +22,7 @@ class TestProject {
   late Directory _fixturesCopy;
 
   /// The top level directory in which we run the test server, e.g.
-  /// "/tmp/_testSound".
+  /// "/tmp/_test".
   String get absolutePackageDirectory =>
       p.join(_fixturesCopy.absolute.path, packageDirectory);
 
@@ -39,7 +39,7 @@ class TestProject {
   }
 
   /// The path to the Dart entry file, e.g,
-  /// "/tmp/_testSound/example/hello_world/main.dart":
+  /// "/tmp/_test/example/hello_world/main.dart":
   String get dartEntryFilePath => p.joinAll([
     _fixturesCopy.absolute.path,
     packageDirectory,
@@ -61,67 +61,67 @@ class TestProject {
 
   TestProject.testPackage({IndexBaseMode baseMode = IndexBaseMode.noBase})
     : this._(
-        packageName: '_test_package_sound',
-        packageDirectory: '_testPackageSound',
+        packageName: '_test_package',
+        packageDirectory: '_test_package',
         webAssetsPath: 'web',
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
       );
 
   static final testCircular1 = TestProject._(
-    packageName: '_test_circular1_sound',
-    packageDirectory: '_testCircular1Sound',
+    packageName: '_test_circular1',
+    packageDirectory: '_test_circular1',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   TestProject.testCircular2({IndexBaseMode baseMode = IndexBaseMode.noBase})
     : this._(
-        packageName: '_test_circular2_sound',
-        packageDirectory: '_testCircular2Sound',
+        packageName: '_test_circular2',
+        packageDirectory: '_test_circular2',
         webAssetsPath: 'web',
         dartEntryFileName: 'main.dart',
         htmlEntryFileName:
             baseMode == IndexBaseMode.base ? 'base_index.html' : 'index.html',
       );
 
   static final test = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: 'example/hello_world',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testScopes = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: webCompatiblePath(['example', 'scopes']),
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'scopes.html',
   );
 
   static final testAppendBody = TestProject._(
-    packageName: '_test_sound',
-    packageDirectory: '_testSound',
+    packageName: '_test',
+    packageDirectory: '_test',
     webAssetsPath: webCompatiblePath(['example', 'append_body']),
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testExperiment = TestProject._(
-    packageName: '_experiment_sound',
-    packageDirectory: '_experimentSound',
+    packageName: '_experiment',
+    packageDirectory: '_experiment',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotRestart1 = TestProject._(
     packageName: '_test_hot_restart1',
-    packageDirectory: '_testHotRestart1Sound',
+    packageDirectory: '_test_hot_restart1',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
@@ -131,31 +131,31 @@ class TestProject {
   /// order to test correctness when only a subset of libraries are updated.
   static final testHotRestart2 = TestProject._(
     packageName: '_test_hot_restart2',
-    packageDirectory: '_testHotRestart2Sound',
+    packageDirectory: '_test_hot_restart2',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotRestartBreakpoints = TestProject._(
     packageName: '_test_hot_restart_breakpoints',
-    packageDirectory: '_testHotRestartBreakpoints',
+    packageDirectory: '_test_hot_restart_breakpoints',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotReload = TestProject._(
     packageName: '_test_hot_reload',
-    packageDirectory: '_testHotReload',
+    packageDirectory: '_test_hot_reload',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
   );
 
   static final testHotReloadBreakpoints = TestProject._(
     packageName: '_test_hot_reload_breakpoints',
-    packageDirectory: '_testHotReloadBreakpoints',
+    packageDirectory: '_test_hot_reload_breakpoints',
     webAssetsPath: 'web',
     dartEntryFileName: 'main.dart',
     htmlEntryFileName: 'index.html',
@@ -257,7 +257,7 @@ class TestProject {
   }
 
   /// The path to the Dart specified file in the 'lib' directory, e.g,
-  /// "/tmp/_testSound/lib/library.dart":
+  /// "/tmp/_test/lib/library.dart":
   String dartLibFilePath(String dartLibFileName) => p.joinAll([
     _fixturesCopy.absolute.path,
     packageDirectory,

dwds/test/load_strategy_test.dart

@@ -36,7 +36,7 @@ void main() {
         test('defaults to "./dart_tool/package_config.json"', () {
           expect(
             p.split(strategy.packageConfigPath).join('/'),
-            endsWith('_testSound/.dart_tool/package_config.json'),
+            endsWith('_test/.dart_tool/package_config.json'),
           );
         });
       },

fixtures/_experimentSound/pubspec.yaml → fixtures/_experiment/pubspec.yaml

@@ -1,4 +1,4 @@
-name: _experiment_sound
+name: _experiment
 version: 1.0.0
 description: >-
   A fake package used for testing experimental language features.

fixtures/_testSound/pubspec.yaml → fixtures/_test/pubspec.yaml

@@ -1,7 +1,7 @@
-name: _test_sound
+name: _test
 version: 1.0.0
 description: >-
-  A fake package used for testing sound null-safety.
+  A fake package used for testing.
 publish_to: none
 
 environment:

fixtures/_testCircular1Sound/lib/library1.dart → fixtures/_test_circular1/lib/library1.dart

@@ -5,7 +5,7 @@
 /// A library that we can import.
 library;
 
-import 'package:_test_circular2_sound/library2.dart';
+import 'package:_test_circular2/library2.dart';
 
 String concatenate(String a, String b) {
   return '$a$b'; // Breakpoint: Concatenate

fixtures/_testCircular1Sound/pubspec.yaml → fixtures/_test_circular1/pubspec.yaml

@@ -1,7 +1,7 @@
-name: _test_circular1_sound
+name: _test_circular1
 version: 1.0.0
 description: >-
-    A fake package used for testing imports with sound null-safety with circular dependency.
+    A fake package used for testing imports with circular dependency.
 publish_to: none
 
 environment:
@@ -10,8 +10,8 @@ environment:
 dependencies:
   intl: ^0.17.0
   path: ^1.6.1
-  _test_circular2_sound:
-    path: ../_testCircular2Sound
+  _test_circular2:
+    path: ../_test_circular2
 
 dev_dependencies:
   build_runner: ^2.5.0

fixtures/_testCircular2Sound/lib/library2.dart → fixtures/_test_circular2/lib/library2.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'package:_test_circular1_sound/library1.dart';
+import 'package:_test_circular1/library1.dart';
 
 int globalValue = 0;
 

fixtures/_testPackageSound/pubspec.yaml → fixtures/_test_circular2/pubspec.yaml

@@ -1,15 +1,15 @@
-name: _test_package_sound
+name: _test_circular2
 version: 1.0.0
 description: >-
-  A fake package used for testing imports with sound null-safety. Imports _test.
+  A fake package used for testing imports with circular dependency.
 publish_to: none
 
 environment:
   sdk: ^3.2.0
 
 dependencies:
-  _test_sound:
-    path: ../_testSound
+  _test_circular1:
+    path: ../_test_circular1
 
 dev_dependencies:
   build_runner: ^2.5.0

fixtures/_testCircular2Sound/web/main.dart → fixtures/_test_circular2/web/main.dart

@@ -8,8 +8,8 @@ import 'dart:core';
 // ignore: deprecated_member_use
 import 'dart:html';
 
-import 'package:_test_circular1_sound/library1.dart';
-import 'package:_test_circular2_sound/library2.dart';
+import 'package:_test_circular1/library1.dart';
+import 'package:_test_circular2/library2.dart';
 
 void main() {
   // For setting breakpoints.

fixtures/_testHotRestart2Sound/pubspec.yaml → fixtures/_test_hot_restart2/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   intl: ^0.17.0
   path: ^1.6.1
   _test_hot_restart1:
-    path: ../_testHotRestart1Sound
+    path: ../_test_hot_restart1
 
 dev_dependencies:
   build_runner: ^2.5.0

fixtures/_test_package/pubspec.yaml

@@ -0,0 +1,16 @@
+name: _test_package
+version: 1.0.0
+description: >-
+  A fake package used for testing imports. Imports _test.
+publish_to: none
+
+environment:
+  sdk: ^3.2.0
+
+dependencies:
+  _test:
+    path: ../_test
+
+dev_dependencies:
+  build_runner: ^2.5.0
+  build_web_compilers: ^4.0.4

fixtures/_testPackageSound/web/main.dart → fixtures/_test_package/web/main.dart

@@ -10,9 +10,9 @@ import 'dart:developer';
 // ignore: deprecated_member_use
 import 'dart:html';
 
-import 'package:_test_package_sound/test_library.dart';
-import 'package:_test_sound/deferred_library.dart' deferred as d;
-import 'package:_test_sound/library.dart';
+import 'package:_test_package/test_library.dart';
+import 'package:_test/deferred_library.dart' deferred as d;
+import 'package:_test/library.dart';
 
 extension NumberParsing on String {
   int parseInt() {

fixtures/_webdevSoundSmoke/pubspec.yaml → fixtures/_webdev_smoke/pubspec.yaml

@@ -1,5 +1,5 @@
-name: _webdev_sound_smoke
-description: A test fixture for webdev testing with sound support.
+name: _webdev_smoke
+description: A test fixture for webdev testing.
 
 publish_to: none