Deal with unhandled exceptions the same way in all Dart api functions.

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 {
 
 #if defined(TARGET_ARCH_IA32)
+
+UNIT_TEST_CASE(ErrorHandles) {
+  const char* kScriptChars =
+      "class TestClass  {\n"
+      "  static void testMain() {\n"
+      "    throw new Exception(\"bad news\");\n"
+      "  }\n"
+      "}\n";
+
+  Dart_CreateIsolate(NULL, NULL);
+  Dart_EnterScope();
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+
+  Dart_Handle instance = Dart_True();
+  Dart_Handle error = Api::Error("myerror");
+  Dart_Handle exception = Dart_InvokeStatic(lib,
+                                            Dart_NewString("TestClass"),
+                                            Dart_NewString("testMain"),
+                                            0,
+                                            NULL);
+
+  EXPECT(!Dart_IsError(instance));
+  EXPECT(Dart_IsError(error));
+  EXPECT(Dart_IsError(exception));
+
+  EXPECT(!Dart_IsUnhandledException(instance));
+  EXPECT(!Dart_IsUnhandledException(error));
+  EXPECT(Dart_IsUnhandledException(exception));
+
+  EXPECT_STREQ("", Dart_GetError(instance));
+  EXPECT_STREQ("myerror", Dart_GetError(error));
+  EXPECT_STREQ(
+      "Unhandled exception:\n"
+      "Exception: bad news\n"
+      " 0. Function: 'TestClass.testMain' url: 'dart:test-lib' line:3 col:5\n",

[Anton Muhin, 2011/11/09 12:34:03]

do you want to mandate this exactly output?

[turnidge, 2011/11/09 19:53:41]

For now, yes.  I want to nail down exactly what the user will see in this case
so I know that it looks somewhat reasonable.  I'm willing to accept the need to
update the test if the stack trace format changes.

+      Dart_GetError(exception));
+
+  EXPECT(Dart_IsError(Dart_GetException(instance)));
+  EXPECT(Dart_IsError(Dart_GetException(error)));
+  EXPECT_VALID(Dart_GetException(exception));
+
+  EXPECT(Dart_IsError(Dart_GetStacktrace(instance)));
+  EXPECT(Dart_IsError(Dart_GetStacktrace(error)));
+  EXPECT_VALID(Dart_GetStacktrace(exception));
+
+  Dart_ExitScope();
+  Dart_ShutdownIsolate();
+}
+
+
 UNIT_TEST_CASE(Dart_Error) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("An %s", "error");
-  EXPECT(!Dart_IsValid(error));
+  EXPECT(Dart_IsError(error));
   EXPECT_STREQ("An error", Dart_GetError(error));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
+
 #endif
 
 
 UNIT_TEST_CASE(Null) {
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   Dart_Handle null = Dart_Null();
   EXPECT_VALID(null);
   EXPECT(Dart_IsNull(null));
@@ skipping 80 matching lines @@
 
 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));
 
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(str, &value);
-  EXPECT(!Dart_IsValid(result));
+  EXPECT(Dart_IsError(result));
 
   Dart_Handle val1 = Dart_NewBoolean(true);
   EXPECT(Dart_IsBoolean(val1));
 
   result = Dart_BooleanValue(val1, &value);
   EXPECT_VALID(result);
   EXPECT(value);
 
   Dart_Handle val2 = Dart_NewBoolean(false);
   EXPECT(Dart_IsBoolean(val2));
@@ skipping 77 matching lines @@
     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_VALID(result);
-    EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(Dart_IsNumber(result));
 
     // Check double case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getDouble"),
                                0,
                                NULL);
     EXPECT_VALID(result);
-    EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(Dart_IsNumber(result));
 
     // Check bool case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getBool"),
                                0,
                                NULL);
     EXPECT_VALID(result);
-    EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(!Dart_IsNumber(result));
 
     // Check null case.
     result = Dart_InvokeStatic(lib,
                                class_name,
                                Dart_NewString("getNull"),
                                0,
                                NULL);
     EXPECT_VALID(result);
-    EXPECT(!Dart_ExceptionOccurred(result));
     EXPECT(!Dart_IsNumber(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 #endif
 
 
@@ skipping 52 matching lines @@
   EXPECT(!Dart_IsList(str));
   Dart_Handle val = Dart_NewList(kArrayLength);
   EXPECT(Dart_IsList(val));
   intptr_t len = 0;
   Dart_Handle result = Dart_ListLength(val, &len);
   EXPECT_VALID(result);
   EXPECT_EQ(kArrayLength, len);
 
   // Check invalid array access.
   result = Dart_ListSetAt(val, (kArrayLength + 10), Dart_NewInteger(10));
-  EXPECT(!Dart_IsValid(result));
+  EXPECT(Dart_IsError(result));
   result = Dart_ListSetAt(val, -10, Dart_NewInteger(10));
-  EXPECT(!Dart_IsValid(result));
+  EXPECT(Dart_IsError(result));
   result = Dart_ListGetAt(val, (kArrayLength + 10));
-  EXPECT(!Dart_IsValid(result));
+  EXPECT(Dart_IsError(result));
   result = Dart_ListGetAt(val, -10);
-  EXPECT(!Dart_IsValid(result));
+  EXPECT(Dart_IsError(result));
 
   for (int i = 0; i < kArrayLength; i++) {
     result = Dart_ListSetAt(val, i, Dart_NewInteger(i));
     EXPECT_VALID(result);
   }
   for (int i = 0; i < kArrayLength; i++) {
     result = Dart_ListGetAt(val, i);
     EXPECT_VALID(result);
     int64_t value;
     result = Dart_IntegerValue(result, &value);
@@ skipping 28 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..
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("ListAccessTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
-    EXPECT(Dart_IsValid(result));
-    EXPECT(!Dart_ExceptionOccurred(result));
+    EXPECT_VALID(result);
 
     // First ensure that the returned object is an array.
     Dart_Handle ListAccessTestObj = result;
 
     EXPECT(Dart_IsList(ListAccessTestObj));
 
     // Get length of array object.
     intptr_t len = 0;
     result = Dart_ListLength(ListAccessTestObj, &len);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(3, len);
 
     // Access elements in the array.
     int64_t value;
 
     result = Dart_ListGetAt(ListAccessTestObj, 0);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(10, value);
 
     result = Dart_ListGetAt(ListAccessTestObj, 1);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(20, value);
 
     result = Dart_ListGetAt(ListAccessTestObj, 2);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(30, value);
 
     // Set some elements in the array.
     result = Dart_ListSetAt(ListAccessTestObj, 0, Dart_NewInteger(0));
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_ListSetAt(ListAccessTestObj, 1, Dart_NewInteger(1));
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_ListSetAt(ListAccessTestObj, 2, Dart_NewInteger(2));
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
 
     // Get length of array object.
     result = Dart_ListLength(ListAccessTestObj, &len);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(3, len);
 
     // Now try and access these elements in the array.
     result = Dart_ListGetAt(ListAccessTestObj, 0);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(0, value);
 
     result = Dart_ListGetAt(ListAccessTestObj, 1);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(1, value);
 
     result = Dart_ListGetAt(ListAccessTestObj, 2);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(2, value);
 
     uint8_t native_array[3];
     result = Dart_ListGetAsBytes(ListAccessTestObj, 0, native_array, 3);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(0, native_array[0]);
     EXPECT_EQ(1, native_array[1]);
     EXPECT_EQ(2, native_array[2]);
 
     native_array[0] = 10;
     native_array[1] = 20;
     native_array[2] = 30;
     result = Dart_ListSetAsBytes(ListAccessTestObj, 0, native_array, 3);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_ListGetAsBytes(ListAccessTestObj, 0, native_array, 3);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(10, native_array[0]);
     EXPECT_EQ(20, native_array[1]);
     EXPECT_EQ(30, native_array[2]);
     result = Dart_ListGetAt(ListAccessTestObj, 2);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
-    EXPECT(Dart_IsValid(result));
+    EXPECT_VALID(result);
     EXPECT_EQ(30, value);
 
     // Check if we get an exception when accessing beyond limit.
     result = Dart_ListGetAt(ListAccessTestObj, 4);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 
 // Unit test for entering a scope, creating a local handle and exiting
@@ skipping 309 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_VALID(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_VALID(cls);
     result = Dart_GetStaticField(cls, Dart_NewString("fld1"));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld3"));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetStaticField(cls, Dart_NewString("fld4"));
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetStaticField(cls, Dart_NewString("fld3"));
     EXPECT_VALID(result);
     result = Dart_SetStaticField(cls,
                                  Dart_NewString("fld3"),
                                  Dart_NewInteger(200));
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(10, value);
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(20, value);
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("fld2"),
                                    Dart_NewInteger(40));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("fld1"),
                                    Dart_NewInteger(40));
     EXPECT_VALID(result);
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(40, value);
 
     Dart_ExitScope();  // Exit the Dart API scope.
@@ skipping 26 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_VALID(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_VALID(cls);
     result = Dart_GetStaticField(cls, Dart_NewString("_fld1"));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetInstanceField(retobj, Dart_NewString("_fld3"));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetStaticField(cls, Dart_NewString("_fld4"));
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetStaticField(cls, Dart_NewString("_fld3"));
     EXPECT_VALID(result);
     result = Dart_SetStaticField(cls,
                                  Dart_NewString("_fld3"),
                                  Dart_NewInteger(200));
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(10, value);
     result = Dart_GetInstanceField(retobj, Dart_NewString("_fld2"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(20, value);
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("_fld2"),
                                    Dart_NewInteger(40));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("_fld1"),
                                    Dart_NewInteger(40));
     EXPECT_VALID(result);
     result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(40, value);
 
     Dart_ExitScope();  // Exit the Dart API scope.
@@ skipping 37 matching lines @@
 
     // 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_VALID(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.
     EXPECT_EQ(Utils::RoundUp(((kNumNativeFields + 2) * kWordSize) + kWordSize,
@@ skipping 32 matching lines @@
 
     // Invoke a function which returns an object of type NativeFields.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
     // We expect this to fail as class "NativeFields" extends
     // "NativeFieldsWrapper" and there is no definition of it either
     // in the dart code or through the native field injection mechanism.
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(NativeFieldAccess) {
   const char* kScriptChars =
       "class NativeFields extends NativeFieldsWrapper {\n"
@@ skipping 27 matching lines @@
 
     // 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_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
     EXPECT_VALID(result);
     int64_t value = 0;
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(10, value);
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));
     EXPECT_VALID(result);
     result = Dart_IntegerValue(result, &value);
     EXPECT_EQ(20, value);
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("fld2"),
                                    Dart_NewInteger(40));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetInstanceField(retobj,
                                    Dart_NewString("fld1"),
                                    Dart_NewInteger(40));
     EXPECT_VALID(result);
     result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld0, &field_value);
     EXPECT_VALID(result);
     EXPECT_EQ(0, field_value);
     result = Dart_GetNativeInstanceField(retobj, kNativeFld1, &field_value);
     EXPECT_VALID(result);
     EXPECT_EQ(0, field_value);
     result = Dart_GetNativeInstanceField(retobj, kNativeFld2, &field_value);
     EXPECT_VALID(result);
     EXPECT_EQ(0, field_value);
     result = Dart_SetNativeInstanceField(retobj, kNativeFld4, 40);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 4);
     EXPECT_VALID(result);
     result = Dart_SetNativeInstanceField(retobj, kNativeFld1, 40);
     EXPECT_VALID(result);
     result = Dart_SetNativeInstanceField(retobj, kNativeFld2, 400);
     EXPECT_VALID(result);
     result = Dart_SetNativeInstanceField(retobj, kNativeFld3, 4000);
     EXPECT_VALID(result);
     result = Dart_GetNativeInstanceField(retobj, kNativeFld3, &field_value);
     EXPECT_VALID(result);
@@ skipping 45 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_VALID(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;
     intptr_t value = 0;
     result = Dart_GetNativeInstanceField(retobj, kNativeFld4, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld0, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld1, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld2, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld4, 40);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld3, 40);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 400);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
 
     // Invoke a function which returns a closure object.
     retobj = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain2"),
                                0,
                                NULL);
     EXPECT_VALID(retobj);
-    EXPECT(!Dart_ExceptionOccurred(retobj));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld4, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld0, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld1, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_GetNativeInstanceField(retobj, kNativeFld2, &value);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld4, 40);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld3, 40);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     result = Dart_SetNativeInstanceField(retobj, kNativeFld0, 400);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(GetStaticField_RunsInitializer) {
   const char* kScriptChars =
       "class TestClass  {\n"
@@ skipping 70 matching lines @@
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("TestClass"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
 
     Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("TestClass"));
     EXPECT_VALID(cls);
 
     result = Dart_GetStaticField(cls, Dart_NewString("not_found"));
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(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));
+    EXPECT(Dart_IsError(result));
     EXPECT_STREQ("Specified field is not found in the class",
                  Dart_GetError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(InvokeDynamic) {
@@ skipping 23 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_VALID(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_VALID(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));
+    EXPECT(Dart_IsError(result));
 
     result = Dart_InvokeDynamic(retobj, Dart_NewString("method1"), 0, NULL);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(InvokeClosure) {
   const char* kScriptChars =
       "class InvokeClosure {\n"
@@ skipping 30 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_VALID(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_VALID(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_VALID(result);
-    EXPECT(Dart_ExceptionOccurred(result));
+    EXPECT(Dart_IsError(result));
+    EXPECT(Dart_IsUnhandledException(result));
 
     // Invoke a function which returns a closure.
     retobj = Dart_InvokeStatic(lib,
                                Dart_NewString("InvokeClosureTest"),
                                Dart_NewString("testMain2"),
                                0,
                                NULL);
     EXPECT_VALID(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));
+    EXPECT(Dart_IsError(result));
+    EXPECT(Dart_IsUnhandledException(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 void ExceptionNative(Dart_NativeArguments args) {
   Dart_Handle param = Dart_GetNativeArgument(args, 0);
   Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
@@ skipping 41 matching lines @@
         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_VALID(retobj);
-    EXPECT(!Dart_ExceptionOccurred(retobj));
 
     // Throwing an exception here should result in an error.
     result = Dart_ThrowException(retobj);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(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_VALID(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 58 matching lines @@
   Dart_CreateIsolate(NULL, NULL);
   Dart_EnterScope();
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Lookup a class that does exist.
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("DoesExist"));
   EXPECT_VALID(cls);
 
   // Lookup a class that does not exist.
   cls = Dart_GetClass(lib, Dart_NewString("DoesNotExist"));
-  EXPECT(!Dart_IsValid(cls));
+  EXPECT(Dart_IsError(cls));
   EXPECT_STREQ("Class 'DoesNotExist' not found in library 'dart:test-lib'.",
                Dart_GetError(cls));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(InstanceOf) {
   const char* kScriptChars =
@@ skipping 16 matching lines @@
     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_VALID(instanceOfTestObj);
-    EXPECT(!Dart_ExceptionOccurred(instanceOfTestObj));
 
     // Fetch InstanceOfTest class.
     Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("InstanceOfTest"));
     EXPECT_VALID(cls);
-    EXPECT(!Dart_ExceptionOccurred(cls));
 
     // Now check instanceOfTestObj reported as an instance of
     // InstanceOfTest class.
     bool is_instance = false;
     result = Dart_ObjectIsType(instanceOfTestObj, cls, &is_instance);
     EXPECT_VALID(result);
     EXPECT(is_instance);
 
     // Fetch OtherClass and check if instanceOfTestObj is instance of it.
     Dart_Handle otherClass = Dart_GetClass(lib, Dart_NewString("OtherClass"));
     EXPECT_VALID(otherClass);
-    EXPECT(!Dart_ExceptionOccurred(otherClass));
 
     result = Dart_ObjectIsType(instanceOfTestObj, otherClass, &is_instance);
     EXPECT_VALID(result);
     EXPECT(!is_instance);
 
     // Check that primitives are not instances of InstanceOfTest class.
     result = Dart_ObjectIsType(Dart_NewString("a string"), otherClass,
                                &is_instance);
     EXPECT_VALID(result);
     EXPECT(!is_instance);
 
     result = Dart_ObjectIsType(Dart_NewInteger(42), otherClass, &is_instance);
     EXPECT_VALID(result);
     EXPECT(!is_instance);
 
     result = Dart_ObjectIsType(Dart_NewBoolean(true), otherClass, &is_instance);
     EXPECT_VALID(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_VALID(null);
-    EXPECT(!Dart_ExceptionOccurred(null));
 
     result = Dart_ObjectIsType(null, otherClass, &is_instance);
     EXPECT_VALID(result);
     EXPECT(!is_instance);
 
     // Check that error is returned if null is passed as a class argument.
     result = Dart_ObjectIsType(null, null, &is_instance);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(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.
@@ skipping 11 matching lines @@
     EXPECT_VALID(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_VALID(result);
-    EXPECT(Dart_ExceptionOccurred(result)); */
+    EXPECT(Dart_IsError(result));
+    EXPECT(Dart_IsUnhandledException(result)); */
   }
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 static Dart_Handle library_handler(Dart_LibraryTag tag,
                                    Dart_Handle library,
                                    Dart_Handle url) {
   if (tag == kCanonicalizeUrl) {
@@ skipping 33 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);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(result));
     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 71 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);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(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);
-    EXPECT(!Dart_IsValid(result));
+    EXPECT(Dart_IsError(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 31 matching lines @@
                                NULL);
     EXPECT_VALID(result);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart