runtime/vm/dart_api_impl_test.cc - Issue 411633002: Fix for issue 19817

Unified Diff: runtime/vm/dart_api_impl_test.cc

Issue 411633002: Fix for issue 19817 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 6 years, 5 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

Index: runtime/vm/dart_api_impl_test.cc

===================================================================

--- runtime/vm/dart_api_impl_test.cc (revision 38470)

+++ runtime/vm/dart_api_impl_test.cc (working copy)

@@ -3875,6 +3875,8 @@

EXPECT_VALID(imported_lib);

Dart_Handle result = Dart_LibraryImportLibrary(lib, imported_lib, prefix);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(imported_lib, NewString("test2"), 0, NULL);

EXPECT_VALID(result);

@@ -4091,14 +4093,17 @@

const int kNumNativeFields = 4;

// Create a test library.

- Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,

- native_field_lookup);

+ Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL,

+ USER_TEST_URI, false);

// Create a native wrapper class with native fields.

result = Dart_CreateNativeWrapperClass(

lib,

NewString("NativeFieldsWrapper"),

kNumNativeFields);

+ EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Load up a test script in the test library.

@@ -4138,7 +4143,8 @@

"}\n";

Dart_Handle result;

// Create a test library and Load up a test script in it.

- Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);

+ Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL,

+ USER_TEST_URI, false);

// Invoke a function which returns an object of type NativeFields.

result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);

@@ -4437,7 +4443,9 @@

// Create a test library.

Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,

- native_field_lookup);

+ native_field_lookup,

+ USER_TEST_URI,

+ false);

// Create a native wrapper class with native fields.

Dart_Handle result = Dart_CreateNativeWrapperClass(

@@ -4445,6 +4453,8 @@

NewString("NativeFieldsWrapper"),

kNumNativeFields);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Load up a test script in it.

@@ -5229,6 +5239,8 @@

// Import lib2 from lib1

Dart_Handle result = Dart_LibraryImportLibrary(lib1, lib2, Dart_Null());

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// We can invoke both private and non-private local functions.

EXPECT_VALID(Dart_Invoke(lib1, NewString("local"), 0, NULL));

@@ -5772,6 +5784,7 @@

// Load a script successfully.

result = Dart_LoadScript(url, source, 0, 0);

EXPECT_VALID(result);

+ Dart_FinalizeLoading(false);

result = Dart_Invoke(result, NewString("main"), 0, NULL);

EXPECT_VALID(result);

@@ -6039,6 +6052,8 @@

Dart_Handle source = NewString(kLibraryChars);

Dart_Handle lib = Dart_LoadLibrary(url, source);

EXPECT_VALID(lib);

+ Dart_Handle result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

Dart_Handle list = Dart_LibraryGetClassNames(lib);

EXPECT_VALID(list);

@@ -6090,6 +6105,8 @@

Dart_Handle source = NewString(kLibraryChars);

Dart_Handle lib = Dart_LoadLibrary(url, source);

EXPECT_VALID(lib);

+ Dart_Handle result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

Dart_Handle list = Dart_GetFunctionNames(lib);

EXPECT_VALID(list);

@@ -6205,6 +6222,8 @@

Dart_Handle prefix = NewString("foo");

Dart_Handle result = Dart_LibraryImportLibrary(lib2, lib1, prefix);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Lib1 is imported under a library prefix and therefore 'foo' should

// not be found directly in lib2.

@@ -6387,12 +6406,14 @@

Dart_Handle lib = Dart_LoadLibrary(url, source);

EXPECT_VALID(lib);

EXPECT(Dart_IsLibrary(lib));

+ Dart_Handle result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Call a dynamic function on OldClass.

Dart_Handle type = Dart_GetType(lib, NewString("OldClass"), 0, NULL);

EXPECT_VALID(type);

Dart_Handle recv = Dart_New(type, Dart_Null(), 0, NULL);

- Dart_Handle result = Dart_Invoke(recv, NewString("foo"), 0, NULL);

+ result = Dart_Invoke(recv, NewString("foo"), 0, NULL);

EXPECT_VALID(result);

EXPECT(Dart_IsString(result));

const char* result_cstr = "";

@@ -6403,6 +6424,8 @@

url = NewString("source_url");

source = NewString(kSourceChars);

EXPECT_VALID(Dart_LoadSource(lib, url, source));

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Call a dynamic function on NewClass in the updated library.

type = Dart_GetType(lib, NewString("NewClass"), 0, NULL);

@@ -6444,6 +6467,8 @@

result = Dart_LibraryLoadPatch(lib, url, source);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(lib, NewString("foo"), 0, NULL);

EXPECT_VALID(result);

@@ -6591,6 +6616,8 @@

source = NewString(kScriptChars);

Dart_Handle test_script = Dart_LoadScript(script_url, source, 0, 0);

EXPECT_VALID(test_script);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

// Make sure that we can compile all of the patched code.

result = Dart_CompileAll();

@@ -6693,6 +6720,8 @@

EXPECT_VALID(result);

Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);

EXPECT_VALID(lib);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

EXPECT(Dart_IsLibrary(lib));

Dart_Handle type = Dart_GetType(lib, NewString("Test"), 0, NULL);

EXPECT_VALID(type);

@@ -6785,6 +6814,8 @@

source = NewString(kLibrary2Chars);

Dart_LoadLibrary(url, source);

+ Dart_FinalizeLoading(false);

result = Dart_Invoke(result, NewString("main"), 0, NULL);

EXPECT_VALID(result);

}

@@ -6821,6 +6852,8 @@

url = NewString("library1_dart");

source = NewString(kLibrary1Chars);

Dart_LoadLibrary(url, source);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(result, NewString("main"), 0, NULL);

EXPECT(Dart_IsError(result));

@@ -6858,6 +6891,7 @@

url = NewString("library1_dart");

source = NewString(kLibrary1Chars);

Dart_LoadLibrary(url, source);

+ Dart_FinalizeLoading(false);

result = Dart_Invoke(result, NewString("main"), 0, NULL);

EXPECT_VALID(result);

@@ -6888,6 +6922,7 @@

url = NewString("lib.dart");

source = NewString(kLibraryChars);

Dart_LoadLibrary(url, source);

+ Dart_FinalizeLoading(false);

result = Dart_Invoke(result, NewString("main"), 0, NULL);

EXPECT_VALID(result);

@@ -7027,6 +7062,8 @@

EXPECT_VALID(result);

Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);

EXPECT_VALID(lib);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

Dart_ExitScope();

Dart_ExitIsolate();

bool retval = Dart_IsolateMakeRunnable(isolate);

@@ -7168,6 +7205,8 @@

EXPECT_VALID(result);

lib = Dart_LoadScript(url, source, 0, 0);

EXPECT_VALID(lib);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result =

Dart_SetNativeResolver(lib, &IsolateInterruptTestNativeLookup, NULL);

DART_CHECK_VALID(result);

@@ -7353,6 +7392,8 @@

EXPECT_VALID(result);

Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);

EXPECT_VALID(lib);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(lib, NewString("main"), 0, NULL);

EXPECT_VALID(result);

Dart_ExitScope();

@@ -7533,6 +7574,8 @@

EXPECT(Dart_IsLibrary(lib));

result = Dart_SetNativeResolver(lib, &MyNativeClosureResolver, NULL);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);

EXPECT_VALID(result);

@@ -7680,6 +7723,8 @@

EXPECT(Dart_IsLibrary(lib));

result = Dart_SetNativeResolver(lib, &MyStaticNativeClosureResolver, NULL);

EXPECT_VALID(result);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);

EXPECT_VALID(result);

@@ -8356,6 +8401,8 @@

Dart_Handle source = NewString(kLoadSecond);

Dart_Handle url = NewString(TestCase::url());

Dart_LoadSource(TestCase::lib(), url, source);

+ result = Dart_FinalizeLoading(false);

+ EXPECT_VALID(result);

dart_args[0] = Dart_NewInteger(1);

result = Dart_Invoke(lib1, NewString("start"), 1, dart_args);

« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/debugger_api_impl.cc » ('j') | no next file with comments »