Remove deprecated Expect from the libraries.

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 888 matching lines @@
 
 static Dart_NativeFunction ByteDataNativeResolver(Dart_Handle name,
                                                   int arg_count) {
   return &ByteDataNativeFunction;
 }
 
 
 TEST_CASE(ByteDataAccess) {
   const char* kScriptChars =
       "import 'dart:typeddata';\n"
+      "class Expect {\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
+      "  }\n"
+      "}\n"
       "ByteData createByteData() native 'CreateByteData';"
       "ByteData main() {"
       "  var length = 16;"
       "  var a = createByteData();"
       "  Expect.equals(length, a.lengthInBytes);"
       "  for (int i = 0; i < length; i+=1) {"
       "    a.setInt8(i, 0x42);"
       "  }"
       "  for (int i = 0; i < length; i+=2) {"
       "    Expect.equals(0x4242, a.getInt16(i));"
@@ skipping 35 matching lines @@
                                                           int arg_count) {
   return &ExternalByteDataNativeFunction;
 }
 
 
 TEST_CASE(ExternalByteDataAccess) {
   // TODO(asiva): Once we have getInt16LE and getInt16BE support use the
   // appropriate getter instead of the host endian format used now.
   const char* kScriptChars =
       "import 'dart:typeddata';\n"
+      "class Expect {\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
+      "  }\n"
+      "}\n"
       "ByteData createExternalByteData() native 'CreateExternalByteData';"
       "ByteData main() {"
       "  var length = 16;"
       "  var a = createExternalByteData();"
       "  Expect.equals(length, a.lengthInBytes);"
       "  for (int i = 0; i < length; i+=2) {"
       "    Expect.equals(0x4241, a.getInt16(i));"
       "  }"
       "  for (int i = 0; i < length; i+=2) {"
       "    a.setInt8(i, 0x24);"
@@ skipping 92 matching lines @@
 
   // Invoke the dart function in order to check the modified values.
   result = Dart_Invoke(lib, NewString("testMain"), 1, dart_args);
   EXPECT_VALID(result);
 }
 
 
 TEST_CASE(TypedDataDirectAccess1) {
   const char* kScriptChars =
       "import 'dart:typeddata';\n"
+      "class Expect {\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
+      "  }\n"
+      "}\n"
       "void setMain(var a) {"
       "  for (var i = 0; i < 10; i++) {"
       "    a[i] = i;"
       "  }"
       "}\n"
       "bool testMain(var list) {"
       "  for (var i = 0; i < 10; i++) {"
       "    Expect.equals((10 + i), list[i]);"
       "  }\n"
       "  return true;"
@@ skipping 20 matching lines @@
                                                        data_length,
                                                        NULL, NULL);
   EXPECT_VALID(ext_list_access_test_obj);
   TestDirectAccess(lib, ext_list_access_test_obj, kUint8);
 }
 
 
 TEST_CASE(TypedDataViewDirectAccess) {
   const char* kScriptChars =
       "import 'dart:typeddata';\n"
+      "class Expect {\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
+      "  }\n"
+      "}\n"
       "void setMain(var list) {"
       "  Expect.equals(10, list.length);"
       "  for (var i = 0; i < 10; i++) {"
       "    list[i] = i;"
       "  }"
       "}\n"
       "bool testMain(var list) {"
       "  Expect.equals(10, list.length);"
       "  for (var i = 0; i < 10; i++) {"
       "    Expect.equals((10 + i), list[i]);"
@@ skipping 12 matching lines @@
   Dart_Handle list_access_test_obj;
   list_access_test_obj = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(list_access_test_obj);
   TestDirectAccess(lib, list_access_test_obj, kInt8);
 }
 
 
 TEST_CASE(ByteDataDirectAccess) {
   const char* kScriptChars =
       "import 'dart:typeddata';\n"
+      "class Expect {\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
+      "  }\n"
+      "}\n"
       "void setMain(var list) {"
       "  Expect.equals(10, list.length);"
       "  for (var i = 0; i < 10; i++) {"
       "    list.setInt8(i, i);"
       "  }"
       "}\n"
       "bool testMain(var list) {"
       "  Expect.equals(10, list.length);"
       "  for (var i = 0; i < 10; i++) {"
       "    Expect.equals((10 + i), list.getInt8(i));"
@@ skipping 5484 matching lines @@
       "  int bar31(int i) { var func = foo3; return func(i); }\n"
       "  int bar32(int i, int j) { var func = foo3; return func(i, j); }\n"
       "  int bar41(int i) {\n"
       "    var func = foo4; return func(i); }\n"
       "  int bar42(int i, int j) {\n"
       "    var func = foo4; return func(i, j); }\n"
       "  int bar43(int i, int j, int k) {\n"
       "    var func = foo4; return func(i, j, k); }\n"
       "}\n"
       "class Expect {\n"
-      "  static void equals(x, y) {\n"
-      "    if (x != y) throw new Error('not equal');\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
       "  }\n"
       "}\n"
       "int testMain() {\n"
       "  Test obj = new Test();\n"
       "  Expect.equals(1, obj.foo1());\n"
       "  Expect.equals(1, obj.bar1());\n"
       "\n"
       "  Expect.equals(10, obj.foo2(10));\n"
       "  Expect.equals(10, obj.bar2(10));\n"
       "\n"
@@ skipping 121 matching lines @@
       "  int bar31(int i) { var func = foo3; return func(i); }\n"
       "  int bar32(int i, int j) { var func = foo3; return func(i, j); }\n"
       "  int bar41(int i) {\n"
       "    var func = foo4; return func(i); }\n"
       "  int bar42(int i, int j) {\n"
       "    var func = foo4; return func(i, j); }\n"
       "  int bar43(int i, int j, int k) {\n"
       "    var func = foo4; return func(i, j, k); }\n"
       "}\n"
       "class Expect {\n"
-      "  static void equals(x, y) {\n"
-      "    if (x != y) throw new Error('not equal');\n"
+      "  static equals(a, b) {\n"
+      "    if (a != b) {\n"
+      "      throw new Exception('not equal. expected: $a, got: $b');\n"
+      "    }\n"
       "  }\n"
       "}\n"
       "int testMain() {\n"
       "  Test obj = new Test();\n"
       "  Expect.equals(0, Test.foo1());\n"
       "  Expect.equals(0, obj.bar1());\n"
       "\n"
       "  Expect.equals(10, Test.foo2(10));\n"
       "  Expect.equals(10, obj.bar2(10));\n"
       "\n"
@@ skipping 742 matching lines @@
                                    NULL);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(260, value);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart