Fix service test breakage

runtime/vm/service_test.cc

 // Copyright (c) 2013, 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 "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/globals.h"
 #include "vm/message_handler.h"
@@ skipping 171 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Get the stacktrace.
   service_msg = Eval(lib, "[port, ['stacktrace'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-      "{\"type\":\"StackTrace\",\"members\":[]}",
+      "{\"type\":\"StackTrace\",\"id\":\"stacktrace\",\"members\":[]}",
       handler.msg());
 
   // Malformed request.
   service_msg = Eval(lib, "[port, ['stacktrace', 'jamboree'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-      "{\"type\":\"Error\",\"text\":\"Command too long\","
-      "\"message\":{\"arguments\":[\"stacktrace\",\"jamboree\"],"
+      "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
+      "\"request\":{\"arguments\":[\"stacktrace\",\"jamboree\"],"
       "\"option_keys\":[],\"option_values\":[]}}",
       handler.msg());
 }
 
 
 TEST_CASE(Service_DebugBreakpoints) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"   // We set breakpoint here.
@@ skipping 38 matching lines @@
        "\"resolved\":false,"
        "\"location\":{\"type\":\"Location\","
                      "\"script\":\"dart:test-lib\",\"tokenPos\":5}}",
       handler.msg());
 
   // Missing sub-command.
   service_msg = Eval(lib, "[port, ['debug'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-      "{\"type\":\"Error\","
-       "\"text\":\"Must specify a subcommand\","
-       "\"message\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
+      "{\"type\":\"Error\",\"id\":\"\","
+       "\"message\":\"Must specify a subcommand\","
+       "\"request\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
                     "\"option_values\":[]}}",
       handler.msg());
 
   // Unrecognized breakpoint.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1111'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\","
-                "\"text\":\"Unrecognized breakpoint id 1111\","
-                "\"message\":{"
+  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
+                "\"message\":\"Unrecognized breakpoint id 1111\","
+                "\"request\":{"
                     "\"arguments\":[\"debug\",\"breakpoints\",\"1111\"],"
                     "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Command too long.
   service_msg =
       Eval(lib, "[port, ['debug', 'breakpoints', '1111', 'green'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\",\"text\":\"Command too long\","
-                "\"message\":{\"arguments\":[\"debug\",\"breakpoints\","
+  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
+                "\"message\":\"Command too long\","
+                "\"request\":{\"arguments\":[\"debug\",\"breakpoints\","
                                             "\"1111\",\"green\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
   // Unrecognized subcommand.
   service_msg = Eval(lib, "[port, ['debug', 'nosferatu'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\","
-                "\"text\":\"Unrecognized subcommand 'nosferatu'\","
-                "\"message\":{\"arguments\":[\"debug\",\"nosferatu\"],"
+  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
+                "\"message\":\"Unrecognized subcommand 'nosferatu'\","
+                "\"request\":{\"arguments\":[\"debug\",\"nosferatu\"],"
                              "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 }
 
 
 TEST_CASE(Service_Classes) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A {\n"
@@ skipping 30 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid class id.
   service_msg = Eval(h_lib, "[port, ['classes', '999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-    "{\"type\":\"Error\",\"text\":\"999999 is not a valid class id.\","
-    "\"message\":{\"arguments\":[\"classes\",\"999999\"],"
+    "{\"type\":\"Error\",\"id\":\"\","
+    "\"message\":\"999999 is not a valid class id.\","
+    "\"request\":{\"arguments\":[\"classes\",\"999999\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // Request the class A over the service.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
   EXPECT_SUBSTRING("\"type\":\"Class\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\",\"name\":\"A\",", cid);
@@ skipping 16 matching lines @@
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/fields\\/0\","
                    "\"name\":\"a\",", cid);
 
   // Invalid sub command.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'huh', '0'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"text\":\"Invalid sub collection huh\",\"message\":"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Invalid sub collection huh\""
+    ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"huh\",\"0\"],\"option_keys\":[],"
     "\"option_values\":[]}}", cid);
 
   // Invalid field request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"text\":\"Field 9 not found\","
-    "\"message\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Field 9 not found\","
+    "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"text\":\"Function 9 not found\","
-    "\"message\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Function 9 not found\","
+    "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
 
   // Invalid field subcommand.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'fields', '9', 'x']"
                              ",[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"text\":\"Command too long\",\"message\":"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
+    "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '9',"
                              "'x'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"text\":\"Command too long\",\"message\":"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
+    "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 }
 
 
 TEST_CASE(Service_Code) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A {\n"
@@ skipping 37 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(h_lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
 
   // Request an invalid code object.
   service_msg = Eval(h_lib, "[port, ['code', '0'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-    "{\"type\":\"Error\",\"text\":\"Could not find code at 0\",\"message\":"
-    "{\"arguments\":[\"code\",\"0\"],"
+    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Could not find code at 0\","
+    "\"request\":{\"arguments\":[\"code\",\"0\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // The following four tests check that a code object can be found
   // inside the range: [code.EntryPoint(), code.EntryPoint() + code.Size()).
   // Request code object at code.EntryPoint()
   // Expect this to succeed as it is inside [entry, entry + size).
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", entry);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
@@ skipping 38 matching lines @@
   // Request code object at code.EntryPoint() + code.Size(). Expect this
   // to fail as it's outside of [entry, entry + size).
   address = last;
   service_msg = EvalF(h_lib, "[port, ['code', '%" Px "'], [], []]", address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     const intptr_t kBufferSize = 1024;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
-        "{\"type\":\"Error\",\"text\":\"Could not find code at %" Px "\","
-        "\"message\":{\"arguments\":[\"code\",\"%" Px "\"],"
+        "{\"type\":\"Error\",\"id\":\"\","
+        "\"message\":\"Could not find code at %" Px "\","
+        "\"request\":{\"arguments\":[\"code\",\"%" Px "\"],"
         "\"option_keys\":[],\"option_values\":[]}}", address, address);
     EXPECT_STREQ(buffer, handler.msg());
   }
 }
 
 
 TEST_CASE(Service_Cpu) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
@@ skipping 191 matching lines @@
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("alpha", handler.msg());
   service_msg = Eval(lib, "[port, ['beta'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("beta", handler.msg());
 }
 
 }  // namespace dart