Implement support for specifying string interopolation style variable substitution in the import ...

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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
+#include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
 // Only ia32 and x64 can run execution tests.
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
@@ skipping 2159 matching lines @@
     function_name2,
     number_of_arguments,
     dart_arguments);
     EXPECT(Dart_IsError(result));
     EXPECT(Dart_ErrorHasException(result)); */
 }
 
 
 static Dart_Handle library_handler(Dart_LibraryTag tag,
                                    Dart_Handle library,
-                                   Dart_Handle url) {
+                                   Dart_Handle url,
+                                   Dart_Handle import_url_map) {
   if (tag == kCanonicalizeUrl) {
     return url;
   }
   return Api::Success();
 }
 
 
 TEST_CASE(LoadScript) {
   const char* kScriptChars =
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
+  Dart_Handle import_map = Dart_NewList(0);
 
-  result = Dart_LoadScript(Dart_Null(), source, library_handler);
+  result = Dart_LoadScript(Dart_Null(), source, library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'url' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(Dart_True(), source, library_handler);
+  result = Dart_LoadScript(Dart_True(), source, library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'url' to be of type String.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(error, source, library_handler);
+  result = Dart_LoadScript(error, source, library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
-  result = Dart_LoadScript(url, Dart_Null(), library_handler);
+  result = Dart_LoadScript(url, Dart_Null(), library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'source' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(url, Dart_True(), library_handler);
+  result = Dart_LoadScript(url, Dart_True(), library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_LoadScript expects argument 'source' to be of type String.",
       Dart_GetError(result));
 
-  result = Dart_LoadScript(url, error, library_handler);
+  result = Dart_LoadScript(url, error, library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
   // Load a script successfully.
-  result = Dart_LoadScript(url, source, library_handler);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
   EXPECT_VALID(result);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   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, library_handler);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript: "
                "A script has already been loaded from 'dart:test-lib'.",
                Dart_GetError(result));
 }
 
 
+static const char* var_mapping[] = {
+  "GOOGLE3", ".",
+  "ABC", "lala",
+  "var1", "",
+  "var2", "winner",
+};
+static int index = 0;
+
+
+static Dart_Handle import_library_handler(Dart_LibraryTag tag,
+                                          Dart_Handle library,
+                                          Dart_Handle url,
+                                          Dart_Handle import_url_map) {
+  if (tag == kCanonicalizeUrl) {
+    return url;
+  }
+  EXPECT(Dart_IsString(url));
+  const char* cstr = NULL;
+  EXPECT_VALID(Dart_StringToCString(url, &cstr));
+  switch (index) {
+    case 0:
+      EXPECT_STREQ("./weird.dart", cstr);
+      break;
+    case 1:
+      EXPECT_STREQ("abclaladef", cstr);
+      break;
+    case 2:
+      EXPECT_STREQ("winner", cstr);
+      break;
+    case 3:
+      EXPECT_STREQ("abclaladef/extra_weird.dart", cstr);
+      break;
+    case 4:
+      EXPECT_STREQ("winnerwinner", cstr);
+      break;
+    default:
+      EXPECT(false);
+      return Api::NewError("invalid callback");
+  }
+  index += 1;
+  return Api::Success();
+}
+
+
+TEST_CASE(LoadImportScript) {
+  const char* kScriptChars =
+      "#import('$GOOGLE3/weird.dart');"
+      "#import('abc${ABC}def');"
+      "#import('${var1}$var2');"
+      "#import('abc${ABC}def/extra_weird.dart');"
+      "#import('$var2$var2');"
+      "main() {"
+      "  return 12345;"
+      "}";
+  Dart_Handle url = Dart_NewString(TestCase::url());
+  Dart_Handle source = Dart_NewString(kScriptChars);
+  intptr_t length = (sizeof(var_mapping) / sizeof(var_mapping[0]));
+  Dart_Handle import_map = Dart_NewList(length);
+  for (intptr_t i = 0; i < length; i++) {
+    Dart_ListSetAt(import_map, i, Dart_NewString(var_mapping[i]));
+  }
+  Dart_Handle result = Dart_LoadScript(url,
+                                       source,
+                                       import_library_handler,
+                                       import_map);
+  EXPECT(!Dart_IsError(result));
+}
+
+
+TEST_CASE(LoadImportScriptError1) {
+  const char* kScriptChars =
+      "#import('abc${DEF}def/extra_weird.dart');"
+      "main() {"
+      "  return 12345;"
+      "}";
+  Dart_Handle url = Dart_NewString(TestCase::url());
+  Dart_Handle source = Dart_NewString(kScriptChars);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle result = Dart_LoadScript(url,
+                                       source,
+                                       import_library_handler,
+                                       import_map);
+  EXPECT(Dart_IsError(result));
+  EXPECT(strstr(Dart_GetError(result),
+                "import variable 'DEF' has not been defined"));
+}
+
+
+TEST_CASE(LoadImportScriptError2) {
+  const char* kScriptChars =
+      "#import('abc${ABC/extra_weird.dart');"
+      "main() {"
+      "  return 12345;"
+      "}";
+  Dart_Handle url = Dart_NewString(TestCase::url());
+  Dart_Handle source = Dart_NewString(kScriptChars);
+  intptr_t length = (sizeof(var_mapping) / sizeof(var_mapping[0]));
+  Dart_Handle import_map = Dart_NewList(length);
+  for (intptr_t i = 0; i < length; i++) {
+    Dart_ListSetAt(import_map, i, Dart_NewString(var_mapping[i]));
+  }
+  Dart_Handle result = Dart_LoadScript(url,
+                                       source,
+                                       import_library_handler,
+                                       import_map);
+  EXPECT(Dart_IsError(result));
+  EXPECT(strstr(Dart_GetError(result), "'}' expected"));
+}
+
+
 TEST_CASE(LoadScript_CompileError) {
   const char* kScriptChars =
       ")";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  Dart_Handle result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle result = Dart_LoadScript(url,
+                                       source,
+                                       library_handler,
+                                       import_map);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "unexpected token ')'"));
 }
 
 
 TEST_CASE(LookupLibrary) {
   const char* kScriptChars =
       "#import('library1.dart');"
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "#import('library2.dart');";
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  Dart_Handle result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle result = Dart_LoadScript(url,
+                                       source,
+                                       library_handler,
+                                       import_map);
   EXPECT_VALID(result);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
-  result = Dart_LoadLibrary(url, source);
+  result = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(result);
 
   result = Dart_LookupLibrary(url);
   EXPECT_VALID(result);
 
   result = Dart_LookupLibrary(Dart_Null());
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LookupLibrary expects argument 'url' to be non-null.",
                Dart_GetError(result));
 
@@ skipping 13 matching lines @@
   EXPECT_STREQ("Dart_LookupLibrary: library 'noodles.dart' not found.",
                Dart_GetError(result));
 }
 
 
 TEST_CASE(LibraryUrl) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
-  Dart_Handle lib = Dart_LoadLibrary(url, source);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle lib = Dart_LoadLibrary(url, source, import_map);
   Dart_Handle error = Dart_Error("incoming error");
   EXPECT_VALID(lib);
 
   Dart_Handle result = Dart_LibraryUrl(Dart_Null());
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LibraryUrl expects argument 'library' to be non-null.",
                Dart_GetError(result));
 
   result = Dart_LibraryUrl(Dart_True());
   EXPECT(Dart_IsError(result));
@@ skipping 17 matching lines @@
 TEST_CASE(LibraryImportLibrary) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   const char* kLibrary2Chars =
       "#library('library2_name');";
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
-  Dart_Handle lib1 = Dart_LoadLibrary(url, source);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle lib1 = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(lib1);
 
   url = Dart_NewString("library2_url");
   source = Dart_NewString(kLibrary2Chars);
-  Dart_Handle lib2 = Dart_LoadLibrary(url, source);
+  Dart_Handle lib2 = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(lib2);
 
   result = Dart_LibraryImportLibrary(Dart_Null(), lib2);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_LibraryImportLibrary expects argument 'library' to be non-null.",
       Dart_GetError(result));
 
   result = Dart_LibraryImportLibrary(Dart_True(), lib2);
   EXPECT(Dart_IsError(result));
@@ skipping 28 matching lines @@
 
 
 TEST_CASE(LoadLibrary) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
+  Dart_Handle import_map = Dart_NewList(0);
 
-  result = Dart_LoadLibrary(Dart_Null(), source);
+  result = Dart_LoadLibrary(Dart_Null(), source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadLibrary expects argument 'url' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadLibrary(Dart_True(), source);
+  result = Dart_LoadLibrary(Dart_True(), source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadLibrary expects argument 'url' to be of type String.",
                Dart_GetError(result));
 
-  result = Dart_LoadLibrary(error, source);
+  result = Dart_LoadLibrary(error, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
-  result = Dart_LoadLibrary(url, Dart_Null());
+  result = Dart_LoadLibrary(url, Dart_Null(), import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadLibrary expects argument 'source' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadLibrary(url, Dart_True());
+  result = Dart_LoadLibrary(url, Dart_True(), import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_LoadLibrary expects argument 'source' to be of type String.",
       Dart_GetError(result));
 
-  result = Dart_LoadLibrary(url, error);
+  result = Dart_LoadLibrary(url, error, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
   // Success.
-  result = Dart_LoadLibrary(url, source);
+  result = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(result);
   EXPECT(Dart_IsLibrary(result));
 
   // Duplicate library load fails.
-  result = Dart_LoadLibrary(url, source);
+  result = Dart_LoadLibrary(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_LoadLibrary: library 'library1_url' has already been loaded.",
       Dart_GetError(result));
 }
 
 
 TEST_CASE(LoadLibrary_CompileError) {
   const char* kLibrary1Chars =
       "#library('library1_name');"
       ")";
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
-  Dart_Handle result = Dart_LoadLibrary(url, source);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle result = Dart_LoadLibrary(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "unexpected token ')'"));
 }
 
 
 TEST_CASE(LoadSource) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   const char* kSourceChars =
       "// Something innocuous";
   const char* kBadSourceChars =
       ")";
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   // Load up a library.
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
-  Dart_Handle lib = Dart_LoadLibrary(url, source);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle lib = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
 
   url = Dart_NewString("source_url");
   source = Dart_NewString(kSourceChars);
 
   result = Dart_LoadSource(Dart_Null(), url, source);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadSource expects argument 'library' to be non-null.",
                Dart_GetError(result));
@@ skipping 92 matching lines @@
       "  static foo() native \"SomeNativeFunction\";"
       "  static bar() native \"SomeNativeFunction2\";"
       "  static baz() native \"SomeNativeFunction3\";"
       "}";
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   // Load a test script.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  Dart_Handle lib = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle lib = Dart_LoadScript(url, source, library_handler, import_map);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
 
   result = Dart_SetNativeResolver(Dart_Null(), &MyNativeResolver1);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_SetNativeResolver expects argument 'library' to be non-null.",
       Dart_GetError(result));
 
   result = Dart_SetNativeResolver(Dart_True(), &MyNativeResolver1);
@@ skipping 74 matching lines @@
       "#library('library1.dart');"
       "#import('library2.dart');"
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Duplicate definition : 'foo' is defined in"
                " 'library2.dart' and 'dart:test-lib'\n",
                Dart_GetError(result));
@@ skipping 10 matching lines @@
       "#import('library2.dart');"
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "#import('library1.dart');"
       "var foo;";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   EXPECT_VALID(result);
 }
 
 
 TEST_CASE(ImportLibrary3) {
   const char* kScriptChars =
       "#import('library2.dart');"
       "#import('library1.dart');"
       "var foo_top = 10;  // foo has dup def. So should be an error."
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "var foo;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Duplicate definition : 'foo' is defined in"
                " 'library1.dart' and 'library2.dart'\n",
                Dart_GetError(result));
@@ skipping 29 matching lines @@
       "#import('libraryF.dart');"
       "var fooE = 10;  //fooC has duplicate def. so should be an error.";
   const char* kLibraryFChars =
       "#library('libraryF.dart');"
       "var fooC;";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
 
   url = Dart_NewString("libraryA.dart");
   source = Dart_NewString(kLibraryAChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryC.dart");
   source = Dart_NewString(kLibraryCChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryB.dart");
   source = Dart_NewString(kLibraryBChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryD.dart");
   source = Dart_NewString(kLibraryDChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryF.dart");
   source = Dart_NewString(kLibraryFChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryE.dart");
   source = Dart_NewString(kLibraryEChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Duplicate definition : 'fooC' is defined in"
                " 'libraryF.dart' and 'libraryC.dart'\n",
                Dart_GetError(result));
@@ skipping 10 matching lines @@
   const char* kLibraryChars =
       "#library('lib.dart');"
       "interface X {"
       "  void set handler(void callback(List<int> x));"
       "}";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  result = Dart_LoadScript(url, source, library_handler, import_map);
 
   url = Dart_NewString("lib.dart");
   source = Dart_NewString(kLibraryChars);
-  Dart_LoadLibrary(url, source);
+  Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_InvokeStatic(result,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
   EXPECT_VALID(result);
 }
 
 
@@ skipping 110 matching lines @@
       "}\n";
 
   if (Dart_CurrentIsolate() != NULL) {
     Dart_ExitIsolate();
   }
   Dart_Isolate isolate = TestCase::CreateTestIsolate();
   ASSERT(isolate != NULL);
   Dart_EnterScope();
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  Dart_Handle lib = Dart_LoadScript(url, source, TestCase::library_handler);
+  Dart_Handle import_map = Dart_NewList(0);
+  Dart_Handle lib = Dart_LoadScript(url,
+                                    source,
+                                    TestCase::library_handler,
+                                    import_map);
   EXPECT_VALID(lib);
   Dart_ExitScope();
   return true;
 }
 
 
 // Common code for RunLoop_Success/RunLoop_Failure.
 static void RunLoopTest(bool throw_exception_child,
                         bool throw_exception_parent) {
   Dart_IsolateCreateCallback saved = Isolate::CreateCallback();
@@ skipping 91 matching lines @@
   // Tell the other thread that shared_isolate is created.
   Dart_Handle lib;
   {
     sync->Enter();
     char* error = NULL;
     shared_isolate = Dart_CreateIsolate(NULL, NULL, NULL, &error);
     EXPECT(shared_isolate != NULL);
     Dart_EnterScope();
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
-    lib = Dart_LoadScript(url, source, TestCase::library_handler);
+    Dart_Handle import_map = Dart_NewList(0);
+    lib = Dart_LoadScript(url, source, TestCase::library_handler, import_map);
     EXPECT_VALID(lib);
     Dart_Handle result = Dart_SetNativeResolver(
         lib, &IsolateInterruptTestNativeLookup);
     DART_CHECK_VALID(result);
 
     sync->Notify();
     sync->Exit();
   }
 
   Dart_Handle result = Dart_InvokeStatic(lib,
@@ skipping 90 matching lines @@
   // We should have received the expected number of interrupts.
   EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart