Skip to content

Fix test timeouts related to weak null safety #2416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Fix test timeouts related to weak null safety #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23a2470
Remove weak null safety options
elliette Apr 22, 2024
ab8867d
Remove option from instance inspection tests
elliette Apr 22, 2024
f9cb890
Analyzer error
elliette Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions dwds/test/build_daemon_circular_evaluate_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
);
}
16 changes: 5 additions & 11 deletions dwds/test/build_daemon_evaluate_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
);
}
4 changes: 1 addition & 3 deletions dwds/test/evaluate_circular_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}) {
Expand All @@ -30,9 +29,8 @@ void testAll({
);
}

final testCircular1 = TestProject.testCircular1(nullSafety: nullSafety);
final testCircular1 = TestProject.testCircular1();
final testCircular2 = TestProject.testCircular2(
nullSafety: nullSafety,
baseMode: indexBaseMode,
);

Expand Down
19 changes: 2 additions & 17 deletions dwds/test/evaluate_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}) {
Expand All @@ -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);

Expand Down Expand Up @@ -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 =
Expand Down
Loading