Change EXPECT(!Dart_IsError(...)) to EXPECT_VALID(...) in VM tests.

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/json.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 15 matching lines @@
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   Dart_Handle instance = Dart_True();
   Dart_Handle error = Api::NewError("myerror");
   Dart_Handle exception = Dart_Invoke(lib,
                                       Dart_NewString("testMain"),
                                       0,
                                       NULL);
 
-  EXPECT(!Dart_IsError(instance));
+  EXPECT_VALID(instance);
   EXPECT(Dart_IsError(error));
   EXPECT(Dart_IsError(exception));
 
   EXPECT(!Dart_ErrorHasException(instance));
   EXPECT(!Dart_ErrorHasException(error));
   EXPECT(Dart_ErrorHasException(exception));
 
   EXPECT_STREQ("", Dart_GetError(instance));
   EXPECT_STREQ("myerror", Dart_GetError(error));
   EXPECT_STREQ(
@@ skipping 19 matching lines @@
 
   Dart_Handle not_error = Dart_NewString("NotError");
   Dart_Handle api_error = Dart_NewApiError("Api%s", "Error");
   Dart_Handle exception_error =
       Dart_NewUnhandledExceptionError(Dart_NewString("ExceptionError"));
   Dart_Handle compile_error =
       Api::NewHandle(isolate, LanguageError::New(compile_message));
   Dart_Handle fatal_error =
       Api::NewHandle(isolate, UnwindError::New(fatal_message));
 
-  EXPECT(!Dart_IsError(not_error));
+  EXPECT_VALID(not_error);
   EXPECT(Dart_IsError(api_error));
   EXPECT(Dart_IsError(exception_error));
   EXPECT(Dart_IsError(compile_error));
   EXPECT(Dart_IsError(fatal_error));
 
   EXPECT(!Dart_IsApiError(not_error));
   EXPECT(Dart_IsApiError(api_error));
   EXPECT(!Dart_IsApiError(exception_error));
   EXPECT(!Dart_IsApiError(compile_error));
   EXPECT(!Dart_IsApiError(fatal_error));
@@ skipping 4801 matching lines @@
   intptr_t length = (sizeof(var_mapping) / sizeof(var_mapping[0]));
   Dart_Handle import_map = Dart_NewList(length);
   for (intptr_t i = 0; i < length; i++) {
     Dart_ListSetAt(import_map, i, Dart_NewString(var_mapping[i]));
   }
   Dart_Handle result = Dart_SetLibraryTagHandler(import_library_handler);
   EXPECT_VALID(result);
   result = Dart_SetImportMap(import_map);
   EXPECT_VALID(result);
   result = Dart_LoadScript(url, source);
-  EXPECT(!Dart_IsError(result));
+  EXPECT_VALID(result);
 }
 
 
 TEST_CASE(LoadImportScriptError1) {
   const char* kScriptChars =
       "#import('abc${DEF}def/extra_weird.dart');"
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
@@ skipping 1289 matching lines @@
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
 
   // The shutdown callback has been called.
   EXPECT_EQ(12345, reinterpret_cast<intptr_t>(saved_callback_data));
 
   Isolate::SetShutdownCallback(saved);
 }
 
 static int64_t GetValue(Dart_Handle arg) {
-  EXPECT(!Dart_IsError(arg));
+  EXPECT_VALID(arg);
   EXPECT(Dart_IsInteger(arg));
   int64_t value;
   EXPECT_VALID(Dart_IntegerToInt64(arg, &value));
   return value;
 }
 
 static void NativeFoo1(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t i = Dart_GetNativeArgumentCount(args);
   EXPECT_EQ(1, i);
   Dart_Handle arg = Dart_GetNativeArgument(args, 0);
-  EXPECT(!Dart_IsError(arg));
+  EXPECT_VALID(arg);
   Dart_SetReturnValue(args, Dart_NewInteger(1));
   Dart_ExitScope();
 }
 
 
 static void NativeFoo2(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t i = Dart_GetNativeArgumentCount(args);
   EXPECT_EQ(2, i);
   Dart_Handle arg = Dart_GetNativeArgument(args, 1);
@@ skipping 302 matching lines @@
   EXPECT(Dart_IsString(str));
   len = -1;
   EXPECT_VALID(Dart_StringLength(str, &len));
   EXPECT_EQ(0, len);
 }
 
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart