Eliminate unused url mapping parameter in dartutils

runtime/vm/dart_api_impl_test.cc

 // Copyright (c) 2012, 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 "bin/builtin.h"
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
@@ skipping 31 matching lines @@
 
   EXPECT(!Dart_ErrorHasException(instance));
   EXPECT(!Dart_ErrorHasException(error));
   EXPECT(Dart_ErrorHasException(exception));
 
   EXPECT_STREQ("", Dart_GetError(instance));
   EXPECT_STREQ("myerror", Dart_GetError(error));
   EXPECT_STREQ(
       "Unhandled exception:\n"
       "Exception: bad news\n"
-      "#0      testMain (dart:test-lib:2:3)",
+      "#0      testMain (test-lib:2:3)",
       Dart_GetError(exception));
 
   EXPECT(Dart_IsError(Dart_ErrorGetException(instance)));
   EXPECT(Dart_IsError(Dart_ErrorGetException(error)));
   EXPECT_VALID(Dart_ErrorGetException(exception));
 
   EXPECT(Dart_IsError(Dart_ErrorGetStacktrace(instance)));
   EXPECT(Dart_IsError(Dart_ErrorGetStacktrace(error)));
   EXPECT_VALID(Dart_ErrorGetStacktrace(exception));
 }
@@ skipping 27 matching lines @@
 
   Dart_ActivationFrame frame;
   result = Dart_GetActivationFrame(stacktrace, 0, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("bar", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(1, line_number);
   EXPECT_EQ(10, column_number);
 
   result = Dart_GetActivationFrame(stacktrace, 1, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("foo", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(2, line_number);
   EXPECT_EQ(13, column_number);
 
   result = Dart_GetActivationFrame(stacktrace, 2, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("testMain", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(3, line_number);
   EXPECT_EQ(18, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 }
 
@@ skipping 29 matching lines @@
   // Top frame at positioned at throw.
   Dart_ActivationFrame frame;
   result = Dart_GetActivationFrame(stacktrace, 0, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("foo", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(1, line_number);
   EXPECT_EQ(20, column_number);
 
   // Middle frames positioned at the recursive call.
   for (intptr_t frame_index = 1;
        frame_index < (frame_count - 1);
        frame_index++) {
     result = Dart_GetActivationFrame(stacktrace, frame_index, &frame);
     EXPECT_VALID(result);
     result = Dart_ActivationFrameInfo(
         frame, &function_name, &script_url, &line_number, &column_number);
     EXPECT_VALID(result);
     Dart_StringToCString(function_name, &cstr);
     EXPECT_STREQ("foo", cstr);
     Dart_StringToCString(script_url, &cstr);
-    EXPECT_STREQ("dart:test-lib", cstr);
+    EXPECT_STREQ("test-lib", cstr);
     EXPECT_EQ(1, line_number);
     EXPECT_EQ(43, column_number);
   }
 
   // Bottom frame positioned at testMain().
   result = Dart_GetActivationFrame(stacktrace, frame_count - 1, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("testMain", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(2, line_number);
   EXPECT_EQ(18, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 }
 
@@ skipping 28 matching lines @@
   // Top frame at recursive call.
   Dart_ActivationFrame frame;
   result = Dart_GetActivationFrame(stacktrace, 0, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("C.foo", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(2, line_number);
   EXPECT_EQ(3, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 }
 
@@ skipping 40 matching lines @@
   // Top frame is inspectStack().
   Dart_ActivationFrame frame;
   result = Dart_GetActivationFrame(stacktrace, 0, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("inspectStack", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(1, line_number);
   EXPECT_EQ(47, column_number);
 
   // Second frame is foo() positioned at call to inspectStack().
   result = Dart_GetActivationFrame(stacktrace, 1, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("foo", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(2, line_number);
   EXPECT_EQ(32, column_number);
 
   // Middle frames positioned at the recursive call.
   for (intptr_t frame_index = 2;
        frame_index < (frame_count - 1);
        frame_index++) {
     result = Dart_GetActivationFrame(stacktrace, frame_index, &frame);
     EXPECT_VALID(result);
     result = Dart_ActivationFrameInfo(
         frame, &function_name, &script_url, &line_number, &column_number);
     EXPECT_VALID(result);
     Dart_StringToCString(function_name, &cstr);
     EXPECT_STREQ("foo", cstr);
     Dart_StringToCString(script_url, &cstr);
-    EXPECT_STREQ("dart:test-lib", cstr);
+    EXPECT_STREQ("test-lib", cstr);
     EXPECT_EQ(2, line_number);
     EXPECT_EQ(40, column_number);
   }
 
   // Bottom frame positioned at testMain().
   result = Dart_GetActivationFrame(stacktrace, frame_count - 1, &frame);
   EXPECT_VALID(result);
   result = Dart_ActivationFrameInfo(
       frame, &function_name, &script_url, &line_number, &column_number);
   EXPECT_VALID(result);
   Dart_StringToCString(function_name, &cstr);
   EXPECT_STREQ("testMain", cstr);
   Dart_StringToCString(script_url, &cstr);
-  EXPECT_STREQ("dart:test-lib", cstr);
+  EXPECT_STREQ("test-lib", cstr);
   EXPECT_EQ(3, line_number);
   EXPECT_EQ(18, column_number);
 
   // Out-of-bounds frames.
   result = Dart_GetActivationFrame(stacktrace, frame_count, &frame);
   EXPECT(Dart_IsError(result));
   result = Dart_GetActivationFrame(stacktrace, -1, &frame);
   EXPECT(Dart_IsError(result));
 
   Dart_SetReturnValue(args, Dart_NewInteger(42));
@@ skipping 4654 matching lines @@
       "    }\n"
       "    TestClass.fld1 += 1;\n"
       "  }\n"
       "  static TestClass testMain() {\n"
       "    return new TestClass();\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
   Dart_Handle instance;
   // Create a test library and Load up a test script in it.
-  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  // The test library must have a dart: url so it can import dart:_internal.
+  Dart_Handle lib = TestCase::LoadCoreTestScript(kScriptChars, NULL);
   Dart_Handle type = Dart_GetType(lib, NewString("TestClass"), 0, NULL);
   EXPECT_VALID(type);
 
   // Invoke a function which returns an object.
   instance = Dart_Invoke(type, NewString("testMain"), 0, NULL);
   EXPECT_VALID(instance);
 
   // Try to get a field that does not exist, should call noSuchMethod.
   result = Dart_GetField(instance, NewString("fld"));
   EXPECT_VALID(result);
@@ skipping 385 matching lines @@
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(12345, value);
 
   // Further calls to LoadScript are errors.
   result = Dart_LoadScript(url, source, 0, 0);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript: "
-               "A script has already been loaded from 'dart:test-lib'.",
+               "A script has already been loaded from 'test-lib'.",
                Dart_GetError(result));
 }
 
 
 TEST_CASE(RootLibrary) {
   const char* kScriptChars =
       "library testlib;"
       "main() {"
       "  return 12345;"
       "}";
@@ skipping 2761 matching lines @@
                                    NewString("main"),
                                    1,
                                    dart_args);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(6, value);
 }
 
 }  // namespace dart