deprecated sdk_configuration_test's soundNullSafety

Author: jyameo

dwds/lib/src/services/expression_compiler_service.dart

@@ -66,10 +66,10 @@ class _Compiler {
     bool verbose,
   ) async {
     sdkConfiguration.validateSdkDir();
-    sdkConfiguration.validateSoundSummaries();
+    sdkConfiguration.validateSummaries();
 
     final workerUri = sdkConfiguration.compilerWorkerUri!;
-    final sdkSummaryUri = sdkConfiguration.soundSdkSummaryUri!;
+    final sdkSummaryUri = sdkConfiguration.sdkSummaryUri!;
 
     final args = [
       '--experimental-expression-compiler',

dwds/lib/src/utilities/sdk_configuration.dart

@@ -42,25 +42,18 @@ class SdkLayout {
       SdkLayout.createDefault(defaultSdkDirectory);
 
   final String sdkDirectory;
-  final String soundSummaryPath;
-  final String weakSummaryPath;
+  final String summaryPath;
   final String dartdevcSnapshotPath;
 
   SdkLayout.createDefault(String sdkDirectory)
       : this(
           sdkDirectory: sdkDirectory,
-          soundSummaryPath: p.join(
+          summaryPath: p.join(
             sdkDirectory,
             'lib',
             '_internal',
             'ddc_outline.dill',
           ),
-          weakSummaryPath: p.join(
-            sdkDirectory,
-            'lib',
-            '_internal',
-            'ddc_outline_unsound.dill',
-          ),
           dartdevcSnapshotPath: p.join(
             sdkDirectory,
             'bin',
@@ -71,8 +64,7 @@ class SdkLayout {
 
   const SdkLayout({
     required this.sdkDirectory,
-    required this.soundSummaryPath,
-    required this.weakSummaryPath,
+    required this.summaryPath,
     required this.dartdevcSnapshotPath,
   });
 }
@@ -87,14 +79,12 @@ class SdkConfiguration {
       SdkConfiguration.fromSdkLayout(SdkLayout.defaultSdkLayout);
 
   final String? sdkDirectory;
-  final String? weakSdkSummaryPath;
-  final String? soundSdkSummaryPath;
+  final String? sdkSummaryPath;
   final String? compilerWorkerPath;
 
   const SdkConfiguration({
     this.sdkDirectory,
-    this.weakSdkSummaryPath,
-    this.soundSdkSummaryPath,
+    this.sdkSummaryPath,
     this.compilerWorkerPath,
   });
 
@@ -103,8 +93,7 @@ class SdkConfiguration {
   SdkConfiguration.fromSdkLayout(SdkLayout sdkLayout)
       : this(
           sdkDirectory: sdkLayout.sdkDirectory,
-          weakSdkSummaryPath: sdkLayout.weakSummaryPath,
-          soundSdkSummaryPath: sdkLayout.soundSummaryPath,
+          sdkSummaryPath: sdkLayout.summaryPath,
           compilerWorkerPath: sdkLayout.dartdevcSnapshotPath,
         );
 
@@ -113,8 +102,7 @@ class SdkConfiguration {
       path == null ? null : p.toUri(p.absolute(path));
 
   Uri? get sdkDirectoryUri => _toUri(sdkDirectory);
-  Uri? get soundSdkSummaryUri => _toUri(soundSdkSummaryPath);
-  Uri? get weakSdkSummaryUri => _toUri(weakSdkSummaryPath);
+  Uri? get sdkSummaryUri => _toUri(sdkSummaryPath);
 
   /// Note: has to be ///file: Uri to run in an isolate.
   Uri? get compilerWorkerUri => _toAbsoluteUri(compilerWorkerPath);
@@ -139,28 +127,10 @@ class SdkConfiguration {
   }
 
   void validateSummaries({FileSystem fileSystem = const LocalFileSystem()}) {
-    validateSoundSummaries(fileSystem: fileSystem);
-    validateWeakSummaries(fileSystem: fileSystem);
-  }
-
-  void validateWeakSummaries({
-    FileSystem fileSystem = const LocalFileSystem(),
-  }) {
-    if (weakSdkSummaryPath == null ||
-        !fileSystem.file(weakSdkSummaryPath).existsSync()) {
-      throw InvalidSdkConfigurationException(
-        'Sdk summary $weakSdkSummaryPath does not exist',
-      );
-    }
-  }
-
-  void validateSoundSummaries({
-    FileSystem fileSystem = const LocalFileSystem(),
-  }) {
-    if (soundSdkSummaryPath == null ||
-        !fileSystem.file(soundSdkSummaryPath).existsSync()) {
+    if (sdkSummaryPath == null ||
+        !fileSystem.file(sdkSummaryPath).existsSync()) {
       throw InvalidSdkConfigurationException(
-        'Sdk summary $soundSdkSummaryPath does not exist',
+        'Sdk summary $sdkSummaryPath does not exist',
       );
     }
   }

dwds/test/sdk_configuration_test.dart

@@ -25,7 +25,7 @@ void main() {
       final defaultConfiguration =
           await DefaultSdkConfigurationProvider().configuration;
       defaultConfiguration.validateSdkDir();
-      defaultConfiguration.validateSoundSummaries();
+      defaultConfiguration.validateSummaries();
     });
 
     test('Cannot validate an empty configuration layout', () async {
@@ -55,12 +55,11 @@ void main() {
       final sdkLayout = FakeSdkLayout(sdkDirectory);
       final sdkConfiguration = FakeSdkLayout.createConfiguration(sdkLayout);
 
-      final soundSdkSummaryPath = sdkLayout.soundSummaryPath;
-      final summariesDir = p.dirname(soundSdkSummaryPath);
+      final sdkSummaryPath = sdkLayout.summaryPath;
+      final summariesDir = p.dirname(sdkSummaryPath);
 
       Directory(summariesDir).createSync(recursive: true);
-      File(defaultSdkConfiguration.soundSdkSummaryPath!)
-          .copySync(soundSdkSummaryPath);
+      File(defaultSdkConfiguration.sdkSummaryPath!).copySync(sdkSummaryPath);
 
       final compilerWorkerPath = sdkLayout.compilerWorkerPath;
       final workerDir = p.dirname(compilerWorkerPath);
@@ -70,11 +69,11 @@ void main() {
           .copySync(compilerWorkerPath);
 
       expect(sdkConfiguration.sdkDirectory, equals(sdkDirectory));
-      expect(sdkConfiguration.soundSdkSummaryPath, equals(soundSdkSummaryPath));
+      expect(sdkConfiguration.sdkSummaryPath, equals(sdkSummaryPath));
       expect(sdkConfiguration.compilerWorkerPath, equals(compilerWorkerPath));
 
       sdkConfiguration.validateSdkDir();
-      sdkConfiguration.validateSoundSummaries();
+      sdkConfiguration.validateSummaries();
     });
 
     test('Cannot validate non-existing configuration layout', () async {
@@ -96,22 +95,19 @@ void main() {
 
     final sdkLayout = SdkLayout.createDefault(sdkDirectory);
     final sdkConfiguration = SdkConfiguration.fromSdkLayout(sdkLayout);
-    final soundSdkSummaryPath = sdkLayout.soundSummaryPath;
-    final weakSdkSummaryPath = sdkLayout.weakSummaryPath;
+    final sdkSummaryPath = sdkLayout.summaryPath;
     final compilerWorkerPath = sdkLayout.dartdevcSnapshotPath;
 
     setUp(() async {
       fs = MemoryFileSystem();
       await fs.directory(sdkDirectory).create(recursive: true);
-      await fs.file(soundSdkSummaryPath).create(recursive: true);
-      await fs.file(weakSdkSummaryPath).create(recursive: true);
+      await fs.file(sdkSummaryPath).create(recursive: true);
       await fs.file(compilerWorkerPath).create(recursive: true);
     });
 
     test('Can create and validate default SDK configuration', () async {
       expect(sdkConfiguration.sdkDirectory, equals(sdkDirectory));
-      expect(sdkConfiguration.soundSdkSummaryPath, equals(soundSdkSummaryPath));
-      expect(sdkConfiguration.weakSdkSummaryPath, equals(weakSdkSummaryPath));
+      expect(sdkConfiguration.sdkSummaryPath, equals(sdkSummaryPath));
       expect(sdkConfiguration.compilerWorkerPath, equals(compilerWorkerPath));
 
       sdkConfiguration.validateSdkDir(fileSystem: fs);
@@ -137,17 +133,13 @@ class FakeSdkLayout {
   static SdkConfiguration createConfiguration(FakeSdkLayout sdkLayout) =>
       SdkConfiguration(
         sdkDirectory: sdkLayout.sdkDirectory,
-        soundSdkSummaryPath: sdkLayout.soundSummaryPath,
-        weakSdkSummaryPath: sdkLayout.weakSummaryPath,
+        sdkSummaryPath: sdkLayout.summaryPath,
         compilerWorkerPath: sdkLayout.compilerWorkerPath,
       );
 
   FakeSdkLayout(this.sdkDirectory);
 
-  String get weakSummaryPath =>
-      p.join(sdkDirectory, 'summaries', 'unsound.dill');
-
-  String get soundSummaryPath =>
+  String get summaryPath =>
       p.join(sdkDirectory, 'summaries', 'sound.dill');
 
   String get compilerWorkerPath =>