Improvements to NoSuchMethodError.toString

runtime/vm/isolate_reload_test.cc

 // Copyright (c) 2016, 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 "include/dart_tools_api.h"
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
@@ skipping 1518 matching lines @@
       "  var c = new C();\n"
       "  var f = c#y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("4 Class 'C' has no instance getter 'y'.",
+  EXPECT_STREQ("4 NoSuchMethodError: Class 'C' has no instance getter 'y'.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_DanglingGetter_Class) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
@@ skipping 38 matching lines @@
       "  C.y = 4;\n"
       "  var f = C#y;\n"
       "  var r1 = invoke(f);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("4 No static getter 'y' declared in class 'C'.",
-               SimpleInvokeStr(lib, "main"));
+  EXPECT_STREQ("4 NoSuchMethodError: No static getter 'y' declared "
+               "in class 'C'.", SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 static void IsolateReload_DanlingGetter_LibraryReload(
     Dart_NativeArguments native_args) {
   const char* kImportScript2 =
     "var x;\n";
@@ skipping 36 matching lines @@
       "  var r2 = invoke(f);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(
       kScript, IsolateReload_DanlingGetter_LibraryNativeResolver);
   EXPECT_VALID(lib);
 
   TestCase::SetReloadTestScript(kScript);  // Root library does not change.
 
-  EXPECT_STREQ("4 No top-level getter 'y' declared.",
+  EXPECT_STREQ("4 NoSuchMethodError: No top-level getter 'y' declared.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_DanglingSetter_Instance) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
@@ skipping 36 matching lines @@
       "  var c = new C();\n"
       "  var f = c#y=;\n"
       "  var r1 = invoke(f, 5);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("null Class 'C' has no instance setter 'y='.",
+  EXPECT_STREQ("null NoSuchMethodError: Class 'C' has no instance setter 'y='.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_DanglingSetter_Class) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
@@ skipping 38 matching lines @@
       "  C.y = 4;\n"
       "  var f = C#y=;\n"
       "  var r1 = invoke(f, 5);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("5 No static setter 'y=' declared in class 'C'.",
-               SimpleInvokeStr(lib, "main"));
+  EXPECT_STREQ("5 NoSuchMethodError: No static setter 'y=' declared in "
+               "class 'C'.", SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 static void IsolateReload_DanlingSetter_LibraryReload(
     Dart_NativeArguments native_args) {
   const char* kImportScript2 =
     "var x;\n";
@@ skipping 36 matching lines @@
       "  var r2 = invoke(f, 6);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(
       kScript, IsolateReload_DanlingSetter_LibraryNativeResolver);
   EXPECT_VALID(lib);
 
   TestCase::SetReloadTestScript(kScript);  // Root library does not change.
 
-  EXPECT_STREQ("5 No top-level setter 'y=' declared.",
+  EXPECT_STREQ("5 NoSuchMethodError: No top-level setter 'y=' declared.",
                SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_TearOff_AddArguments) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
@@ skipping 35 matching lines @@
       "  var c = new C();\n"
       "  var f = c#foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("1 Class 'C' has no instance method 'foo' with matching"
-               " arguments.", SimpleInvokeStr(lib, "main"));
+  EXPECT_STREQ("1 NoSuchMethodError: Class 'C' has no instance method "
+               "'foo' with matching arguments.", SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_TearOff_AddArguments2) {
   const char* kScript =
       "import 'test:isolate_reload_helper';\n"
       "class C {\n"
@@ skipping 32 matching lines @@
       "main() {\n"
       "  var f = C#foo;\n"
       "  var r1 = invoke(f, 1);\n"
       "  reloadTest();\n"
       "  var r2 = invoke(f, 1);\n"
       "  return '$r1 $r2';\n"
       "}\n";
 
   TestCase::SetReloadTestScript(kReloadScript);
 
-  EXPECT_STREQ("1 Closure call with mismatched arguments: function 'C.foo'",
-               SimpleInvokeStr(lib, "main"));
+  EXPECT_STREQ("1 NoSuchMethodError: Closure call with mismatched arguments: "
+               "function 'C.foo'", SimpleInvokeStr(lib, "main"));
 
   lib = TestCase::GetReloadErrorOrRootLibrary();
   EXPECT_VALID(lib);
 }
 
 
 TEST_CASE(IsolateReload_EnumEquality) {
   const char* kScript =
       "enum Fruit {\n"
       "  Apple,\n"
@@ skipping 1127 matching lines @@
   EXPECT_VALID(lib);
   Dart_SetFileModifiedCallback(NULL);
 
   // Modification of an exported library propagates.
   EXPECT_STREQ("bossy pants", SimpleInvokeStr(lib, "main"));
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart