| Index: runtime/vm/debugger_api_impl_test.cc
|
| diff --git a/runtime/vm/debugger_api_impl_test.cc b/runtime/vm/debugger_api_impl_test.cc
|
| index 2bcc7856a60c93ade9d914fa2750b528c82fc5c9..954dd1e873fe1d1763d8ffd93810ea5c5e672e17 100644
|
| --- a/runtime/vm/debugger_api_impl_test.cc
|
| +++ b/runtime/vm/debugger_api_impl_test.cc
|
| @@ -22,12 +22,12 @@ static const bool verbose = true;
|
| if (Dart_IsError(handle)) { \
|
| OS::Print("Error: %s\n", Dart_GetError(handle)); \
|
| } \
|
| - EXPECT(!Dart_IsError(handle));
|
| + EXPECT_VALID(handle);
|
|
|
|
|
| static void LoadScript(const char* source) {
|
| script_lib = TestCase::LoadTestScript(source, NULL);
|
| - EXPECT(!Dart_IsError(script_lib));
|
| + EXPECT_VALID(script_lib);
|
| }
|
|
|
|
|
| @@ -284,7 +284,7 @@ TEST_CASE(Debug_Breakpoint) {
|
|
|
| breakpoint_hit = false;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT(breakpoint_hit == true);
|
| }
|
|
|
| @@ -342,7 +342,7 @@ TEST_CASE(Debug_StepOut) {
|
| breakpoint_hit = false;
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT(Dart_IsInteger(retval));
|
| int64_t int_value = 0;
|
| Dart_IntegerToInt64(retval, &int_value);
|
| @@ -423,7 +423,7 @@ TEST_CASE(Debug_StepInto) {
|
| breakpoint_hit = false;
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT(Dart_IsInteger(retval));
|
| int64_t int_value = 0;
|
| Dart_IntegerToInt64(retval, &int_value);
|
| @@ -466,7 +466,7 @@ TEST_CASE(Debug_IgnoreBP) {
|
| breakpoint_hit = false;
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT(Dart_IsInteger(retval));
|
| int64_t int_value = 0;
|
| Dart_IntegerToInt64(retval, &int_value);
|
| @@ -504,7 +504,7 @@ TEST_CASE(Debug_DeoptimizeFunction) {
|
| breakpoint_hit = false;
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT(Dart_IsInteger(retval));
|
| int64_t int_value = 0;
|
| Dart_IntegerToInt64(retval, &int_value);
|
| @@ -733,7 +733,7 @@ TEST_CASE(Debug_DeleteBreakpoint) {
|
| bp_id_to_be_deleted = bp_id;
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| EXPECT_EQ(2, breakpoint_hit_counter);
|
| }
|
|
|
| @@ -744,7 +744,7 @@ static void InspectStaticFieldHandler(Dart_Breakpoint bpt,
|
| ASSERT(!Dart_IsError(script_lib));
|
| ASSERT(Dart_IsLibrary(script_lib));
|
| Dart_Handle class_A = Dart_GetClass(script_lib, Dart_NewString("A"));
|
| - EXPECT(!Dart_IsError(class_A));
|
| + EXPECT_VALID(class_A);
|
|
|
| const int expected_num_fields = 2;
|
| struct {
|
| @@ -816,7 +816,7 @@ TEST_CASE(Debug_InspectStaticField) {
|
|
|
| breakpoint_hit_counter = 0;
|
| Dart_Handle retval = Invoke("main");
|
| - EXPECT(!Dart_IsError(retval));
|
| + EXPECT_VALID(retval);
|
| }
|
|
|
|
|
|
|