Skip to content

Commit d2cf182

Browse files
MarkzipanMarkzipan
authored
Resolving analysis issues (#2834)
1 parent ac63d06 commit d2cf182

6 files changed

Lines changed: 119 additions & 176 deletions

File tree

‎dwds/test/integration/common/chrome_proxy_service_common.dart‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,25 +2088,21 @@ void runTests({
20882088
},
20892089
);
20902090

2091-
test(
2092-
'lookupResolvedPackageUris translates dart uris',
2093-
() async {
2094-
final service = context.service;
2095-
final vm = await service.getVM();
2096-
final isolateId = vm.isolates!.first.id!;
2091+
test('lookupResolvedPackageUris translates dart uris', () async {
2092+
final service = context.service;
2093+
final vm = await service.getVM();
2094+
final isolateId = vm.isolates!.first.id!;
20972095

2098-
final resolvedUris = await service.lookupResolvedPackageUris(
2099-
isolateId,
2100-
['dart:html', 'dart:async'],
2101-
);
2096+
final resolvedUris = await service.lookupResolvedPackageUris(isolateId, [
2097+
'dart:html',
2098+
'dart:async',
2099+
]);
21022100

2103-
expect(resolvedUris.uris, [
2104-
'org-dartlang-sdk:///sdk/lib/html/dart2js/html_dart2js.dart',
2105-
'org-dartlang-sdk:///sdk/lib/async/async.dart',
2106-
]);
2107-
},
2108-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
2109-
);
2101+
expect(resolvedUris.uris, [
2102+
'org-dartlang-sdk:///sdk/lib/html/dart2js/html_dart2js.dart',
2103+
'org-dartlang-sdk:///sdk/lib/async/async.dart',
2104+
]);
2105+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
21102106

21112107
test(
21122108
'lookupPackageUris finds package and org-dartlang-app paths',
@@ -2196,22 +2192,18 @@ void runTests({
21962192
expect(resolvedUris.uris, [null, null, null]);
21972193
});
21982194

2199-
test(
2200-
'lookupPackageUris translates dart uris',
2201-
() async {
2202-
final service = context.service;
2203-
final vm = await service.getVM();
2204-
final isolateId = vm.isolates!.first.id!;
2195+
test('lookupPackageUris translates dart uris', () async {
2196+
final service = context.service;
2197+
final vm = await service.getVM();
2198+
final isolateId = vm.isolates!.first.id!;
22052199

2206-
final resolvedUris = await service.lookupPackageUris(isolateId, [
2207-
'org-dartlang-sdk:///sdk/lib/html/dart2js/html_dart2js.dart',
2208-
'org-dartlang-sdk:///sdk/lib/async/async.dart',
2209-
]);
2200+
final resolvedUris = await service.lookupPackageUris(isolateId, [
2201+
'org-dartlang-sdk:///sdk/lib/html/dart2js/html_dart2js.dart',
2202+
'org-dartlang-sdk:///sdk/lib/async/async.dart',
2203+
]);
22102204

2211-
expect(resolvedUris.uris, ['dart:html', 'dart:async']);
2212-
},
2213-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
2214-
);
2205+
expect(resolvedUris.uris, ['dart:html', 'dart:async']);
2206+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
22152207

22162208
test('registerService', () async {
22172209
final service = context.service;

‎dwds/test/integration/dart_uri_test.dart‎

Lines changed: 30 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,17 @@ void main() {
100100

101101
tearDownAll(DartUri.clear);
102102

103-
test(
104-
'can resolve uris',
105-
() {
106-
final resolved = DartUri.toResolvedUri('dart:io');
107-
expect(resolved, 'org-dartlang-sdk:///sdk/lib/io/io.dart');
108-
},
109-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
110-
);
103+
test('can resolve uris', () {
104+
final resolved = DartUri.toResolvedUri('dart:io');
105+
expect(resolved, 'org-dartlang-sdk:///sdk/lib/io/io.dart');
106+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
111107

112-
test(
113-
'can un-resolve uris',
114-
() {
115-
final unresolved = DartUri.toPackageUri(
116-
'org-dartlang-sdk:///sdk/lib/io/io.dart',
117-
);
118-
expect(unresolved, 'dart:io');
119-
},
120-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
121-
);
108+
test('can un-resolve uris', () {
109+
final unresolved = DartUri.toPackageUri(
110+
'org-dartlang-sdk:///sdk/lib/io/io.dart',
111+
);
112+
expect(unresolved, 'dart:io');
113+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
122114
});
123115

124116
group('initialized with other SDK directory', () {
@@ -131,25 +123,17 @@ void main() {
131123
DartUri.clear();
132124
});
133125

134-
test(
135-
'can resolve uris',
136-
() {
137-
final resolved = DartUri.toResolvedUri('dart:io');
138-
expect(resolved, 'org-dartlang-sdk:///sdk/lib/io/io.dart');
139-
},
140-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
141-
);
126+
test('can resolve uris', () {
127+
final resolved = DartUri.toResolvedUri('dart:io');
128+
expect(resolved, 'org-dartlang-sdk:///sdk/lib/io/io.dart');
129+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
142130

143-
test(
144-
'can unresolve uris',
145-
() {
146-
final unresolved = DartUri.toPackageUri(
147-
'org-dartlang-sdk:///sdk/lib/io/io.dart',
148-
);
149-
expect(unresolved, 'dart:io');
150-
},
151-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
152-
);
131+
test('can unresolve uris', () {
132+
final unresolved = DartUri.toPackageUri(
133+
'org-dartlang-sdk:///sdk/lib/io/io.dart',
134+
);
135+
expect(unresolved, 'dart:io');
136+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
153137
});
154138

155139
group('initialized with other SDK directory with no libraries spec', () {
@@ -181,25 +165,17 @@ void main() {
181165
DartUri.clear();
182166
});
183167

184-
test(
185-
'cannot resolve uris',
186-
() {
187-
final resolved = DartUri.toResolvedUri('dart:io');
188-
expect(resolved, null);
189-
},
190-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
191-
);
168+
test('cannot resolve uris', () {
169+
final resolved = DartUri.toResolvedUri('dart:io');
170+
expect(resolved, null);
171+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
192172

193-
test(
194-
'cannot unresolve uris',
195-
() {
196-
final unresolved = DartUri.toPackageUri(
197-
'org-dartlang-sdk:///sdk/lib/io/io.dart',
198-
);
199-
expect(unresolved, null);
200-
},
201-
skip: 'https://github.com/dart-lang/webdev/issues/1584',
202-
);
173+
test('cannot unresolve uris', () {
174+
final unresolved = DartUri.toPackageUri(
175+
'org-dartlang-sdk:///sdk/lib/io/io.dart',
176+
);
177+
expect(unresolved, null);
178+
}, skip: 'https://github.com/dart-lang/webdev/issues/1584');
203179
});
204180
});
205181

‎dwds/test/integration/evaluate_common.dart‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -286,26 +286,19 @@ void testAll({
286286
});
287287
});
288288

289-
test(
290-
'extension method scope variables can be evaluated',
291-
() async {
292-
await onBreakPoint(mainScript, 'extension', (Event event) async {
293-
final stack = await context.service.getStack(isolateId);
294-
final scope = _getFrameVariables(stack.frames!.first);
295-
for (final p in scope.entries) {
296-
final name = p.key;
297-
final value = p.value as InstanceRef;
298-
final result = await getInstanceRef(
299-
event.topFrame!.index!,
300-
name!,
301-
);
302-
303-
expect(result, matchInstanceRef(value.valueAsString));
304-
}
305-
});
306-
},
307-
skip: 'https://github.com/dart-lang/webdev/issues/1371',
308-
);
289+
test('extension method scope variables can be evaluated', () async {
290+
await onBreakPoint(mainScript, 'extension', (Event event) async {
291+
final stack = await context.service.getStack(isolateId);
292+
final scope = _getFrameVariables(stack.frames!.first);
293+
for (final p in scope.entries) {
294+
final name = p.key;
295+
final value = p.value as InstanceRef;
296+
final result = await getInstanceRef(event.topFrame!.index!, name!);
297+
298+
expect(result, matchInstanceRef(value.valueAsString));
299+
}
300+
});
301+
}, skip: 'https://github.com/dart-lang/webdev/issues/1371');
309302

310303
test('does not crash if class metadata cannot be found', () async {
311304
await onBreakPoint(mainScript, 'printStream', (Event event) async {
@@ -695,18 +688,14 @@ void testAll({
695688
return isolate.rootLib!.id!;
696689
}
697690

698-
test(
699-
'RecordType getters',
700-
() async {
701-
final libraryId = getRootLibraryId();
691+
test('RecordType getters', () async {
692+
final libraryId = getRootLibraryId();
702693

703-
final type = await getInstanceRef(libraryId, '(0,1).runtimeType');
704-
final result = await getInstanceRef(type.id, 'hashCode');
694+
final type = await getInstanceRef(libraryId, '(0,1).runtimeType');
695+
final result = await getInstanceRef(type.id, 'hashCode');
705696

706-
expect(result, matchInstanceRefKind('Double'));
707-
},
708-
skip: 'https://github.com/dart-lang/sdk/issues/54609',
709-
);
697+
expect(result, matchInstanceRefKind('Double'));
698+
}, skip: 'https://github.com/dart-lang/sdk/issues/54609');
710699

711700
test('Object getters', () async {
712701
final libraryId = getRootLibraryId();

‎dwds/test/integration/events_common.dart‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,18 @@ void testWithDwds({required TestSdkConfigurationProvider provider}) {
9393
await context.tearDown();
9494
});
9595

96-
test(
97-
'emits DEBUGGER_READY and DEVTOOLS_LOAD events',
98-
() async {
99-
await expectEventsDuring([
100-
matchesEvent(DwdsEventKind.debuggerReady, {
101-
'elapsedMilliseconds': isNotNull,
102-
'screen': equals('debugger'),
103-
}),
104-
matchesEvent(DwdsEventKind.devToolsLoad, {
105-
'elapsedMilliseconds': isNotNull,
106-
'screen': equals('debugger'),
107-
}),
108-
], () => keyboard.sendChord([Keyboard.alt, 'd']));
109-
},
110-
skip: 'https://github.com/dart-lang/webdev/issues/2394',
111-
);
96+
test('emits DEBUGGER_READY and DEVTOOLS_LOAD events', () async {
97+
await expectEventsDuring([
98+
matchesEvent(DwdsEventKind.debuggerReady, {
99+
'elapsedMilliseconds': isNotNull,
100+
'screen': equals('debugger'),
101+
}),
102+
matchesEvent(DwdsEventKind.devToolsLoad, {
103+
'elapsedMilliseconds': isNotNull,
104+
'screen': equals('debugger'),
105+
}),
106+
], () => keyboard.sendChord([Keyboard.alt, 'd']));
107+
}, skip: 'https://github.com/dart-lang/webdev/issues/2394');
112108

113109
test('emits DEVTOOLS_LAUNCH event', () async {
114110
await expectEventDuring(

‎dwds/test/integration/fixtures/context.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,9 @@ class TestContext {
896896
}
897897

898898
Future<void> _buildDebugExtension() async {
899-
final process = await Process.run(
900-
'tool/build_extension.sh',
901-
['prod'],
902-
workingDirectory: absolutePath(pathFromDwds: 'debug_extension'),
903-
);
899+
final process = await Process.run('tool/build_extension.sh', [
900+
'prod',
901+
], workingDirectory: absolutePath(pathFromDwds: 'debug_extension'));
904902
print(process.stdout);
905903
}
906904

‎webdev/test/chrome_test.dart‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,24 @@ void main() {
7777
expect(chrome!.debugPort, isNot(equals(0)));
7878
});
7979

80-
test(
81-
'has correct profile path',
82-
() async {
83-
await launchChrome();
84-
await openTab(_chromeVersionUrl);
80+
test('has correct profile path', () async {
81+
await launchChrome();
82+
await openTab(_chromeVersionUrl);
8583

86-
final wipConnection = await connectToTab(_chromeVersionUrl);
87-
final result = await _evaluateExpression(
88-
wipConnection.page,
89-
"document.getElementById('profile_path').textContent",
90-
);
84+
final wipConnection = await connectToTab(_chromeVersionUrl);
85+
final result = await _evaluateExpression(
86+
wipConnection.page,
87+
"document.getElementById('profile_path').textContent",
88+
);
9189

92-
if (Platform.isWindows) {
93-
// --user-data-dir is not supported on Windows yet
94-
// Issue: https://github.com/dart-lang/webdev/issues/1545
95-
expect(result, isNot(contains('chrome_user_data')));
96-
} else {
97-
expect(result, contains('chrome_user_data'));
98-
}
99-
},
100-
skip: 'https://github.com/dart-lang/webdev/issues/2030',
101-
);
90+
if (Platform.isWindows) {
91+
// --user-data-dir is not supported on Windows yet
92+
// Issue: https://github.com/dart-lang/webdev/issues/1545
93+
expect(result, isNot(contains('chrome_user_data')));
94+
} else {
95+
expect(result, contains('chrome_user_data'));
96+
}
97+
}, skip: 'https://github.com/dart-lang/webdev/issues/2030');
10298
});
10399

104100
group('chrome with user data dir', () {
@@ -173,28 +169,24 @@ void main() {
173169
);
174170
});
175171

176-
test(
177-
'has correct profile path',
178-
() async {
179-
await launchChrome(userDataDir: dataDir.path);
180-
await openTab(_chromeVersionUrl);
172+
test('has correct profile path', () async {
173+
await launchChrome(userDataDir: dataDir.path);
174+
await openTab(_chromeVersionUrl);
181175

182-
final wipConnection = await connectToTab(_chromeVersionUrl);
183-
final result = await _evaluateExpression(
184-
wipConnection.page,
185-
"document.getElementById('profile_path').textContent",
186-
);
176+
final wipConnection = await connectToTab(_chromeVersionUrl);
177+
final result = await _evaluateExpression(
178+
wipConnection.page,
179+
"document.getElementById('profile_path').textContent",
180+
);
187181

188-
if (Platform.isWindows) {
189-
// --user-data-dir is not supported on Windows yet
190-
// Issue: https://github.com/dart-lang/webdev/issues/1545
191-
expect(result, isNot(contains('chrome_user_data_copy')));
192-
} else {
193-
expect(result, contains('chrome_user_data_copy'));
194-
}
195-
},
196-
skip: 'https://github.com/dart-lang/webdev/issues/2030',
197-
);
182+
if (Platform.isWindows) {
183+
// --user-data-dir is not supported on Windows yet
184+
// Issue: https://github.com/dart-lang/webdev/issues/1545
185+
expect(result, isNot(contains('chrome_user_data_copy')));
186+
} else {
187+
expect(result, contains('chrome_user_data_copy'));
188+
}
189+
}, skip: 'https://github.com/dart-lang/webdev/issues/2030');
198190

199191
test(
200192
'can auto detect default chrome directory',

0 commit comments

Comments
 (0)