- Refactor the isolate callback mechanism to also include creation of the

vm/unit_test.h

 // Copyright (c) 2011, 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"
@@ skipping 144 matching lines @@
 class TestCase : TestCaseBase {
  public:
   typedef void (RunEntry)();
 
   TestCase(RunEntry* run, const char* name) : TestCaseBase(name), run_(run) { }
 
   static Dart_Handle LoadTestScript(const char* script,
                                     Dart_NativeEntryResolver resolver);
   static Dart_Handle lib();
   static const char* url() { return "dart:test-lib"; }
+  static Dart_Isolate CreateTestIsolateFromSnapshot(uint8_t* buffer) {
+    return CreateIsolate(buffer);
+  }
+  static Dart_Isolate CreateTestIsolate() {
+    return CreateIsolate(NULL);
+  }
+  static Dart_Handle library_handler(Dart_LibraryTag tag,
+                                     Dart_Handle library,
+                                     Dart_Handle url);
 
   virtual void Run();
 
  private:
+  static Dart_Isolate CreateIsolate(uint8_t* buffer) {
+    char* err;
+    Dart_Isolate isolate = Dart_CreateIsolate(buffer, NULL, &err);
+    if (isolate == NULL) {
+      OS::Print("Creation of isolate failed '%s'\n", err);
+      free(err);
+    }
+    EXPECT(isolate != NULL);
+    return isolate;
+  }
+
   RunEntry* const run_;
 };
 
 
 class TestIsolateScope {
  public:
   TestIsolateScope() {
-    isolate_ = reinterpret_cast<Isolate*>(Dart_CreateIsolate(NULL, NULL));
-    EXPECT(isolate_ != NULL);
+    isolate_ = reinterpret_cast<Isolate*>(TestCase::CreateTestIsolate());
     Dart_EnterScope();  // Create a Dart API scope for unit tests.
   }
   ~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_; }
 
@@ skipping 66 matching lines @@
 
 #define EXPECT_VALID(handle)                                                  \
   if (Dart_IsError((handle))) {                                               \
     dart::Expect(__FILE__, __LINE__).Fail("invalid handle '%s':\n    '%s'\n", \
                                           #handle, Dart_GetError(handle));    \
   }
 
 }  // namespace dart
 
 #endif  // VM_UNIT_TEST_H_