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

vm/custom_isolate_test.cc

 // 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.
 
 #include "include/dart_api.h"
 
 #include "vm/unit_test.h"
 
 // Custom Isolate Test.
 //
@@ skipping 338 matching lines @@
   EXPECT(Dart_IsString(param));
   const char* isolate_main = NULL;
   EXPECT_VALID(Dart_StringToCString(param, &isolate_main));
   isolate_main = strdup(isolate_main);
 
   // Save current isolate.
   Dart_Isolate saved_isolate = Dart_CurrentIsolate();
   Dart_ExitIsolate();
 
   // Create a new Dart_Isolate.
-  Dart_Isolate new_isolate = Dart_CreateIsolate(NULL, NULL);
+  Dart_Isolate new_isolate = TestCase::CreateTestIsolate();
+  EXPECT(new_isolate != NULL);
   Dart_SetMessageCallbacks(&PostMessage, &ClosePort);
   Dart_Port new_port = Dart_GetMainPortId();
 
   OS::Print("-- Adding StartEvent to queue --\n");
   event_queue->Add(new StartEvent(new_isolate, isolate_main));
 
   // Restore the original isolate.
   Dart_ExitIsolate();
   Dart_EnterIsolate(saved_isolate);
   Dart_EnterScope();
 
   Dart_Handle send_port = Dart_NewSendPort(new_port);
   EXPECT_VALID(send_port);
   Dart_SetReturnValue(args, send_port);
 
   OS::Print("-- Exit: CustomIsolateImpl_start --\n");
   Dart_ExitScope();
 }
 
 
 UNIT_TEST_CASE(CustomIsolates) {
   event_queue = new EventQueue();
   current_event = NULL;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_Isolate dart_isolate = TestCase::CreateTestIsolate();
+  EXPECT(dart_isolate != NULL);
   Dart_SetMessageCallbacks(&PostMessage, &ClosePort);
   Dart_EnterScope();
   Dart_Handle result;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
 
   // Run main.
@@ skipping 23 matching lines @@
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart