Fix test timeouts related to weak null safety (#2416)

dart-lang · Apr 22, 2024 · 0b18816 · 0b18816
1 parent d4f9f67
commit 0b18816
Show file tree

Hide file tree

Showing 12 changed files with 583 additions and 690 deletions.
diff --git a/dwds/test/build_daemon_circular_evaluate_test.dart b/dwds/test/build_daemon_circular_evaluate_test.dart
@@ -10,7 +10,6 @@ import 'package:test_common/test_sdk_configuration.dart';
 
 import 'evaluate_circular_common.dart';
 import 'fixtures/context.dart';
-import 'fixtures/project.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
@@ -19,14 +18,9 @@ void main() async {
   final provider = TestSdkConfigurationProvider(verbose: debug);
   tearDownAll(provider.dispose);
 
-  for (var nullSafety in NullSafety.values) {
-    group('${nullSafety.name} null safety |', () {
-      testAll(
-        provider: provider,
-        compilationMode: CompilationMode.buildDaemon,
-        nullSafety: nullSafety,
-        debug: debug,
-      );
-    });
-  }
+  testAll(
+    provider: provider,
+    compilationMode: CompilationMode.buildDaemon,
+    debug: debug,
+  );
 }
diff --git a/dwds/test/build_daemon_evaluate_test.dart b/dwds/test/build_daemon_evaluate_test.dart
@@ -11,7 +11,6 @@ import 'package:test_common/test_sdk_configuration.dart';
 
 import 'evaluate_common.dart';
 import 'fixtures/context.dart';
-import 'fixtures/project.dart';
 
 void main() async {
   // Enable verbose logging for debugging.
@@ -20,14 +19,9 @@ void main() async {
   final provider = TestSdkConfigurationProvider(verbose: debug);
   tearDownAll(provider.dispose);
 
-  for (var nullSafety in NullSafety.values) {
-    group('${nullSafety.name} null safety |', () {
-      testAll(
-        provider: provider,
-        compilationMode: CompilationMode.buildDaemon,
-        nullSafety: nullSafety,
-        debug: debug,
-      );
-    });
-  }
+  testAll(
+    provider: provider,
+    compilationMode: CompilationMode.buildDaemon,
+    debug: debug,
+  );
 }
diff --git a/dwds/test/evaluate_circular_common.dart b/dwds/test/evaluate_circular_common.dart
@@ -19,7 +19,6 @@ void testAll({
   required TestSdkConfigurationProvider provider,
   CompilationMode compilationMode = CompilationMode.buildDaemon,
   IndexBaseMode indexBaseMode = IndexBaseMode.noBase,
-  NullSafety nullSafety = NullSafety.sound,
   bool useDebuggerModuleNames = false,
   bool debug = false,
 }) {
@@ -30,9 +29,8 @@ void testAll({
     );
   }
 
-  final testCircular1 = TestProject.testCircular1(nullSafety: nullSafety);
+  final testCircular1 = TestProject.testCircular1();
   final testCircular2 = TestProject.testCircular2(
-    nullSafety: nullSafety,
     baseMode: indexBaseMode,
   );
 

diff --git a/dwds/test/evaluate_common.dart b/dwds/test/evaluate_common.dart
@@ -21,7 +21,6 @@ void testAll({
   required TestSdkConfigurationProvider provider,
   CompilationMode compilationMode = CompilationMode.buildDaemon,
   IndexBaseMode indexBaseMode = IndexBaseMode.noBase,
-  NullSafety nullSafety = NullSafety.sound,
   bool useDebuggerModuleNames = false,
   bool debug = false,
 }) {
@@ -32,9 +31,8 @@ void testAll({
     );
   }
 
-  final testProject = TestProject.test(nullSafety: nullSafety);
-  final testPackageProject =
-      TestProject.testPackage(nullSafety: nullSafety, baseMode: indexBaseMode);
+  final testProject = TestProject.test();
+  final testPackageProject = TestProject.testPackage(baseMode: indexBaseMode);
 
   final context = TestContext(testPackageProject, provider);
 
@@ -302,19 +300,6 @@ void testAll({
           skip: 'https://github.com/dart-lang/webdev/issues/1371',
         );
 
-        test('uses correct null safety mode', () async {
-          await onBreakPoint(mainScript, 'printLocal', (event) async {
-            final isNullSafetyEnabledExpression =
-                '() { const sound = !(<Null>[] is List<int>); return sound; } ()';
-            final result = await getInstanceRef(
-              event.topFrame!.index!,
-              isNullSafetyEnabledExpression,
-            );
-            final expectedResult = '${nullSafety == NullSafety.sound}';
-            expect(result, matchInstanceRef(expectedResult));
-          });
-        });
-
         test('does not crash if class metadata cannot be found', () async {
           await onBreakPoint(mainScript, 'printStream', (event) async {
             final instanceRef =