| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library isolate_class_list_test; | 5 library isolate_class_list_test; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'test_helper.dart'; | 8 import 'test_helper.dart'; |
| 9 import 'package:expect/expect.dart'; | 9 import 'package:expect/expect.dart'; |
| 10 | 10 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 } | 155 } |
| 156 | 156 |
| 157 class IsolateListTest extends VmServiceRequestHelper { | 157 class IsolateListTest extends VmServiceRequestHelper { |
| 158 IsolateListTest(port) : super('http://127.0.0.1:$port/isolates'); | 158 IsolateListTest(port) : super('http://127.0.0.1:$port/isolates'); |
| 159 | 159 |
| 160 String _isolateId; | 160 String _isolateId; |
| 161 onRequestCompleted(Map reply) { | 161 onRequestCompleted(Map reply) { |
| 162 IsolateListTester tester = new IsolateListTester(reply); | 162 IsolateListTester tester = new IsolateListTester(reply); |
| 163 tester.checkIsolateCount(1); | 163 tester.checkIsolateCount(1); |
| 164 tester.checkIsolateNameContains('field_script.dart'); | 164 _isolateId = tester.getIsolateId(0); |
| 165 _isolateId = tester.checkIsolateNameContains('field_script'); | |
| 166 } | 165 } |
| 167 } | 166 } |
| 168 | 167 |
| 169 main() { | 168 main() { |
| 170 var process = new TestLauncher('field_script.dart'); | 169 var process = new TestLauncher('field_script.dart'); |
| 171 process.launch().then((port) { | 170 process.launch().then((port) { |
| 172 var test = new IsolateListTest(port); | 171 var test = new IsolateListTest(port); |
| 173 test.makeRequest().then((_) { | 172 test.makeRequest().then((_) { |
| 174 var classTableTest = new ClassTableTest(port, test._isolateId); | 173 var classTableTest = new ClassTableTest(port, test._isolateId); |
| 175 classTableTest.makeRequest().then((_) { | 174 classTableTest.makeRequest().then((_) { |
| 176 var bananaClassTest = | 175 var bananaClassTest = |
| 177 new BananaClassTest(port, test._isolateId, | 176 new BananaClassTest(port, test._isolateId, |
| 178 classTableTest.banana_class_id); | 177 classTableTest.banana_class_id); |
| 179 var badBananaClassTest = | 178 var badBananaClassTest = |
| 180 new BadBananaClassTest(port, test._isolateId, | 179 new BadBananaClassTest(port, test._isolateId, |
| 181 classTableTest.bad_banana_class_id); | 180 classTableTest.bad_banana_class_id); |
| 182 Future.wait([bananaClassTest.makeRequest(), | 181 Future.wait([bananaClassTest.makeRequest(), |
| 183 badBananaClassTest.makeRequest()]).then((_) { | 182 badBananaClassTest.makeRequest()]).then((_) { |
| 184 process.requestExit(); | 183 process.requestExit(); |
| 185 }); | 184 }); |
| 186 }); | 185 }); |
| 187 }); | 186 }); |
| 188 }); | 187 }); |
| 189 } | 188 } |
| OLD | NEW |