Fix name of libraries without a library declaration to be the empty string.

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_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
@@ skipping 4446 matching lines @@
 
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(3, value);
 }
 
 
 TEST_CASE(GetType) {
   const char* kScriptChars =
+      "library testlib;\n"
       "class Class {\n"
       "  static var name = 'Class';\n"
       "}\n"
       "\n"
       "class _Class {\n"
       "  static var name = '_Class';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
@@ skipping 11 matching lines @@
   EXPECT_VALID(type);
   name = Dart_GetField(type, NewString("name"));
   EXPECT_VALID(name);
   name_cstr = "";
   EXPECT_VALID(Dart_StringToCString(name, &name_cstr));
   EXPECT_STREQ("_Class", name_cstr);
 
   // Lookup a class that does not exist.
   type = Dart_GetType(lib, NewString("DoesNotExist"), 0, NULL);
   EXPECT(Dart_IsError(type));
-  EXPECT_STREQ("Type 'DoesNotExist' not found in library 'dart:test-lib'.",
+  EXPECT_STREQ("Type 'DoesNotExist' not found in library 'testlib'.",
                Dart_GetError(type));
 
   // Lookup a class from an error library.  The error propagates.
   type = Dart_GetType(Api::NewError("myerror"), NewString("Class"), 0, NULL);
   EXPECT(Dart_IsError(type));
   EXPECT_STREQ("myerror", Dart_GetError(type));
 
   // Lookup a type using an error class name.  The error propagates.
   type = Dart_GetType(lib, Api::NewError("myerror"), 0, NULL);
   EXPECT(Dart_IsError(type));
@@ skipping 138 matching lines @@
   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'.",
                Dart_GetError(result));
 }
 
 
 TEST_CASE(RootLibrary) {
   const char* kScriptChars =
+      "library testlib;"
       "main() {"
       "  return 12345;"
       "}";
 
   Dart_Handle root_lib = Dart_RootLibrary();
   EXPECT_VALID(root_lib);
   EXPECT(Dart_IsNull(root_lib));
 
   // Load a script.
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   EXPECT_VALID(Dart_LoadScript(url, source, 0, 0));
 
   root_lib = Dart_RootLibrary();
   Dart_Handle lib_name = Dart_LibraryName(root_lib);
   EXPECT_VALID(lib_name);
   EXPECT(!Dart_IsNull(root_lib));
   const char* name_cstr = "";
   EXPECT_VALID(Dart_StringToCString(lib_name, &name_cstr));
-  EXPECT_STREQ(TestCase::url(), name_cstr);
+  EXPECT_STREQ("testlib", name_cstr);
+
+  Dart_Handle lib_uri = Dart_LibraryUrl(root_lib);
+  EXPECT_VALID(lib_uri);
+  EXPECT(!Dart_IsNull(lib_uri));
+  const char* uri_cstr = "";
+  EXPECT_VALID(Dart_StringToCString(lib_uri, &uri_cstr));
+  EXPECT_STREQ(TestCase::url(), uri_cstr);
 }
 
 
 static int index = 0;
 
 
 static Dart_Handle import_library_handler(Dart_LibraryTag tag,
                                           Dart_Handle library,
                                           Dart_Handle url) {
   if (tag == Dart_kCanonicalizeUrl) {
@@ skipping 2556 matching lines @@
                                    NewString("main"),
                                    0,
                                    NULL);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(8, value);
 }
 
 }  // namespace dart