Index: tests/standalone/vmservice/isolate_class_test.dart |
=================================================================== |
--- tests/standalone/vmservice/isolate_class_test.dart (revision 32126) |
+++ tests/standalone/vmservice/isolate_class_test.dart (working copy) |
@@ -35,15 +35,15 @@ |
} |
} |
-class RootLibraryTest extends VmServiceRequestHelper { |
- RootLibraryTest(port, id) : |
- super('http://127.0.0.1:$port/$id/library'); |
+class IsolateSummaryTest extends VmServiceRequestHelper { |
+ IsolateSummaryTest(port, id) : |
+ super('http://127.0.0.1:$port/$id/'); |
String _libId; |
onRequestCompleted(Map reply) { |
- Expect.equals('Library', reply['type']); |
- Expect.equals('isolate_stacktrace_command_script', reply['name']); |
- _libId = reply['id']; |
+ Expect.equals('Isolate', reply['type']); |
+ Expect.equals('isolate_stacktrace_command_script', reply['rootLib']['name']); |
+ _libId = reply['rootLib']['id']; |
} |
} |
@@ -54,8 +54,8 @@ |
onRequestCompleted(Map reply) { |
IsolateListTester tester = new IsolateListTester(reply); |
tester.checkIsolateCount(2); |
- tester.checkIsolateNameContains('isolate_stacktrace_command_script.dart'); |
- _isolateId = tester.checkIsolateNameContains('myIsolateName'); |
+ // TODO(turnidge): Fragile. Relies on isolate order in response. |
+ _isolateId = tester.getIsolateId(1); |
} |
} |
@@ -64,11 +64,11 @@ |
process.launch().then((port) { |
var test = new IsolateListTest(port); |
test.makeRequest().then((_) { |
- var rootLibraryTest = |
- new RootLibraryTest(port, test._isolateId); |
- rootLibraryTest.makeRequest().then((_) { |
+ var isolateSummaryTest = |
+ new IsolateSummaryTest(port, test._isolateId); |
+ isolateSummaryTest.makeRequest().then((_) { |
var libraryTest = new LibraryTest(port, test._isolateId, |
- rootLibraryTest._libId); |
+ isolateSummaryTest._libId); |
libraryTest.makeRequest().then((_) { |
var classTest = new ClassTest(port, test._isolateId, |
libraryTest._classId); |