Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: vm/debugger_api_impl_test.cc

Issue 11275008: - Represent strings internally in UTF-16 format, this makes it (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: vm/debugger_api_impl_test.cc
===================================================================
--- vm/debugger_api_impl_test.cc (revision 14046)
+++ vm/debugger_api_impl_test.cc (working copy)
@@ -31,8 +31,8 @@
ASSERT(Dart_IsLibrary(script_lib));
Dart_Breakpoint bpt;
Dart_Handle res = Dart_SetBreakpointAtEntry(script_lib,
- Dart_NewString(cname),
- Dart_NewString(fname),
+ NewString(cname),
+ NewString(fname),
&bpt);
EXPECT_VALID(res);
}
@@ -42,14 +42,14 @@
ASSERT(script_lib != NULL);
ASSERT(!Dart_IsError(script_lib));
ASSERT(Dart_IsLibrary(script_lib));
- return Dart_Invoke(script_lib, Dart_NewString(func_name), 0, NULL);
+ return Dart_Invoke(script_lib, NewString(func_name), 0, NULL);
}
static char const* ToCString(Dart_Handle str) {
EXPECT(Dart_IsString(str));
char const* c_str = NULL;
- Dart_StringToCString(str, &c_str);
+ Dart_StringAsCString(str, &c_str);
return c_str;
}
@@ -98,7 +98,7 @@
EXPECT_VALID(class_name);
EXPECT(Dart_IsString(class_name));
char const* class_name_str;
- Dart_StringToCString(class_name, &class_name_str);
+ Dart_StringAsCString(class_name, &class_name_str);
Dart_Handle fields = Dart_GetInstanceFields(obj);
EXPECT_VALID(fields);
EXPECT(Dart_IsList(fields));
@@ -136,7 +136,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* func_name_chars;
- Dart_StringToCString(func_name, &func_name_chars);
+ Dart_StringAsCString(func_name, &func_name_chars);
OS::Print(" function %s\n", func_name_chars);
Dart_Handle locals = Dart_GetLocalVariables(frame);
EXPECT_VALID(locals);
@@ -202,7 +202,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* func_name_chars;
- Dart_StringToCString(func_name, &func_name_chars);
+ Dart_StringAsCString(func_name, &func_name_chars);
if (expected_name != NULL) {
EXPECT_STREQ(func_name_chars, expected_name);
}
@@ -255,7 +255,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
EXPECT_STREQ(expected_trace[i], name_chars);
if (verbose) OS::Print(" >> %d: %s\n", i, name_chars);
}
@@ -302,7 +302,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
if (breakpoint_hit_counter < expected_bpts_length) {
EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
}
@@ -378,7 +378,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
if (breakpoint_hit_counter < expected_bpts_length) {
EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
}
@@ -533,7 +533,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
if (verbose) {
OS::Print(" >> bpt nr %d: %s\n", breakpoint_hit_counter, name_chars);
}
@@ -592,7 +592,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
EXPECT_STREQ(expected_trace[i], name_chars);
if (verbose) OS::Print(" >> %d: %s\n", i, name_chars);
}
@@ -632,9 +632,9 @@
Dart_StackTrace trace) {
static const char* expected_trace[] = {"add", "main"};
Dart_Handle add_locals = Dart_NewList(4);
- Dart_ListSetAt(add_locals, 0, Dart_NewString("a"));
+ Dart_ListSetAt(add_locals, 0, NewString("a"));
Dart_ListSetAt(add_locals, 1, Dart_NewInteger(10));
- Dart_ListSetAt(add_locals, 2, Dart_NewString("b"));
+ Dart_ListSetAt(add_locals, 2, NewString("b"));
Dart_ListSetAt(add_locals, 3, Dart_NewInteger(20));
Dart_Handle expected_locals[] = {add_locals, Dart_Null()};
breakpoint_hit_counter++;
@@ -657,7 +657,7 @@
LoadScript(kScriptChars);
Dart_SetBreakpointHandler(&ExprClosureBreakpointHandler);
- Dart_Handle script_url = Dart_NewString(TestCase::url());
+ Dart_Handle script_url = NewString(TestCase::url());
intptr_t line_no = 5; // In closure 'add'.
Dart_Handle res = Dart_SetBreakpoint(script_url, line_no);
EXPECT_VALID(res);
@@ -694,7 +694,7 @@
EXPECT_VALID(res);
EXPECT(Dart_IsString(func_name));
const char* name_chars;
- Dart_StringToCString(func_name, &name_chars);
+ Dart_StringAsCString(func_name, &name_chars);
EXPECT_STREQ(expected_trace[i], name_chars);
if (verbose) OS::Print(" >> %d: %s\n", i, name_chars);
}
@@ -723,7 +723,7 @@
LoadScript(kScriptChars);
- Dart_Handle script_url = Dart_NewString(TestCase::url());
+ Dart_Handle script_url = NewString(TestCase::url());
intptr_t line_no = 4; // In function 'foo'.
Dart_SetBreakpointHandler(&DeleteBreakpointHandler);
@@ -751,7 +751,7 @@
ASSERT(script_lib != NULL);
ASSERT(!Dart_IsError(script_lib));
ASSERT(Dart_IsLibrary(script_lib));
- Dart_Handle class_A = Dart_GetClass(script_lib, Dart_NewString("A"));
+ Dart_Handle class_A = Dart_GetClass(script_lib, NewString("A"));
EXPECT_VALID(class_A);
const int expected_num_fields = 2;
@@ -786,7 +786,7 @@
EXPECT_VALID(name_handle);
EXPECT(Dart_IsString(name_handle));
char const* name;
- Dart_StringToCString(name_handle, &name);
+ Dart_StringAsCString(name_handle, &name);
EXPECT_STREQ(expected[expected_idx].field_name, name);
Dart_Handle value_handle = Dart_ListGetAt(fields, i + 1);
EXPECT_VALID(value_handle);
@@ -794,7 +794,7 @@
EXPECT_VALID(value_handle);
EXPECT(Dart_IsString(value_handle));
char const* value;
- Dart_StringToCString(value_handle, &value);
+ Dart_StringAsCString(value_handle, &value);
EXPECT_STREQ(expected[expected_idx].field_value, value);
OS::Print(" %s: %s\n", name, value);
expected_idx++;
@@ -866,14 +866,14 @@
EXPECT_VALID(name_handle);
EXPECT(Dart_IsString(name_handle));
char const* name;
- Dart_StringToCString(name_handle, &name);
+ Dart_StringAsCString(name_handle, &name);
Dart_Handle value_handle = Dart_ListGetAt(fields, i + 1);
EXPECT_VALID(value_handle);
value_handle = Dart_ToString(value_handle);
EXPECT_VALID(value_handle);
EXPECT(Dart_IsString(value_handle));
char const* value;
- Dart_StringToCString(value_handle, &value);
+ Dart_StringAsCString(value_handle, &value);
OS::Print(" %s: %s\n", name, value);
}
@@ -905,7 +905,7 @@
EXPECT_VALID(name_handle);
EXPECT(Dart_IsString(name_handle));
char const* name;
- Dart_StringToCString(name_handle, &name);
+ Dart_StringAsCString(name_handle, &name);
EXPECT_STREQ("bla", name);
Dart_Handle value_handle = Dart_ListGetAt(fields, 1);
EXPECT_VALID(value_handle);
@@ -913,7 +913,7 @@
EXPECT_VALID(value_handle);
EXPECT(Dart_IsString(value_handle));
char const* value;
- Dart_StringToCString(value_handle, &value);
+ Dart_StringAsCString(value_handle, &value);
EXPECT_STREQ("blah blah", value);
// Check static field of B's superclass.
@@ -931,20 +931,20 @@
name_handle = Dart_ListGetAt(fields, 0);
EXPECT_VALID(name_handle);
EXPECT(Dart_IsString(name_handle));
- Dart_StringToCString(name_handle, &name);
+ Dart_StringAsCString(name_handle, &name);
EXPECT_STREQ("bla", name);
value_handle = Dart_ListGetAt(fields, 1);
EXPECT_VALID(value_handle);
value_handle = Dart_ToString(value_handle);
EXPECT_VALID(value_handle);
EXPECT(Dart_IsString(value_handle));
- Dart_StringToCString(value_handle, &value);
+ Dart_StringAsCString(value_handle, &value);
EXPECT_STREQ("yada yada yada", value);
// The static field "error" should result in a compile error.
name_handle = Dart_ListGetAt(fields, 2);
EXPECT_VALID(name_handle);
EXPECT(Dart_IsString(name_handle));
- Dart_StringToCString(name_handle, &name);
+ Dart_StringAsCString(name_handle, &name);
EXPECT_STREQ("error", name);
value_handle = Dart_ListGetAt(fields, 3);
EXPECT(Dart_IsError(value_handle));
@@ -999,7 +999,7 @@
Dart_Handle lib_url = Dart_ListGetAt(libs, i);
EXPECT(Dart_IsString(lib_url));
char const* chars;
- Dart_StringToCString(lib_url, &chars);
+ Dart_StringAsCString(lib_url, &chars);
OS::Print("Lib %d: %s\n", i, chars);
Dart_Handle scripts = Dart_GetScriptURLs(lib_url);
@@ -1010,16 +1010,16 @@
for (int i = 0; i < num_scripts; i++) {
Dart_Handle script_url = Dart_ListGetAt(scripts, i);
char const* chars;
- Dart_StringToCString(script_url, &chars);
+ Dart_StringAsCString(script_url, &chars);
OS::Print(" script %d: '%s'\n", i + 1, chars);
}
}
- Dart_Handle lib_url = Dart_NewString(TestCase::url());
+ Dart_Handle lib_url = NewString(TestCase::url());
Dart_Handle source = Dart_GetScriptSource(lib_url, lib_url);
EXPECT(Dart_IsString(source));
char const* source_chars;
- Dart_StringToCString(source, &source_chars);
+ Dart_StringAsCString(source, &source_chars);
OS::Print("\n=== source: ===\n%s", source_chars);
EXPECT_STREQ(kScriptChars, source_chars);
}
@@ -1036,12 +1036,12 @@
EXPECT(Dart_IsList(lib_list));
Dart_Handle list_as_string = Dart_ToString(lib_list);
const char* list_cstr = "";
- EXPECT_VALID(Dart_StringToCString(list_as_string, &list_cstr));
+ EXPECT_VALID(Dart_StringAsCString(list_as_string, &list_cstr));
EXPECT_NOTSUBSTRING(TestCase::url(), list_cstr);
// Load a script.
- Dart_Handle url = Dart_NewString(TestCase::url());
- Dart_Handle source = Dart_NewString(kScriptChars);
+ Dart_Handle url = NewString(TestCase::url());
+ Dart_Handle source = NewString(kScriptChars);
EXPECT_VALID(Dart_LoadScript(url, source));
lib_list = Dart_GetLibraryURLs();
@@ -1049,7 +1049,7 @@
EXPECT(Dart_IsList(lib_list));
list_as_string = Dart_ToString(lib_list);
list_cstr = "";
- EXPECT_VALID(Dart_StringToCString(list_as_string, &list_cstr));
+ EXPECT_VALID(Dart_StringAsCString(list_as_string, &list_cstr));
EXPECT_SUBSTRING(TestCase::url(), list_cstr);
}

Powered by Google App Engine
This is Rietveld 408576698