Skip to content

Commit

Permalink
Updating Chrome Proxy Service tests to avoid manually invoking generi…
Browse files Browse the repository at this point in the history 
…c Dart constructors. (#2477)

This fixes breakages from an incoming change to update how DDC represents generic types.

The old code here was manually invoking Dart constructors from JS; this broke when we changed their APIs to accept an RTI. The new scheme evals a top-level object (initialized with the correct state).
  • Loading branch information
@Markzipan
Markzipan authored Aug 13, 2024
1 parent e1c2b7f commit a995a59
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 66 deletions.
168 changes: 102 additions & 66 deletions dwds/test/chrome_proxy_service_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:dwds/src/config/tool_configuration.dart';
import 'package:dwds/src/services/chrome_proxy_service.dart';
import 'package:dwds/src/utilities/dart_uri.dart';
import 'package:dwds/src/utilities/shared.dart';
Expand All @@ -22,7 +21,6 @@ import 'package:test_common/logging.dart';
import 'package:test_common/test_sdk_configuration.dart';
import 'package:vm_service/vm_service.dart';
import 'package:vm_service_interface/vm_service_interface.dart';
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';

import 'fixtures/context.dart';
import 'fixtures/project.dart';
Expand Down Expand Up @@ -670,38 +668,13 @@ void main() {
expect(largeString.length, 5 * 250);
});

/// Helper to create a list of 1001 elements, doing a direct JS eval.
Future<RemoteObject> createList() {
final expr = '''
(function () {
const sdk = ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk");
const list = sdk.dart.dsend(sdk.core.List,"filled", [1001, 5]);
list[4] = 100;
return list;
})()''';
return service.inspector.jsEvaluate(expr);
}

/// Helper to create a LinkedHashMap with 1001 entries, doing a direct JS eval.
Future<RemoteObject> createMap() {
final expr = '''
(function () {
const sdk = ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk");
const iterable = sdk.dart.dsend(sdk.core.Iterable, "generate", [1001]);
const list1 = sdk.dart.dsend(iterable, "toList", []);
const reversed = sdk.dart.dload(list1, "reversed");
const list2 = sdk.dart.dsend(reversed, "toList", []);
const map = sdk.dart.dsend(list2, "asMap", []);
const linkedMap = sdk.dart.dsend(sdk.collection.LinkedHashMap, "from", [map]);
return linkedMap;
})()''';
return service.inspector.jsEvaluate(expr);
}

test('Lists', () async {
final list = await createList();
final inst =
await service.getObject(isolate.id!, list.objectId!) as Instance;
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(isolate.id!, list.id!) as Instance;
expect(inst.length, 1001);
expect(inst.offset, null);
expect(inst.count, null);
Expand All @@ -713,9 +686,12 @@ void main() {
});

test('Maps', () async {
final map = await createMap();
final inst =
await service.getObject(isolate.id!, map.objectId!) as Instance;
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(isolate.id!, map.id!) as Instance;
expect(inst.length, 1001);
expect(inst.offset, null);
expect(inst.count, null);
Expand Down Expand Up @@ -769,10 +745,14 @@ void main() {

group('getObject called with offset/count parameters', () {
test('Lists with null offset and count are not truncated', () async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: null,
offset: null,
) as Instance;
Expand All @@ -787,10 +767,14 @@ void main() {
});

test('Lists with null count are not truncated', () async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: null,
offset: 0,
) as Instance;
Expand All @@ -807,10 +791,14 @@ void main() {
test(
'Lists with null count and offset greater than 0 are '
'truncated from offset to end of list', () async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: null,
offset: 1000,
) as Instance;
Expand All @@ -823,10 +811,14 @@ void main() {
});

test('Lists with offset/count are truncated', () async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: 7,
offset: 4,
) as Instance;
Expand All @@ -842,10 +834,14 @@ void main() {

test('Lists are truncated to the end if offset/count runs off the end',
() async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: 5,
offset: 1000,
) as Instance;
Expand All @@ -859,10 +855,14 @@ void main() {

test('Lists are truncated to empty if offset runs off the end',
() async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: 5,
offset: 1002,
) as Instance;
Expand All @@ -875,10 +875,14 @@ void main() {

test('Lists are truncated to empty with 0 count and null offset',
() async {
final list = await createList();
final list = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelList',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
list.id!,
count: 0,
offset: null,
) as Instance;
Expand All @@ -890,10 +894,14 @@ void main() {
});

test('Maps with null offset/count are not truncated', () async {
final map = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
map.objectId!,
map.id!,
count: null,
offset: null,
) as Instance;
Expand All @@ -912,10 +920,14 @@ void main() {
test(
'Maps with null count and offset greater than 0 are '
'truncated from offset to end of map', () async {
final list = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
map.id!,
count: null,
offset: 1000,
) as Instance;
Expand All @@ -929,10 +941,14 @@ void main() {
});

test('Maps with null count are not truncated', () async {
final map = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
map.objectId!,
map.id!,
count: null,
offset: 0,
) as Instance;
Expand All @@ -949,10 +965,14 @@ void main() {
});

test('Maps with offset/count are truncated', () async {
final map = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
map.objectId!,
map.id!,
count: 7,
offset: 4,
) as Instance;
Expand All @@ -970,10 +990,14 @@ void main() {

test('Maps are truncated to the end if offset/count runs off the end',
() async {
final map = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
map.objectId!,
map.id!,
count: 5,
offset: 1000,
) as Instance;
Expand All @@ -988,10 +1012,14 @@ void main() {

test('Maps are truncated to empty if offset runs off the end',
() async {
final list = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
map.id!,
count: 5,
offset: 1002,
) as Instance;
Expand Down Expand Up @@ -1022,10 +1050,14 @@ void main() {

test('Maps are truncated to empty if offset runs off the end',
() async {
final list = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
map.id!,
count: 5,
offset: 1002,
) as Instance;
Expand All @@ -1038,10 +1070,14 @@ void main() {

test('Maps are truncated to empty with 0 count and null offset',
() async {
final list = await createMap();
final map = await service.evaluate(
isolate.id!,
bootstrap!.id!,
'topLevelMap',
) as InstanceRef;
final inst = await service.getObject(
isolate.id!,
list.objectId!,
map.id!,
count: 0,
offset: null,
) as Instance;
Expand Down
13 changes: 13 additions & 0 deletions fixtures/_testSound/example/hello_world/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.

import 'dart:async';
import 'dart:collection';
import 'dart:convert';
import 'dart:developer';
import 'dart:html';
Expand All @@ -13,6 +14,18 @@ import 'package:path/path.dart' as p;

part 'part.dart';

// Create a series of top level objects for tests in
// dwds/test/chrome_proxy_service_test.dart

final topLevelList = () {
var l = List.filled(1001, 5);
l[4] = 100;
return l;
}();

final topLevelMap = LinkedHashMap.from(
Iterable.generate(1001).toList().reversed.toList().asMap());

final myInstance = MyTestClass();

void main() async {
Expand Down

0 comments on commit a995a59

Please sign in to comment.