vmservice protocol cleanup

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 "platform/globals.h"
 
 #include "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 274 matching lines @@
                       vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
       "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
       "\"location\":{\"type\":\"Location\","
       "\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+      "\"name\":\"test-lib\",\"kind\":\"script\"},"
       "\"tokenPos\":5}}",
       vmlib.index());
 
   // Get the breakpoint list.
   service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"BreakpointList\",\"id\":\"debug\\/breakpoints\","
       "\"breakpoints\":["
       "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
       "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
       "\"location\":{\"type\":\"Location\","
       "\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+      "\"name\":\"test-lib\",\"kind\":\"script\"},"
       "\"tokenPos\":5}}]}",
       vmlib.index());
 
   // Lookup individual breakpoint.
   service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints', '1'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
       "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
       "\"location\":{\"type\":\"Location\","
       "\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+      "\"name\":\"test-lib\",\"kind\":\"script\"},"
       "\"tokenPos\":5}}",
       vmlib.index());
 
   // Unrecognized breakpoint subcommand.
   service_msg =
       Eval(lib, "[0, port, ['debug', 'breakpoints', '1', 'green'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
                 "\"message\":\"Unrecognized subcommand: green\","
@@ skipping 123 matching lines @@
                       vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
       "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
       "\"location\":{\"type\":\"Location\","
       "\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+      "\"name\":\"test-lib\",\"kind\":\"script\"},"
       "\"tokenPos\":11}}",
       vmlib.index());
 
   pause_line_number = -1;
   Dart_SetPausedEventHandler(HandlePausedEvent);
 
   // Run the program.
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 
@@ skipping 33 matching lines @@
   Dart_Handle valid_id = Dart_NewInteger(arr_id);
   EXPECT_VALID(valid_id);
   EXPECT_VALID(Dart_SetField(lib, NewString("validId"), valid_id));
 
   Array& service_msg = Array::Handle();
 
   // null
   service_msg = Eval(lib, "[0, port, ['objects', 'null'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/null\","
       "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // not initialized
   service_msg = Eval(lib, "[0, port, ['objects', 'not-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/not-initialized\","
       "\"valueAsString\":\"<not initialized>\"}",
       handler.msg());
 
   // being initialized
   service_msg = Eval(lib,
                      "[0, port, ['objects', 'being-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/being-initialized\","
       "\"valueAsString\":\"<being initialized>\"}",
       handler.msg());
 
   // optimized out
   service_msg = Eval(lib, "[0, port, ['objects', 'optimized-out'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/optimized-out\","
       "\"valueAsString\":\"<optimized out>\"}",
       handler.msg());
 
   // collected
   service_msg = Eval(lib, "[0, port, ['objects', 'collected'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/collected\","
       "\"valueAsString\":\"<collected>\"}",
       handler.msg());
 
   // expired
   service_msg = Eval(lib, "[0, port, ['objects', 'expired'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // bool
   service_msg = Eval(lib, "[0, port, ['objects', 'bool-true'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Bool\",\"id\":\"objects\\/bool-true\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/46\","
-      "\"user_name\":\"bool\"},\"valueAsString\":\"true\"}",
+      "\"name\":\"bool\"},\"valueAsString\":\"true\"}",
       handler.msg());
 
   // int
   service_msg = Eval(lib, "[0, port, ['objects', 'int-123'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"_Smi\"},"
+      "\"name\":\"_Smi\",},"
       "\"fields\":[],"
       "\"id\":\"objects\\/int-123\","
       "\"valueAsString\":\"123\"}",
       handler.msg());
 
   // object id ring / valid
   service_msg = Eval(lib, "[0, port, ['objects', '$validId'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   handler.filterMsg("size");
   handler.filterMsg("id");
   EXPECT_STREQ(
       "{\"type\":\"Array\","
-      "\"class\":{\"type\":\"@Class\",\"user_name\":\"_List\"},"
+      "\"class\":{\"type\":\"@Class\",\"name\":\"_List\",},"
       "\"fields\":[],"
       "\"length\":1,"
       "\"elements\":[{"
           "\"index\":0,"
           "\"value\":{\"type\":\"@String\","
-          "\"class\":{\"type\":\"@Class\",\"user_name\":\"_OneByteString\"},"
+          "\"class\":{\"type\":\"@Class\",\"name\":\"_OneByteString\",},"
           "\"valueAsString\":\"\\\"value\\\"\"}}]}",
       handler.msg());
 
   // object id ring / invalid => expired
   service_msg = Eval(lib, "[0, port, ['objects', '99999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // expired/eval => error
   service_msg = Eval(lib, "[0, port, ['objects', 'expired', 'eval'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
       "\"message\":\"expected at most 2 arguments but found 3\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"expired\",\"eval\"],"
       "\"option_keys\":[],\"option_values\":[]}}",
       handler.msg());
 
   // int/eval => good
   service_msg = Eval(lib,
                      "[0, port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['this+99']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"_Smi\"},"
+      "\"name\":\"_Smi\",},"
       "\"id\":\"objects\\/int-222\","
       "\"valueAsString\":\"222\"}",
       handler.msg());
 
   // eval returning null works
   service_msg = Eval(lib,
                      "[0, port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['null']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"@Null\",\"id\":\"objects\\/null\","
       "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // object id ring / invalid => expired
   service_msg = Eval(lib, "[0, port, ['objects', '99999999', 'eval'], "
                      "['expr'], ['this']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\",\"kind\":\"EvalExpired\","
       "\"message\":\"attempt to evaluate against expired object\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"99999999\",\"eval\"],"
       "\"option_keys\":[\"expr\"],\"option_values\":[\"this\"]}}",
       handler.msg());
 
   // Extra arg to eval.
   service_msg = Eval(lib,
                      "[0, port, ['objects', 'int-123', 'eval', 'foo'], "
                      "['expr'], ['this+99']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\","
       "\"message\":\"expected at most 3 arguments but found 4\\n\","
       "\"request\":{\"arguments\":[\"objects\",\"int-123\",\"eval\",\"foo\"],"
       "\"option_keys\":[\"expr\"],\"option_values\":[\"this+99\"]}}",
       handler.msg());
 
   // Retained by single instance.
   service_msg = Eval(lib,
                      "[0, port, ['objects', '$validId', 'retained'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"objects\\/int-%" Pd "\"",
                    arr.raw()->Size() + arr.At(0)->Size());
 
   // Retaining path to 'arr', limit 1.
   service_msg = Eval(
       lib,
       "[0, port, ['objects', '$validId', 'retaining_path'], ['limit'], ['1']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
@@ skipping 172 matching lines @@
   EXPECT_SUBSTRING("\"type\":\"Library\"", handler.msg());
   EXPECT_SUBSTRING("\"url\":\"test-lib\"", handler.msg());
 
   // Evaluate an expression from a library.
   service_msg = EvalF(lib,
                       "[0, port, ['libraries', '%" Pd "', 'eval'], "
                       "['expr'], ['libVar - 1']]",
                       vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"_Smi\"},\"id\":\"objects\\/int-54320\","
+      "\"name\":\"_Smi\",},\"id\":\"objects\\/int-54320\","
       "\"valueAsString\":\"54320\"}",
       handler.msg());
 }
 
 
 TEST_CASE(Service_Classes) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A {\n"
@@ skipping 54 matching lines @@
   ExpectSubstringF(handler.msg(), "\"allocationStats\":");
   ExpectSubstringF(handler.msg(), "\"tokenPos\":");
   ExpectSubstringF(handler.msg(), "\"endTokenPos\":");
 
   // Evaluate an expression from class A.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'eval'], "
                       "['expr'], ['cobra + 100000']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  handler.filterMsg("name");
+  handler.filterMsg("vmName");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"_Smi\"},"
+      "\"name\":\"_Smi\",},"
       "\"id\":\"objects\\/int-111235\","
       "\"valueAsString\":\"111235\"}",
       handler.msg());
 
   // Request function 'b' from class A.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', 'b'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
@@ skipping 450 matching lines @@
   OS::SNPrint(buf, sizeof(buf),
       "[0, port, ['libraries', '%" Pd "', 'scripts', 'test-lib'], [], []]",
       vmlib.index());
 
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
       "{\"type\":\"Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+      "\"name\":\"test-lib\","
       "\"kind\":\"script\","
       "\"owning_library\":{\"type\":\"@Library\","
-      "\"id\":\"libraries\\/%" Pd "\",\"user_name\":\"\",\"name\":\"\","
+      "\"id\":\"libraries\\/%" Pd "\",\"name\":\"\","
       "\"url\":\"test-lib\"},"
       "\"source\":\"var port;\\n\\nmain() {\\n}\","
       "\"tokenPosTable\":[[1,0,1,1,5,2,9],[3,5,1,6,5,7,6,8,8],[4,10,1]]}",
       vmlib.index(), vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 
 // TODO(zra): Remove when tests are ready to enable.
 #if !defined(TARGET_ARCH_ARM64)
@@ skipping 26 matching lines @@
 
   Array& service_msg = Array::Handle();
   service_msg = Eval(lib, "[0, port, ['coverage'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
   char buf[1024];
   OS::SNPrint(buf, sizeof(buf),
               "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
               "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+              "\"name\":\"test-lib\","
               "\"kind\":\"script\"},\"hits\":"
               "[5,1,6,1]}",
               vmlib.index());
   EXPECT_SUBSTRING(buf, handler.msg());
 }
 
 
 TEST_CASE(Service_LibrariesScriptsCoverage) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 27 matching lines @@
       "[], []]",
       vmlib.index());
 
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
       "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
       "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+      "\"name\":\"test-lib\","
       "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}", vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 
 TEST_CASE(Service_LibrariesCoverage) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "var x = 7;\n"
@@ skipping 24 matching lines @@
               vmlib.index());
 
   Array& service_msg = Array::Handle();
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
               "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
               "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
               "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+              "\"name\":\"test-lib\","
               "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}",
               vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 
 TEST_CASE(Service_ClassesCoverage) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
@@ skipping 43 matching lines @@
               "[0, port, ['classes', '%" Pd "', 'coverage'], [], []]", i);
 
   Array& service_msg = Array::Handle();
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
               "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
               "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
               "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+              "\"name\":\"test-lib\","
               "\"kind\":\"script\"},\"hits\":[5,1,7,4,8,3]}]}",
               vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 
 TEST_CASE(Service_ClassesFunctionsCoverage) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
@@ skipping 51 matching lines @@
               "'bar', 'coverage'], [], []]", i);
 
   Array& service_msg = Array::Handle();
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
       "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
       "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+      "\"name\":\"test-lib\","
       "\"kind\":\"script\"},\"hits\":[7,4,8,3]}]}", vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 #endif
 
 
 TEST_CASE(Service_AllocationProfile) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 280 matching lines @@
   service_msg = Eval(lib, "[0, port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart