- Represent strings internally in UTF-16 format, this makes it

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 161 matching lines @@
   // Reload all the test classes here.
   //
   // TODO(turnidge): Use the create isolate callback instead?
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
   EXPECT_VALID(Dart_CompileAll());
 
   Dart_Handle recv_port = Dart_GetReceivePort(Dart_GetMainPortId());
   EXPECT_VALID(recv_port);
-  result = Dart_SetField(lib, Dart_NewString("mainPort"), recv_port);
+  result = Dart_SetField(lib, NewString("mainPort"), recv_port);
   EXPECT_VALID(result);
 
-  result = Dart_Invoke(lib, Dart_NewString(main_), 0, NULL);
+  result = Dart_Invoke(lib, NewString(main_), 0, NULL);
   EXPECT_VALID(result);
   free(const_cast<char*>(main_));
   main_ = NULL;
 
   Dart_ExitScope();
   Dart_ExitIsolate();
 }
 
 
 // Notify an isolate of a pending message.
@@ skipping 31 matching lines @@
 static void NotifyMessage(Dart_Isolate dest_isolate) {
   OS::Print("-- Notify isolate(%p) of pending message --\n", dest_isolate);
   OS::Print("-- Adding MessageEvent to queue --\n");
   event_queue->Add(new MessageEvent(dest_isolate));
 }
 
 
 static Dart_NativeFunction NativeLookup(Dart_Handle name, int argc) {
   const char* name_str = NULL;
   EXPECT(Dart_IsString(name));
-  EXPECT_VALID(Dart_StringToCString(name, &name_str));
+  EXPECT_VALID(Dart_StringAsCString(name, &name_str));
   if (strcmp(name_str, "native_echo") == 0) {
     return &native_echo;
   } else if (strcmp(name_str, "CustomIsolateImpl_start") == 0) {
     return &CustomIsolateImpl_start;
   }
   return NULL;
 }
 
 
 const char* saved_echo = NULL;
 static void native_echo(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle arg = Dart_GetNativeArgument(args, 0);
   Dart_Handle toString = Dart_ToString(arg);
   EXPECT_VALID(toString);
   const char* c_str = NULL;
-  EXPECT_VALID(Dart_StringToCString(toString, &c_str));
+  EXPECT_VALID(Dart_StringAsCString(toString, &c_str));
   if (saved_echo) {
     free(const_cast<char*>(saved_echo));
   }
   saved_echo = strdup(c_str);
   OS::Print("-- (isolate=%p) %s\n", Dart_CurrentIsolate(), c_str);
   Dart_ExitScope();
 }
 
 
 static void CustomIsolateImpl_start(Dart_NativeArguments args) {
   OS::Print("-- Enter: CustomIsolateImpl_start --\n");
 
   // We would probably want to pass in the this pointer too, so we
   // could associate the CustomIsolateImpl instance with the
   // Dart_Isolate by storing it in a native field.
   EXPECT_EQ(1, Dart_GetNativeArgumentCount(args));
   Dart_Handle param = Dart_GetNativeArgument(args, 0);
   EXPECT_VALID(param);
   EXPECT(Dart_IsString(param));
   const char* isolate_main = NULL;
-  EXPECT_VALID(Dart_StringToCString(param, &isolate_main));
+  EXPECT_VALID(Dart_StringAsCString(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 = TestCase::CreateTestIsolate();
   EXPECT(new_isolate != NULL);
   Dart_SetMessageNotifyCallback(&NotifyMessage);
@@ skipping 24 matching lines @@
   Dart_SetMessageNotifyCallback(&NotifyMessage);
   Dart_EnterScope();
   Dart_Handle result;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
 
   // Run main.
-  result = Dart_Invoke(lib, Dart_NewString("main"), 0, NULL);
+  result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsString(result));
   const char* result_str = NULL;
-  EXPECT_VALID(Dart_StringToCString(result, &result_str));
+  EXPECT_VALID(Dart_StringAsCString(result, &result_str));
   EXPECT_STREQ("success", result_str);
 
   Dart_ExitScope();
   Dart_ExitIsolate();
 
   OS::Print("-- Starting event loop --\n");
   Event* event = event_queue->Get();
   while (event) {
     event->Process();
     delete event;
     event = event_queue->Get();
   }
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart