| 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_echo_test; | 5 library isolate_echo_test; |
| 6 | 6 |
| 7 import 'test_helper.dart'; | 7 import 'test_helper.dart'; |
| 8 import 'package:expect/expect.dart'; | 8 import 'package:expect/expect.dart'; |
| 9 | 9 |
| 10 class EchoRequestTest extends VmServiceRequestHelper { | 10 class EchoRequestTest extends VmServiceRequestHelper { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 Expect.equals('z', reply['request']['option_keys'][3]); | 26 Expect.equals('z', reply['request']['option_keys'][3]); |
| 27 | 27 |
| 28 Expect.equals(4, reply['request']['option_values'].length); | 28 Expect.equals(4, reply['request']['option_values'].length); |
| 29 Expect.equals('b', reply['request']['option_values'][0]); | 29 Expect.equals('b', reply['request']['option_values'][0]); |
| 30 Expect.equals('', reply['request']['option_values'][1]); | 30 Expect.equals('', reply['request']['option_values'][1]); |
| 31 Expect.equals('e', reply['request']['option_values'][2]); | 31 Expect.equals('e', reply['request']['option_values'][2]); |
| 32 Expect.equals('w', reply['request']['option_values'][3]); | 32 Expect.equals('w', reply['request']['option_values'][3]); |
| 33 } | 33 } |
| 34 } | 34 } |
| 35 | 35 |
| 36 class IsolateListTest extends VmServiceRequestHelper { | 36 class VMTest extends VmServiceRequestHelper { |
| 37 IsolateListTest(port) : super('http://127.0.0.1:$port/isolates'); | 37 VMTest(port) : super('http://127.0.0.1:$port/vm'); |
| 38 | 38 |
| 39 String _isolateId; | 39 String _isolateId; |
| 40 onRequestCompleted(Map reply) { | 40 onRequestCompleted(Map reply) { |
| 41 IsolateListTester tester = new IsolateListTester(reply); | 41 VMTester tester = new VMTester(reply); |
| 42 tester.checkIsolateCount(1); | 42 tester.checkIsolateCount(1); |
| 43 _isolateId = tester.getIsolateId(0); | 43 _isolateId = tester.getIsolateId(0); |
| 44 } | 44 } |
| 45 } | 45 } |
| 46 | 46 |
| 47 | 47 |
| 48 main() { | 48 main() { |
| 49 var process = new TestLauncher('isolate_echo_script.dart'); | 49 var process = new TestLauncher('isolate_echo_script.dart'); |
| 50 process.launch().then((port) { | 50 process.launch().then((port) { |
| 51 var test = new IsolateListTest(port); | 51 var test = new VMTest(port); |
| 52 test.makeRequest().then((_) { | 52 test.makeRequest().then((_) { |
| 53 var echoRequestTest = new EchoRequestTest(port, test._isolateId); | 53 var echoRequestTest = new EchoRequestTest(port, test._isolateId); |
| 54 echoRequestTest.makeRequest().then((_) { | 54 echoRequestTest.makeRequest().then((_) { |
| 55 process.requestExit(); | 55 process.requestExit(); |
| 56 }); | 56 }); |
| 57 }); | 57 }); |
| 58 }); | 58 }); |
| 59 } | 59 } |
| OLD | NEW |