Eliminate unused url mapping parameter in dartutils

runtime/vm/service_test.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 261 matching lines @@
 
   // Get the breakpoint list.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"BreakpointList\",\"breakpoints\":[{"
           "\"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.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"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.
   service_msg = Eval(lib, "[port, ['debug'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
        "\"message\":\"Must specify a subcommand\","
        "\"request\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
@@ skipping 295 matching lines @@
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request library.
   service_msg = EvalF(h_lib,
                       "[port, ['libraries', '%" Pd "'], [], []]", lib_id);
   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,
                       "[port, ['libraries', '%" Pd "', 'eval'], "
                       "['expr'], ['libVar - 1']]", lib_id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
@@ skipping 431 matching lines @@
   EXPECT_VALID(h_lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   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]]}",
       handler.msg());
 }
 
 
 // TODO(zra): Remove when tests are ready to enable.
 #if !defined(TARGET_ARCH_ARM64)
 
 TEST_CASE(Service_Coverage) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "var x = 7;\n"
       "main() {\n"
       "  x = x * x;\n"
       "  x = x / 13;\n"
       "}";
 
   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 here.

[hausner, 2014/05/09 17:07:18]

Looking at this again, the test fooled me. It does not need to be loaded into a
core library. The test outputs a number of error messages about not being able
to find native methods, but it passes anyway.

   EXPECT_VALID(h_lib);
   Library& lib = Library::Handle();
   lib ^= Api::UnwrapHandle(h_lib);
   EXPECT(!lib.IsNull());
   Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
@@ skipping 306 matching lines @@
   service_msg = Eval(h_lib, "[port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart