runtime/vm/dart_api_impl_test.cc - Issue 8401010: Add DART_CHECKVALID

Unified Diff: runtime/vm/dart_api_impl_test.cc

Issue 8401010: Add DART_CHECKVALID (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: '' Created 9 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

Index: runtime/vm/dart_api_impl_test.cc

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

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

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

@@ -13,6 +13,7 @@

namespace dart {

siva 2011/10/27 21:15:54 extra new line?

turnidge 2011/10/27 21:55:20 Fixed.

UNIT_TEST_CASE(BooleanValues) {

Dart_CreateIsolate(NULL, NULL);

Dart_EnterScope(); // Enter a Dart API scope for the unit test.

@@ -25,9 +26,11 @@

EXPECT(Dart_IsBoolean(val2));

bool value = false;

Dart_Handle result = Dart_BooleanValue(val1, &value);

- EXPECT(Dart_IsValid(result) && value);

+ DART_CHECKVALID(result);

siva 2011/10/27 21:15:54 This changes the behaviour we have currently as a

turnidge 2011/10/27 21:55:20 Added a separate EXPECT_VALID which I will use in

+ EXPECT(value);

result = Dart_BooleanValue(val2, &value);

- EXPECT(Dart_IsValid(result) && !value);

+ DART_CHECKVALID(result);

+ EXPECT(!value);

Dart_ExitScope(); // Exit the Dart API scope.

Dart_ShutdownIsolate();

@@ -46,10 +49,10 @@

EXPECT(Dart_IsDouble(val2));

double out1, out2;

Dart_Handle result = Dart_DoubleValue(val1, &out1);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(kDoubleVal1, out1);

result = Dart_DoubleValue(val2, &out2);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(kDoubleVal2, out2);

Dart_ExitScope(); // Exit the Dart API scope.

@@ -84,7 +87,7 @@

Dart_NewString("getInt"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(Dart_IsNumber(result));

@@ -94,7 +97,7 @@

Dart_NewString("getDouble"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(Dart_IsNumber(result));

@@ -104,7 +107,7 @@

Dart_NewString("getBool"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(!Dart_IsNumber(result));

@@ -114,7 +117,7 @@

Dart_NewString("getNull"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(!Dart_IsNumber(result));

@@ -138,33 +141,33 @@

EXPECT(Dart_IsInteger(val1));

bool fits = false;

Dart_Handle result = Dart_IntegerFitsIntoInt64(val1, &fits);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(fits);

Dart_Handle val2 = Dart_NewInteger(kIntegerVal2);

EXPECT(Dart_IsInteger(val2));

result = Dart_IntegerFitsIntoInt64(val2, &fits);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(fits);

Dart_Handle val3 = Dart_NewIntegerFromHexCString(kIntegerVal3);

EXPECT(Dart_IsInteger(val3));

result = Dart_IntegerFitsIntoInt64(val3, &fits);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!fits);

int64_t out = 0;

result = Dart_IntegerValue(val1, &out);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(kIntegerVal1, out);

result = Dart_IntegerValue(val2, &out);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(kIntegerVal2, out);

const char* chars = NULL;

result = Dart_IntegerValueHexCString(val3, &chars);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!strcmp(kIntegerVal3, chars));

Dart_ExitScope(); // Exit the Dart API scope.

@@ -183,7 +186,7 @@

EXPECT(Dart_IsArray(val));

intptr_t len = 0;

Dart_Handle result = Dart_GetLength(val, &len);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(kArrayLength, len);

// Check invalid array access.

@@ -198,14 +201,14 @@

for (int i = 0; i < kArrayLength; i++) {

result = Dart_ArraySetAt(val, i, Dart_NewInteger(i));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

}

for (int i = 0; i < kArrayLength; i++) {

result = Dart_ArrayGetAt(val, i);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

int64_t value;

result = Dart_IntegerValue(result, &value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(i, value);

}

@@ -504,18 +507,18 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

// Now access and set various static fields of Fields class.

Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("Fields"));

- EXPECT(Dart_IsValid(cls));

+ DART_CHECKVALID(cls);

result = Dart_GetStaticField(cls, Dart_NewString("fld1"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetInstanceField(retobj, Dart_NewString("fld3"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetStaticField(cls, Dart_NewString("fld4"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

int64_t value = 0;

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(10, value);

@@ -524,11 +527,11 @@

Dart_NewInteger(20));

EXPECT(!Dart_IsValid(result));

result = Dart_GetStaticField(cls, Dart_NewString("fld3"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_SetStaticField(cls,

Dart_NewString("fld3"),

Dart_NewInteger(200));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(200, value);

@@ -536,11 +539,11 @@

result = Dart_GetInstanceField(retobj, Dart_NewString("fld3"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(10, value);

result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(20, value);

result = Dart_SetInstanceField(retobj,

@@ -550,9 +553,9 @@

result = Dart_SetInstanceField(retobj,

Dart_NewString("fld1"),

Dart_NewInteger(40));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(40, value);

@@ -592,18 +595,18 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

// Now access and set various static fields of HiddenFields class.

Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("HiddenFields"));

- EXPECT(Dart_IsValid(cls));

+ DART_CHECKVALID(cls);

result = Dart_GetStaticField(cls, Dart_NewString("_fld1"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetInstanceField(retobj, Dart_NewString("_fld3"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetStaticField(cls, Dart_NewString("_fld4"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

int64_t value = 0;

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(10, value);

@@ -612,11 +615,11 @@

Dart_NewInteger(20));

EXPECT(!Dart_IsValid(result));

result = Dart_GetStaticField(cls, Dart_NewString("_fld3"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_SetStaticField(cls,

Dart_NewString("_fld3"),

Dart_NewInteger(200));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(200, value);

@@ -624,11 +627,11 @@

result = Dart_GetInstanceField(retobj, Dart_NewString("_fld3"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(10, value);

result = Dart_GetInstanceField(retobj, Dart_NewString("_fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(20, value);

result = Dart_SetInstanceField(retobj,

@@ -638,9 +641,9 @@

result = Dart_SetInstanceField(retobj,

Dart_NewString("_fld1"),

Dart_NewInteger(40));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(40, value);

@@ -691,7 +694,7 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

Instance& obj = Instance::Handle();

obj ^= Api::UnwrapHandle(result);

@@ -792,19 +795,19 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

// Now access and set various instance fields of the returned object.

result = Dart_GetInstanceField(retobj, Dart_NewString("fld3"));

EXPECT(!Dart_IsValid(result));

result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

int64_t value = 0;

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(10, value);

result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(20, value);

result = Dart_SetInstanceField(retobj,

@@ -814,9 +817,9 @@

result = Dart_SetInstanceField(retobj,

Dart_NewString("fld1"),

Dart_NewInteger(40));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(40, value);

@@ -830,36 +833,36 @@

result = Dart_GetNativeInstanceField(retobj, kNativeFld4, &field_value);

EXPECT(!Dart_IsValid(result));

result = Dart_GetNativeInstanceField(retobj, kNativeFld0, &field_value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(0, field_value);

result = Dart_GetNativeInstanceField(retobj, kNativeFld1, &field_value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(0, field_value);

result = Dart_GetNativeInstanceField(retobj, kNativeFld2, &field_value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(0, field_value);

result = Dart_SetNativeInstanceField(retobj, kNativeFld4, 40);

EXPECT(!Dart_IsValid(result));

result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 4);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_SetNativeInstanceField(retobj, kNativeFld1, 40);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_SetNativeInstanceField(retobj, kNativeFld2, 400);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_SetNativeInstanceField(retobj, kNativeFld3, 4000);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_GetNativeInstanceField(retobj, kNativeFld3, &field_value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(4000, field_value);

// Now re-access various dart instance fields of the returned object

// to ensure that there was no corruption while setting native fields.

result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(40, value);

result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(20, value);

@@ -904,7 +907,7 @@

Dart_NewString("testMain1"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

// Now access and set various native instance fields of the returned object.

@@ -937,7 +940,7 @@

Dart_NewString("testMain2"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

result = Dart_GetNativeInstanceField(retobj, kNativeFld4, &value);

EXPECT(!Dart_IsValid(result));

@@ -985,17 +988,17 @@

NULL);

Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("TestClass"));

- EXPECT(Dart_IsValid(cls));

+ DART_CHECKVALID(cls);

// For uninitialized fields, the getter is returned

result = Dart_GetStaticField(cls, Dart_NewString("fld1"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

int64_t value = 0;

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(7, value);

result = Dart_GetStaticField(cls, Dart_NewString("fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(11, value);

@@ -1003,11 +1006,11 @@

result = Dart_SetStaticField(cls,

Dart_NewString("fld2"),

Dart_NewInteger(13));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

// We now get the new value for fld2, not the initializer

result = Dart_GetStaticField(cls, Dart_NewString("fld2"));

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

result = Dart_IntegerValue(result, &value);

EXPECT_EQ(13, value);

@@ -1040,7 +1043,7 @@

NULL);

Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("TestClass"));

- EXPECT(Dart_IsValid(cls));

+ DART_CHECKVALID(cls);

result = Dart_GetStaticField(cls, Dart_NewString("not_found"));

EXPECT(!Dart_IsValid(result));

@@ -1093,7 +1096,7 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

@@ -1104,7 +1107,7 @@

Dart_NewString("method1"),

dart_arguments);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(Dart_IsInteger(result));

int64_t value = 0;

@@ -1165,7 +1168,7 @@

Dart_NewString("testMain1"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

EXPECT(Dart_IsClosure(retobj));

@@ -1175,7 +1178,7 @@

Dart_Handle dart_arguments[1];

dart_arguments[0] = Dart_NewInteger(1);

result = Dart_InvokeClosure(retobj, 1, dart_arguments);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(Dart_IsInteger(result));

int64_t value = 0;

@@ -1184,7 +1187,7 @@

// Invoke closure with wrong number of args, should result in exception.

result = Dart_InvokeClosure(retobj, 0, NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(Dart_ExceptionOccurred(result));

// Invoke a function which returns a closure.

@@ -1193,7 +1196,7 @@

Dart_NewString("testMain2"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

EXPECT(Dart_IsClosure(retobj));

@@ -1263,7 +1266,7 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(retobj));

+ DART_CHECKVALID(retobj);

EXPECT(!Dart_ExceptionOccurred(retobj));

// Throwing an exception here should result in an error.

@@ -1274,7 +1277,7 @@

// ok to throw an exception, check the result which would indicate

// if an exception was thrown or not.

result = Dart_InvokeDynamic(retobj, Dart_NewString("method2"), 0, NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!Dart_ExceptionOccurred(result));

EXPECT(Dart_IsInteger(result));

int64_t value = 0;

@@ -1325,12 +1328,12 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(Dart_IsInteger(result));

int64_t value = 0;

result = Dart_IntegerValue(result, &value);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT_EQ(3, value);

Dart_ExitScope();

@@ -1366,42 +1369,42 @@

Dart_NewString("testMain"),

NULL);

- EXPECT(Dart_IsValid(instanceOfTestObj));

+ DART_CHECKVALID(instanceOfTestObj);

EXPECT(!Dart_ExceptionOccurred(instanceOfTestObj));

// Fetch InstanceOfTest class.

Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("InstanceOfTest"));

- EXPECT(Dart_IsValid(cls));

+ DART_CHECKVALID(cls);

EXPECT(!Dart_ExceptionOccurred(cls));

// Now check instanceOfTestObj reported as an instance of

// InstanceOfTest class.

bool is_instance = false;

result = Dart_IsInstanceOf(instanceOfTestObj, cls, &is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(is_instance);

// Fetch OtherClass and check if instanceOfTestObj is instance of it.

Dart_Handle otherClass = Dart_GetClass(lib, Dart_NewString("OtherClass"));

- EXPECT(Dart_IsValid(otherClass));

+ DART_CHECKVALID(otherClass);

EXPECT(!Dart_ExceptionOccurred(otherClass));

result = Dart_IsInstanceOf(instanceOfTestObj, otherClass, &is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!is_instance);

// Check that primitives are not instances of InstanceOfTest class.

result = Dart_IsInstanceOf(Dart_NewString("a string"), otherClass,

&is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!is_instance);

result = Dart_IsInstanceOf(Dart_NewInteger(42), otherClass, &is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!is_instance);

result = Dart_IsInstanceOf(Dart_NewBoolean(true), otherClass, &is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!is_instance);

// Check that null is not an instance of InstanceOfTest class.

@@ -1410,11 +1413,11 @@

Dart_NewString("returnNull"),

NULL);

- EXPECT(Dart_IsValid(null));

+ DART_CHECKVALID(null);

EXPECT(!Dart_ExceptionOccurred(null));

result = Dart_IsInstanceOf(null, otherClass, &is_instance);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(!is_instance);

// Check that error is returned if null is passed as a class argument.

@@ -1441,7 +1444,7 @@

function_name,

number_of_arguments,

NULL);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(Dart_IsString(result));

// Should throw a NullPointerException. Disabled due to bug 5415268.

@@ -1451,7 +1454,7 @@

function_name2,

number_of_arguments,

dart_arguments);

- EXPECT(Dart_IsValid(result));

+ DART_CHECKVALID(result);

EXPECT(Dart_ExceptionOccurred(result)); */

}

Dart_ExitScope(); // Exit the Dart API scope.

@@ -1506,7 +1509,7 @@

Dart_NewString("main"),

NULL);

- assert(!Dart_IsValid(result));

+ ASSERT(!Dart_IsValid(result));

siva 2011/10/27 21:15:54 I think this should be EXPECT(!Dart_IsValid(result

turnidge 2011/10/27 21:55:20 Done, here and 2x below.

EXPECT_STREQ("Duplicate definition : 'foo' is defined in"

" 'library2.dart' and 'dart:test-lib'\n",

Dart_GetError(result));

@@ -1554,7 +1557,7 @@

Dart_NewString("main"),

NULL);

- assert(Dart_IsValid(result));

+ DART_CHECKVALID(result);

Dart_ExitScope(); // Exit the Dart API scope.

}

@@ -1598,7 +1601,7 @@

Dart_NewString("main"),

NULL);

- assert(!Dart_IsValid(result));

+ ASSERT(!Dart_IsValid(result));

siva 2011/10/27 21:15:54 I think this should be EXPECT(!Dart_IsValid(result

EXPECT_STREQ("Duplicate definition : 'foo' is defined in"

" 'library1.dart' and 'library2.dart'\n",

Dart_GetError(result));

@@ -1680,7 +1683,7 @@

Dart_NewString("main"),

NULL);

- assert(!Dart_IsValid(result));

+ ASSERT(!Dart_IsValid(result));

siva 2011/10/27 21:15:54 I think this should be EXPECT(!Dart_IsValid(result

EXPECT_STREQ("Duplicate definition : 'fooC' is defined in"

" 'libraryF.dart' and 'libraryC.dart'\n",

Dart_GetError(result));

@@ -1723,7 +1726,7 @@

Dart_NewString("main"),

NULL);

- assert(Dart_IsValid(result));

+ DART_CHECKVALID(result);

Dart_ExitScope(); // Exit the Dart API scope.

}

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