Added EXPECT_TRUE macro, updated debugger unit tests to use it for

runtime/vm/debugger_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_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 
@@ skipping 16 matching lines @@
 
 static void SetBreakpointAtEntry(const char* cname, const char* fname) {
   ASSERT(script_lib != NULL);
   ASSERT(!Dart_IsError(script_lib));
   ASSERT(Dart_IsLibrary(script_lib));
   Dart_Breakpoint bpt;
   Dart_Handle res = Dart_SetBreakpointAtEntry(script_lib,
                         NewString(cname),
                         NewString(fname),
                         &bpt);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
 }
 
 
 static Dart_Handle Invoke(const char* func_name) {
   ASSERT(script_lib != NULL);
   ASSERT(!Dart_IsError(script_lib));
   ASSERT(Dart_IsLibrary(script_lib));
   return Dart_Invoke(script_lib, NewString(func_name), 0, NULL);
 }
 
 
 static char const* ToCString(Dart_Handle str) {
   EXPECT(Dart_IsString(str));
   char const* c_str = NULL;
   Dart_StringToCString(str, &c_str);
   return c_str;
 }
 
 
 static char const* BreakpointInfo(Dart_StackTrace trace) {
   static char info_str[128];
   Dart_ActivationFrame frame;
   Dart_Handle res = Dart_GetActivationFrame(trace, 0, &frame);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   Dart_Handle func_name;
   Dart_Handle url;
   intptr_t line_number = 0;
   intptr_t library_id = 0;
   res = Dart_ActivationFrameInfo(
             frame, &func_name, &url, &line_number, &library_id);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   OS::SNPrint(info_str, sizeof(info_str), "function %s (%s:%"Pd")",
               ToCString(func_name), ToCString(url), line_number);
   return info_str;
 }
 
 
 static void PrintValue(Dart_Handle value, bool expand);
 
 
 static void PrintObjectList(Dart_Handle list, const char* prefix, bool expand) {
@@ skipping 47 matching lines @@
   } else {
     PrintObject(value, expand);
   }
 }
 
 
 static void PrintActivationFrame(Dart_ActivationFrame frame) {
   Dart_Handle func_name;
   Dart_Handle res;
   res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   EXPECT(Dart_IsString(func_name));
   const char* func_name_chars;
   Dart_StringToCString(func_name, &func_name_chars);
   OS::Print("    function %s\n", func_name_chars);
   Dart_Handle locals = Dart_GetLocalVariables(frame);
   EXPECT_VALID(locals);
   intptr_t list_length = 0;
   Dart_Handle ret = Dart_ListLength(locals, &list_length);
   EXPECT_VALID(ret);
   for (int i = 0; i + 1 < list_length; i += 2) {
     Dart_Handle name_handle = Dart_ListGetAt(locals, i);
     EXPECT_VALID(name_handle);
     EXPECT(Dart_IsString(name_handle));
     OS::Print("      local var %s = ", ToCString(name_handle));
     Dart_Handle value_handle = Dart_ListGetAt(locals, i + 1);
     EXPECT_VALID(value_handle);
     PrintValue(value_handle, true);
     OS::Print("\n");
   }
 }
 
 
 static void PrintStackTrace(Dart_StackTrace trace) {
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
-    EXPECT_VALID(res);
+    EXPECT_TRUE(res);
     PrintActivationFrame(frame);
   }
 }
 
 
 static void VerifyListEquals(Dart_Handle expected,
                              Dart_Handle got,
                              bool skip_null_expects) {
   EXPECT(Dart_IsList(expected));
   EXPECT(Dart_IsList(got));
@@ skipping 18 matching lines @@
 }
 
 
 static void VerifyStackFrame(Dart_ActivationFrame frame,
                              const char* expected_name,
                              Dart_Handle expected_locals,
                              bool skip_null_expects) {
   Dart_Handle func_name;
   Dart_Handle res;
   res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   EXPECT(Dart_IsString(func_name));
   const char* func_name_chars;
   Dart_StringToCString(func_name, &func_name_chars);
   if (expected_name != NULL) {
     EXPECT_SUBSTRING(expected_name, func_name_chars);
   }
 
   if (!Dart_IsNull(expected_locals)) {
     Dart_Handle locals = Dart_GetLocalVariables(frame);
     EXPECT_VALID(locals);
     VerifyListEquals(expected_locals, locals, skip_null_expects);
   }
 }
 
 
 static void VerifyStackTrace(Dart_StackTrace trace,
                              const char* func_names[],
                              Dart_Handle local_vars[],
                              int expected_frames,
                              bool skip_null_expects) {
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
-  EXPECT_VALID(res);
+  EXPECT_TRUE(res);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
     res = Dart_GetActivationFrame(trace, i, &frame);
-    EXPECT_VALID(res);
+    EXPECT_TRUE(res);
     if (i < expected_frames) {
       VerifyStackFrame(frame, func_names[i], local_vars[i], skip_null_expects);
     } else {
       VerifyStackFrame(frame, NULL, Dart_Null(), skip_null_expects);
     }
   }
 }
 
 
 void TestBreakpointHandler(Dart_IsolateId isolate_id,
@@ skipping 1302 matching lines @@
 
   Dart_Handle retval = Invoke("main");
   EXPECT(Dart_IsError(retval));
   EXPECT(Dart_IsUnhandledExceptionError(retval));
   EXPECT_EQ(1, breakpoint_hit_counter);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart