Move print to corelib.

runtime/vm/unit_test.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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.
 
 #ifndef VM_UNIT_TEST_H_
 #define VM_UNIT_TEST_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/zone.h"
 
+#define EXPECT_VALID(handle)                                                   \
+  do {                                                                         \
+    Dart_Handle tmp_handle = (handle);                                         \
+    if (Dart_IsError(tmp_handle)) {                                            \
+      dart::Expect(__FILE__, __LINE__).Fail(                                   \
+          "expected '%s' to be a valid handle but found an error handle:\n"    \
+          "    '%s'\n",                                                        \
+          #handle, Dart_GetError(tmp_handle));                                 \
+    }                                                                          \
+  } while (0)
+
+#define EXPECT_ERROR(handle, substring)                                        \
+  do {                                                                         \
+    Dart_Handle tmp_handle = (handle);                                         \
+    if (Dart_IsError(tmp_handle)) {                                            \
+      dart::Expect(__FILE__, __LINE__).IsSubstring((substring),                \
+                                                   Dart_GetError(tmp_handle)); \
+    } else {                                                                   \
+      dart::Expect(__FILE__, __LINE__).Fail(                                   \
+          "expected '%s' to be an error handle but found a valid handle.\n",   \
+          #handle);                                                            \
+    }                                                                          \
+  } while (0)
+
 // The UNIT_TEST_CASE macro is used for tests that do not need any
 // default isolate or zone functionality.
 #define UNIT_TEST_CASE(name)                                                   \
   void Dart_Test##name();                                                      \
   static const dart::TestCase kRegister##name(Dart_Test##name, #name);         \
   void Dart_Test##name()
 
 // The TEST_CASE macro is used for tests that need an isolate and zone
 // in order to test its functionality.
 #define TEST_CASE(name)                                                        \
@@ skipping 174 matching lines @@
 
   RunEntry* const run_;
 };
 
 
 class TestIsolateScope {
  public:
   TestIsolateScope() {
     isolate_ = reinterpret_cast<Isolate*>(TestCase::CreateTestIsolate());
     Dart_EnterScope();  // Create a Dart API scope for unit tests.
+    // Setup dummy builtin library for 'print'.

[Anders Johnsen, 2012/08/28 13:53:10]

Just so I get this right, these test depends on 'print' to be defined?

[Mads Ager (google), 2012/08/28 13:57:29]

Some of these tests use the CompileAll call that will compile everything in core
and coreimpl. In coreimpl we need to have 'builtin.print' for that to succeed.
Therefore, we need a builtin library that gets imported into coreimpl under a
prefix.

[Anders Johnsen, 2012/08/28 14:01:09]

Thank you, I understand now.

+    const char* builtin_source =
+        "#library('dart:builtin');\n"
+        "void print(Object o) { }";
+    Dart_Handle coreimpl = Dart_LookupLibrary(Dart_NewString("dart:coreimpl"));
+    EXPECT_VALID(coreimpl);
+    Dart_Handle builtin = Dart_LoadLibrary(Dart_NewString("dart:builtin"),
+                                           Dart_NewString(builtin_source));
+    EXPECT_VALID(builtin);
+    Dart_Handle imported =
+        Dart_LibraryImportLibrary(coreimpl, builtin, Dart_NewString("builtin"));
+    EXPECT_VALID(imported);
   }
   ~TestIsolateScope() {
     Dart_ExitScope();  // Exit the Dart API scope created for unit tests.
     ASSERT(isolate_ == Isolate::Current());
     Dart_ShutdownIsolate();
     isolate_ = NULL;
   }
   Isolate* isolate() const { return isolate_; }
 
  private:
@@ skipping 58 matching lines @@
  public:
   // Test the Compiler::CompileScript functionality by checking the return
   // value to see if no parse errors were reported.
   static bool TestCompileScript(const Library& library, const Script& script);
 
   // Test the Compiler::CompileFunction functionality by checking the return
   // value to see if no parse errors were reported.
   static bool TestCompileFunction(const Function& function);
 };
 
-#define EXPECT_VALID(handle)                                                   \
-  do {                                                                         \
-    Dart_Handle tmp_handle = (handle);                                         \
-    if (Dart_IsError(tmp_handle)) {                                            \
-      dart::Expect(__FILE__, __LINE__).Fail(                                   \
-          "expected '%s' to be a valid handle but found an error handle:\n"    \
-          "    '%s'\n",                                                        \
-          #handle, Dart_GetError(tmp_handle));                                 \
-    }                                                                          \
-  } while (0)
-
-#define EXPECT_ERROR(handle, substring)                                        \
-  do {                                                                         \
-    Dart_Handle tmp_handle = (handle);                                         \
-    if (Dart_IsError(tmp_handle)) {                                            \
-      dart::Expect(__FILE__, __LINE__).IsSubstring((substring),                \
-                                                   Dart_GetError(tmp_handle)); \
-    } else {                                                                   \
-      dart::Expect(__FILE__, __LINE__).Fail(                                   \
-          "expected '%s' to be an error handle but found a valid handle.\n",   \
-          #handle);                                                            \
-    }                                                                          \
-  } while (0)
-
 }  // namespace dart
 
 #endif  // VM_UNIT_TEST_H_