Add Dart_PropagateError.

runtime/vm/dart_api_impl_test.cc

 // Copyright (c) 2012, 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 "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/thread.h"
@@ skipping 41 matching lines @@
 
   EXPECT(Dart_IsError(Dart_ErrorGetException(instance)));
   EXPECT(Dart_IsError(Dart_ErrorGetException(error)));
   EXPECT_VALID(Dart_ErrorGetException(exception));
 
   EXPECT(Dart_IsError(Dart_ErrorGetStacktrace(instance)));
   EXPECT(Dart_IsError(Dart_ErrorGetStacktrace(error)));
   EXPECT_VALID(Dart_ErrorGetStacktrace(exception));
 }
 
+
+void PropagateErrorNative(Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle closure = Dart_GetNativeArgument(args, 0);
+  EXPECT(Dart_IsClosure(closure));
+  Dart_Handle result = Dart_InvokeClosure(closure, 0, NULL);
+  EXPECT(Dart_IsError(result));
+  result = Dart_PropagateError(result);
+  EXPECT_VALID(result);  // We do not expect to reach here.
+  UNREACHABLE();
+}
+
+
+static Dart_NativeFunction PropagateError_native_lookup(
+    Dart_Handle name, int argument_count) {
+  return reinterpret_cast<Dart_NativeFunction>(&PropagateErrorNative);
+}
+
+
+TEST_CASE(Dart_PropagateError) {
+  const char* kScriptChars =
+      "class Test {\n"
+      "  static void raiseCompileError() {\n"
+      "    return badIdent;\n"
+      "  }\n"
+      "\n"
+      "  static void throwException() {\n"
+      "    throw new Exception('myException');\n"
+      "  }\n"
+      "  static void nativeFunc(closure) native 'Test_nativeFunc';\n"
+      "\n"
+      "  static void Func1() {\n"
+      "    nativeFunc(() => raiseCompileError());\n"
+      "  }\n"
+      "\n"
+      "  static void Func2() {\n"
+      "    nativeFunc(() => throwException());\n"
+      "  }\n"
+      "}\n";
+  Dart_Handle lib = TestCase::LoadTestScript(
+      kScriptChars, &PropagateError_native_lookup);
+  Dart_Handle result;
+
+  result = Dart_InvokeStatic(lib,
+                             Dart_NewString("Test"),
+                             Dart_NewString("Func1"),
+                             0,
+                             NULL);
+  EXPECT(Dart_IsError(result));
+  EXPECT(!Dart_ErrorHasException(result));
+  EXPECT_SUBSTRING("badIdent", Dart_GetError(result));
+
+  result = Dart_InvokeStatic(lib,
+                             Dart_NewString("Test"),
+                             Dart_NewString("Func2"),
+                             0,
+                             NULL);
+  EXPECT(Dart_IsError(result));
+  EXPECT(Dart_ErrorHasException(result));
+  EXPECT_SUBSTRING("myException", Dart_GetError(result));
+}
+
 #endif
 
 
 TEST_CASE(Dart_Error) {
   Dart_Handle error = Dart_Error("An %s", "error");
   EXPECT(Dart_IsError(error));
   EXPECT_STREQ("An error", Dart_GetError(error));
 }

[siva, 2012/01/31 00:52:34]

Missing blank lines?

[turnidge, 2012/01/31 21:56:31]

Added lines.

-
-
 TEST_CASE(Null) {
   Dart_Handle null = Dart_Null();
   EXPECT_VALID(null);
   EXPECT(Dart_IsNull(null));
 
   Dart_Handle str = Dart_NewString("test");
   EXPECT_VALID(str);
   EXPECT(!Dart_IsNull(str));
 }
 
@@ skipping 2927 matching lines @@
   // We should have received the expected number of interrupts.
   EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart