Add DART_CHECKVALID

runtime/vm/dart_api_impl_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/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/unit_test.h"
 #include "vm/utils.h"
 #include "vm/verifier.h"
 
 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.
 
   Dart_Handle str = Dart_NewString("test");
   EXPECT(!Dart_IsBoolean(str));
   Dart_Handle val1 = Dart_NewBoolean(true);
   EXPECT(Dart_IsBoolean(val1));
   Dart_Handle val2 = Dart_NewBoolean(false);
   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 failure here will abort the
process and not continue with the remaining unit tests when run_vm_tests is
used.

[turnidge, 2011/10/27 21:55:20]

Added a separate EXPECT_VALID which I will use in tests.  Now DART_CHECK_VALID
is mainly for external users.

+  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();
 }
 
 
 UNIT_TEST_CASE(DoubleValues) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const double kDoubleVal1 = 201.29;
   const double kDoubleVal2 = 101.19;
   Dart_Handle val1 = Dart_NewDouble(kDoubleVal1);
   EXPECT(Dart_IsDouble(val1));
   Dart_Handle val2 = Dart_NewDouble(kDoubleVal2);
   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.
   Dart_ShutdownIsolate();
 }
 
 
 #if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
 
 UNIT_TEST_CASE(NumberValues) {
@@ skipping 14 matching lines @@
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     Dart_Handle class_name = Dart_NewString("NumberValuesHelper");
     // Check int case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getInt"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(Dart_IsNumber(result));
 
     // Check double case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getDouble"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(Dart_IsNumber(result));
 
     // Check bool case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getBool"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(!Dart_IsNumber(result));
 
     // Check null case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getNull"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(!Dart_IsNumber(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 #endif
 
 
 UNIT_TEST_CASE(IntegerValues) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const int64_t kIntegerVal1 = 100;
   const int64_t kIntegerVal2 = 0xffffffff;
   const char* kIntegerVal3 = "0x123456789123456789123456789";
 
   Dart_Handle val1 = Dart_NewInteger(kIntegerVal1);
   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.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(ArrayValues) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const int kArrayLength = 10;
   Dart_Handle str = Dart_NewString("test");
   EXPECT(!Dart_IsArray(str));
   Dart_Handle val = Dart_NewArray(kArrayLength);
   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.
   result = Dart_ArraySetAt(val, (kArrayLength + 10), Dart_NewInteger(10));
   EXPECT(!Dart_IsValid(result));
   result = Dart_ArraySetAt(val, -10, Dart_NewInteger(10));
   EXPECT(!Dart_IsValid(result));
   result = Dart_ArrayGetAt(val, (kArrayLength + 10));
   EXPECT(!Dart_IsValid(result));
   result = Dart_ArrayGetAt(val, -10);
   EXPECT(!Dart_IsValid(result));
 
   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);
   }
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 // Unit test for entering a scope, creating a local handle and exiting
 // the scope.
@@ skipping 278 matching lines @@
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("FieldsTest"),
                                            Dart_NewString("testMain"),
                                            0,
                                            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);
     result = Dart_SetStaticField(cls,
                                  Dart_NewString("fld4"),
                                  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);
 
     // 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);
     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,
                                    Dart_NewString("fld2"),
                                    Dart_NewInteger(40));
     EXPECT(!Dart_IsValid(result));
     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);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(HiddenFieldAccess) {
@@ skipping 19 matching lines @@
 
     // Load up a test script which extends the native wrapper class.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("HiddenFieldsTest"),
                                            Dart_NewString("testMain"),
                                            0,
                                            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);
     result = Dart_SetStaticField(cls,
                                  Dart_NewString("_fld4"),
                                  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);
 
     // 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);
     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,
                                    Dart_NewString("_fld2"),
                                    Dart_NewInteger(40));
     EXPECT(!Dart_IsValid(result));
     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);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(InjectNativeFields1) {
@@ skipping 30 matching lines @@
         kNumNativeFields);
 
     // Load up a test script in the test library.
 
     // Invoke a function which returns an object of type NativeFields.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     Instance& obj = Instance::Handle();
     obj ^= Api::UnwrapHandle(result);
     const Class& cls = Class::Handle(obj.clazz());
     // We expect the newly created "NativeFields" object to have
     // 2 dart instance fields (fld1, fld2) and kNumNativeFields native fields.
     // Hence the size of an instance of "NativeFields" should be
     // (kNumNativeFields + 2) * kWordSize + sizeof the header word.
     // We check to make sure the instance size computed by the VM matches
     // our expectations.
@@ skipping 80 matching lines @@
         kNumNativeFields);
 
     // Load up a test script in it.
 
     // Invoke a function which returns an object of type NativeFields.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("NativeFieldsTest"),
                                            Dart_NewString("testMain"),
                                            0,
                                            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,
                                    Dart_NewString("fld2"),
                                    Dart_NewInteger(40));
     EXPECT(!Dart_IsValid(result));
     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);
 
     // Now access and set various native instance fields of the returned object.
     const int kNativeFld0 = 0;
     const int kNativeFld1 = 1;
     const int kNativeFld2 = 2;
     const int kNativeFld3 = 3;
     const int kNativeFld4 = 4;
     intptr_t field_value = 0;
     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);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(NegativeNativeFieldAccess) {
@@ skipping 24 matching lines @@
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type NativeFields.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("NativeFieldsTest"),
                                            Dart_NewString("testMain1"),
                                            0,
                                            NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
 
     // Now access and set various native instance fields of the returned object.
     // All of these tests are expected to return failure as there are no
     // native fields in an instance of NativeFields.
     const int kNativeFld0 = 0;
     const int kNativeFld1 = 1;
     const int kNativeFld2 = 2;
     const int kNativeFld3 = 3;
     const int kNativeFld4 = 4;
@@ skipping 12 matching lines @@
     EXPECT(!Dart_IsValid(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 400);
     EXPECT(!Dart_IsValid(result));
 
     // Invoke a function which returns a closure object.
     retobj = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain2"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld4, &value);
     EXPECT(!Dart_IsValid(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld0, &value);
     EXPECT(!Dart_IsValid(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld1, &value);
     EXPECT(!Dart_IsValid(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld2, &value);
     EXPECT(!Dart_IsValid(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld4, 40);
@@ skipping 27 matching lines @@
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("TestClass"),
                                Dart_NewString("testMain"),
                                0,
                                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);
 
     // Overwrite fld2
     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);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(StaticFieldNotFound) {
@@ skipping 12 matching lines @@
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("TestClass"),
                                Dart_NewString("testMain"),
                                0,
                                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));
     EXPECT_STREQ("Specified field is not found in the class",
                  Dart_GetError(result));
 
     result = Dart_SetStaticField(cls,
                                  Dart_NewString("not_found"),
                                  Dart_NewInteger(13));
     EXPECT(!Dart_IsValid(result));
@@ skipping 32 matching lines @@
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InvokeDynamic.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeDynamicTest"),
                                            Dart_NewString("testMain"),
                                            0,
                                            NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
 
 
     // Now invoke a dynamic method and check the result.
     Dart_Handle dart_arguments[1];
     dart_arguments[0] = Dart_NewInteger(1);
     result = Dart_InvokeDynamic(retobj,
                                 Dart_NewString("method1"),
                                 1,
                                 dart_arguments);
-    EXPECT(Dart_IsValid(result));
+    DART_CHECKVALID(result);
     EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(Dart_IsInteger(result));
     int64_t value = 0;
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(41, value);
 
     result = Dart_InvokeDynamic(retobj, Dart_NewString("method2"), 0, NULL);
     EXPECT(!Dart_IsValid(result));
 
     result = Dart_InvokeDynamic(retobj, Dart_NewString("method1"), 0, NULL);
@@ skipping 40 matching lines @@
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns a closure.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeClosureTest"),
                                            Dart_NewString("testMain1"),
                                            0,
                                            NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
 
     EXPECT(Dart_IsClosure(retobj));
     EXPECT(!Dart_IsClosure(Dart_NewInteger(101)));
 
     // Now invoke the closure and check the result.
     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;
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(51, value);
 
     // 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.
     retobj = Dart_InvokeStatic(lib,
                                Dart_NewString("InvokeClosureTest"),
                                Dart_NewString("testMain2"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
 
     EXPECT(Dart_IsClosure(retobj));
     EXPECT(!Dart_IsClosure(Dart_NewString("abcdef")));
 
     // Now invoke the closure and check the result (should be an exception).
     dart_arguments[0] = Dart_NewInteger(1);
     result = Dart_InvokeClosure(retobj, 1, dart_arguments);
     EXPECT(Dart_ExceptionOccurred(result));
 
@@ skipping 49 matching lines @@
     Dart_Handle lib = TestCase::LoadTestScript(
         kScriptChars,
         reinterpret_cast<Dart_NativeEntryResolver>(native_lookup));
 
     // Invoke a function which returns an object of type ThrowException.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("ThrowExceptionTest"),
                                            Dart_NewString("testMain"),
                                            0,
                                            NULL);
-    EXPECT(Dart_IsValid(retobj));
+    DART_CHECKVALID(retobj);
     EXPECT(!Dart_ExceptionOccurred(retobj));
 
     // Throwing an exception here should result in an error.
     result = Dart_ThrowException(retobj);
     EXPECT(!Dart_IsValid(result));
 
     // Now invoke method2 which invokes a natve method where it is
     // 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;
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(5, value);
 
     Dart_ExitScope();  // Exit the Dart API scope.
     EXPECT_EQ(size, state->ZoneSizeInBytes());
   }
   Dart_ShutdownIsolate();
@@ skipping 30 matching lines @@
     Dart_EnterScope();
     Dart_Handle lib = TestCase::LoadTestScript(
         kScriptChars,
         reinterpret_cast<Dart_NativeEntryResolver>(gnac_lookup));
 
     Dart_Handle result = Dart_InvokeStatic(lib,
                                            Dart_NewString("Test"),
                                            Dart_NewString("testMain"),
                                            0,
                                            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();
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(InstanceOf) {
   const char* kScriptChars =
@@ skipping 15 matching lines @@
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InstanceOf..
     Dart_Handle instanceOfTestObj =
         Dart_InvokeStatic(lib,
                           Dart_NewString("InstanceOfTest"),
                           Dart_NewString("testMain"),
                           0,
                           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.
     Dart_Handle null = Dart_InvokeStatic(lib,
                                          Dart_NewString("OtherClass"),
                                          Dart_NewString("returnNull"),
                                          0,
                                          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.
     result = Dart_IsInstanceOf(null, null, &is_instance);
     EXPECT(!Dart_IsValid(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(NullReceiver) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
   {
     Zone zone;
     HandleScope hs;
 
     Dart_Handle function_name = Dart_NewString("toString");
     const int number_of_arguments = 0;
     Dart_Handle null_receiver = Api::NewLocalHandle(Object::Handle());
     Dart_Handle result = Dart_InvokeDynamic(null_receiver,
                                             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.
     /*
     Dart_Handle function_name2 = Dart_NewString("NoNoNo");
     result = Dart_InvokeDynamic(null_receiver,
                                 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.
   Dart_ShutdownIsolate();
 }
 
 
 static Dart_Handle library_handler(Dart_LibraryTag tag,
                                    Dart_Handle library,
                                    Dart_Handle url) {
@@ skipping 34 matching lines @@
 
     url = Dart_NewString("library2.dart");
     source = Dart_NewString(kLibrary2Chars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                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));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
@@ skipping 27 matching lines @@
 
     url = Dart_NewString("library2.dart");
     source = Dart_NewString(kLibrary2Chars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                NULL);
-    assert(Dart_IsValid(result));
+    DART_CHECKVALID(result);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(ImportLibrary3) {
   const char* kScriptChars =
       "#import('library2.dart');"
@@ skipping 23 matching lines @@
 
     url = Dart_NewString("library1.dart");
     source = Dart_NewString(kLibrary1Chars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                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));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
@@ skipping 61 matching lines @@
 
     url = Dart_NewString("libraryE.dart");
     source = Dart_NewString(kLibraryEChars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                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));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
@@ skipping 22 matching lines @@
 
     url = Dart_NewString("lib.dart");
     source = Dart_NewString(kLibraryChars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                NULL);
-    assert(Dart_IsValid(result));
+    DART_CHECKVALID(result);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart