Chromium Code Reviews| Index: runtime/vm/service_test.cc |
| =================================================================== |
| --- runtime/vm/service_test.cc (revision 35950) |
| +++ runtime/vm/service_test.cc (working copy) |
| @@ -279,7 +279,7 @@ |
| "\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true," |
| "\"resolved\":false," |
| "\"location\":{\"type\":\"Location\"," |
| - "\"script\":\"dart:test-lib\",\"tokenPos\":5}}]}", |
| + "\"script\":\"test-lib\",\"tokenPos\":5}}]}", |
| handler.msg()); |
| // Individual breakpoint. |
| @@ -290,7 +290,7 @@ |
| "{\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true," |
| "\"resolved\":false," |
| "\"location\":{\"type\":\"Location\"," |
| - "\"script\":\"dart:test-lib\",\"tokenPos\":5}}", |
| + "\"script\":\"test-lib\",\"tokenPos\":5}}", |
| handler.msg()); |
| // Missing sub-command. |
| @@ -606,7 +606,7 @@ |
| Service::HandleIsolateMessage(isolate, service_msg); |
| handler.HandleNextMessage(); |
| EXPECT_SUBSTRING("\"type\":\"Library\"", handler.msg()); |
| - EXPECT_SUBSTRING("\"url\":\"dart:test-lib\"", handler.msg()); |
| + EXPECT_SUBSTRING("\"url\":\"test-lib\"", handler.msg()); |
| // Evaluate an expression from a library. |
| service_msg = EvalF(h_lib, |
| @@ -1058,12 +1058,12 @@ |
| EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port)); |
| Instance& service_msg = Instance::Handle(); |
| - service_msg = Eval(h_lib, "[port, ['scripts', 'dart:test-lib'], [], []]"); |
| + service_msg = Eval(h_lib, "[port, ['scripts', 'test-lib'], [], []]"); |
| Service::HandleIsolateMessage(isolate, service_msg); |
| handler.HandleNextMessage(); |
| EXPECT_STREQ( |
| - "{\"type\":\"Script\",\"id\":\"scripts\\/dart%3Atest-lib\"," |
| - "\"name\":\"dart:test-lib\",\"user_name\":\"dart:test-lib\"," |
| + "{\"type\":\"Script\",\"id\":\"scripts\\/test-lib\"," |
| + "\"name\":\"test-lib\",\"user_name\":\"test-lib\"," |
| "\"kind\":\"script\"," |
| "\"source\":\"var port;\\n\\nmain() {\\n}\"," |
| "\"tokenPosTable\":[[1,0,1,1,5,2,9],[3,5,1,6,5,7,6,8,8],[4,10,1]]}", |
| @@ -1085,7 +1085,7 @@ |
| "}"; |
| Isolate* isolate = Isolate::Current(); |
| - Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL); |
| + Dart_Handle h_lib = TestCase::LoadCoreTestScript(kScript, NULL); |
|
Ivan Posva
2014/05/09 06:31:35
It is not clear why you need LoadCoreTestScript he
hausner
2014/05/09 17:07:18
Looking at this again, the test fooled me. It does
|
| EXPECT_VALID(h_lib); |
| Library& lib = Library::Handle(); |
| lib ^= Api::UnwrapHandle(h_lib); |