Skip to content

Remove stale calls to dartSdkIsAtLeast. #2677

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 1 commit into from
Aug 27, 2025
Merged

Remove stale calls to dartSdkIsAtLeast. #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions dwds/test/instances/common/instance_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:dwds/src/debugging/inspector.dart';
import 'package:test/test.dart';
import 'package:test_common/logging.dart';
import 'package:test_common/test_sdk_configuration.dart';
import 'package:test_common/utilities.dart';
import 'package:vm_service/vm_service.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

Expand Down Expand Up @@ -72,12 +71,7 @@ void runTypeSystemVerificationTests({
final remoteObject = await inspector.jsEvaluate(
libraryVariableTypeExpression('libraryPublicFinal', compilationMode),
);
expect(
remoteObject.json['className'],
canaryFeatures || dartSdkIsAtLeast(newDdcTypeSystemVersion)
? 'dart_rti.Rti.new'
: 'Function',
);
expect(remoteObject.json['className'], 'dart_rti.Rti.new');
});
});
});
Expand Down Expand Up @@ -243,7 +237,7 @@ void runTests({
expect(classRef.name, '_ControllerStream<int>');
expect(classRef.id, 'classes|dart:async|_ControllerStream<int>');
expect(inspector.isDisplayableObject(ref), isTrue);
}, skip: !dartSdkIsAtLeast('3.6.0-148.0.dev'));
});

test(
'for a Dart error',
Expand Down Expand Up @@ -431,7 +425,7 @@ void runTests({
final classRef = instance.classRef!;
expect(classRef.name, '_ControllerStream<int>');
expect(inspector.isDisplayableObject(instance), isTrue);
}, skip: !dartSdkIsAtLeast('3.6.0-148.0.dev'));
});

test(
'for a Dart error',
Expand Down
34 changes: 9 additions & 25 deletions dwds/test/instances/common/patterns_inspection_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'package:test/test.dart';
import 'package:test_common/logging.dart';
import 'package:test_common/test_sdk_configuration.dart';
import 'package:test_common/utilities.dart';
import 'package:vm_service/vm_service.dart';

import '../../fixtures/context.dart';
Expand Down Expand Up @@ -98,30 +97,15 @@ void runTests({
await onBreakPoint('testPatternCase2', (event) async {
final frame = event.topFrame!;

if (dartSdkIsAtLeast('3.7.0-246.0.dev')) {
expect(await getFrameVariables(frame), {
'obj': matchListInstance(type: 'Object'),
// Renamed to avoid shadowing variables from previous case.
'a\$': matchPrimitiveInstance(
kind: InstanceKind.kString,
value: 'b',
),
'n\$': matchPrimitiveInstance(
kind: InstanceKind.kDouble,
value: 3.14,
),
});
} else {
expect(await getFrameVariables(frame), {
'obj': matchListInstance(type: 'Object'),
// Renamed to avoid shadowing variables from previous case.
'a': matchPrimitiveInstance(kind: InstanceKind.kString, value: 'b'),
'n': matchPrimitiveInstance(
kind: InstanceKind.kDouble,
value: 3.14,
),
});
}
expect(await getFrameVariables(frame), {
'obj': matchListInstance(type: 'Object'),
// Renamed to avoid shadowing variables from previous case.
'a\$': matchPrimitiveInstance(kind: InstanceKind.kString, value: 'b'),
'n\$': matchPrimitiveInstance(
kind: InstanceKind.kDouble,
value: 3.14,
),
});
});
});

Expand Down
69 changes: 30 additions & 39 deletions dwds/test/instances/common/record_type_inspection_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'package:test/test.dart';
import 'package:test_common/logging.dart';
import 'package:test_common/test_sdk_configuration.dart';
import 'package:test_common/utilities.dart';
import 'package:vm_service/vm_service.dart';

import '../../fixtures/context.dart';
Expand Down Expand Up @@ -126,7 +125,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('simple record type display', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -190,7 +189,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('complex record type display', () async {
await onBreakPoint('printComplexLocalRecord', (event) async {
Expand Down Expand Up @@ -245,21 +244,17 @@ void runTests({
});
});

test(
'complex record type with named fields getters',
() async {
await onBreakPoint('printComplexNamedLocalRecord', (event) async {
final frame = event.topFrame!.index!;
final instanceRef = await getInstanceRef(frame, 'record.runtimeType');

expect(
await getDisplayedGetters(instanceRef),
matchDisplayedTypeObjectGetters,
);
});
},
skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'),
);
test('complex record type with named fields getters', () async {
await onBreakPoint('printComplexNamedLocalRecord', (event) async {
final frame = event.topFrame!.index!;
final instanceRef = await getInstanceRef(frame, 'record.runtimeType');

expect(
await getDisplayedGetters(instanceRef),
matchDisplayedTypeObjectGetters,
);
});
});

test('complex record type with named fields display', () async {
await onBreakPoint('printComplexNamedLocalRecord', (event) async {
Expand Down Expand Up @@ -332,7 +327,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('nested record type display', () async {
await onBreakPoint('printNestedLocalRecord', (event) async {
Expand Down Expand Up @@ -392,26 +387,22 @@ void runTests({
});
});

test(
'nested record type with named fields getters',
() async {
await onBreakPoint('printNestedNamedLocalRecord', (event) async {
final frame = event.topFrame!.index!;
final instanceRef = await getInstanceRef(frame, 'record.runtimeType');
final elements = await getElements(instanceRef.id!);

expect(
await getDisplayedGetters(instanceRef),
matchDisplayedTypeObjectGetters,
);
expect(
await getDisplayedGetters(elements[1]),
matchDisplayedTypeObjectGetters,
);
});
},
skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'),
);
test('nested record type with named fields getters', () async {
await onBreakPoint('printNestedNamedLocalRecord', (event) async {
final frame = event.topFrame!.index!;
final instanceRef = await getInstanceRef(frame, 'record.runtimeType');
final elements = await getElements(instanceRef.id!);

expect(
await getDisplayedGetters(instanceRef),
matchDisplayedTypeObjectGetters,
);
expect(
await getDisplayedGetters(elements[1]),
matchDisplayedTypeObjectGetters,
);
});
});

test('nested record type with named fields display', () async {
await onBreakPoint('printNestedNamedLocalRecord', (event) async {
Expand Down
13 changes: 6 additions & 7 deletions dwds/test/instances/common/type_inspection_common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import 'package:test/test.dart';
import 'package:test_common/logging.dart';
import 'package:test_common/test_sdk_configuration.dart';
import 'package:test_common/utilities.dart';
import 'package:vm_service/vm_service.dart';

import '../../fixtures/context.dart';
Expand Down Expand Up @@ -135,7 +134,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('int type', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -167,7 +166,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('list type', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -229,7 +228,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('set type', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -261,7 +260,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('record type', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -297,7 +296,7 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});

test('class type', () async {
await onBreakPoint('printSimpleLocalRecord', (event) async {
Expand Down Expand Up @@ -335,6 +334,6 @@ void runTests({
matchDisplayedTypeObjectGetters,
);
});
}, skip: !dartSdkIsAtLeast('3.4.0-56.0.dev'));
});
});
}
2 changes: 0 additions & 2 deletions test_common/lib/utilities.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ const webdevDirName = 'webdev';
const dwdsDirName = 'dwds';
const fixturesDirName = 'fixtures';

const newDdcTypeSystemVersion = '3.3.0-242.0.dev';

/// The path to the webdev directory in the local machine, e.g.
/// '/workstation/webdev'.
String get webdevPath {
Expand Down
9 changes: 2 additions & 7 deletions webdev/test/e2e_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import 'package:logging/logging.dart';
import 'package:path/path.dart' as p;
import 'package:pub_semver/pub_semver.dart';
import 'package:test/test.dart';
import 'package:test_common/utilities.dart';
import 'package:test_descriptor/test_descriptor.dart' as d;
import 'package:test_process/test_process.dart';
import 'package:vm_service/vm_service.dart';
Expand Down Expand Up @@ -446,9 +445,7 @@ void main() {
const TypeMatcher<InstanceRef>().having(
(instance) => instance.classRef?.name,
'class name',
dartSdkIsAtLeast('3.3.0-242.0.dev')
? 'JSArray<bool>'
: 'List<bool>'));
'JSArray<bool>'));

final instanceRef = result as InstanceRef;
final list = await vmService.getObject(isolateId, instanceRef.id!);
Expand All @@ -457,9 +454,7 @@ void main() {
const TypeMatcher<Instance>().having(
(instance) => instance.classRef?.name,
'class name',
dartSdkIsAtLeast('3.3.0-242.0.dev')
? 'JSArray<bool>'
: 'List<bool>'));
'JSArray<bool>'));

final elements = (list as Instance).elements;
expect(elements, [
Expand Down
Loading