Change how we provide value previews in the vm service.

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 359 matching lines @@
 
   Instance& service_msg = Instance::Handle();
 
   // null
   service_msg = Eval(lib, "[port, ['objects', 'null'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/null\","
-      "\"preview\":\"null\"}",
+      "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // not initialized
   service_msg = Eval(lib, "[port, ['objects', 'not-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/not-initialized\","
-      "\"preview\":\"<not initialized>\"}",
+      "\"valueAsString\":\"<not initialized>\"}",
       handler.msg());
 
   // being initialized
   service_msg = Eval(lib, "[port, ['objects', 'being-initialized'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/being-initialized\","
-      "\"preview\":\"<being initialized>\"}",
+      "\"valueAsString\":\"<being initialized>\"}",
       handler.msg());
 
   // optimized out
   service_msg = Eval(lib, "[port, ['objects', 'optimized-out'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/optimized-out\","
-      "\"preview\":\"<optimized out>\"}",
+      "\"valueAsString\":\"<optimized out>\"}",
       handler.msg());
 
   // collected
   service_msg = Eval(lib, "[port, ['objects', 'collected'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/collected\","
-      "\"preview\":\"<collected>\"}",
+      "\"valueAsString\":\"<collected>\"}",
       handler.msg());
 
   // expired
   service_msg = Eval(lib, "[port, ['objects', 'expired'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
-      "\"preview\":\"<expired>\"}",
+      "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // bool
   service_msg = Eval(lib, "[port, ['objects', 'bool-true'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Bool\",\"id\":\"objects\\/bool-true\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/46\","
-      "\"user_name\":\"bool\"},\"preview\":\"true\"}",
+      "\"user_name\":\"bool\"},\"valueAsString\":\"true\"}",
       handler.msg());
 
   // int
   service_msg = Eval(lib, "[port, ['objects', 'int-123'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
-      "{\"type\":\"Smi\",\"id\":\"objects\\/int-123\","
+      "{\"type\":\"Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"int\"},\"preview\":\"123\"}",
+      "\"user_name\":\"int\"},"
+      "\"fields\":[],"
+      "\"id\":\"objects\\/int-123\","
+      "\"valueAsString\":\"123\"}",
       handler.msg());
 
   // object id ring / valid
   service_msg = Eval(lib, "[port, ['objects', '$validId'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   handler.filterMsg("size");
+  handler.filterMsg("id");
   EXPECT_STREQ(
       "{\"type\":\"String\","
-      "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/60\","
+      "\"class\":{\"type\":\"@Class\","
       "\"user_name\":\"String\"},\"fields\":[],"
-      "\"id\":\"objects\\/1\",\"preview\":\"\\\"value\\\"\"}",
+      "\"valueAsString\":\"\\\"value\\\"\"}",
       handler.msg());
 
   // object id ring / invalid => expired
   service_msg = Eval(lib, "[port, ['objects', '99999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Null\",\"id\":\"objects\\/expired\","
-      "\"preview\":\"<expired>\"}",
+      "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // expired/eval => error
   service_msg = Eval(lib, "[port, ['objects', 'expired', 'eval'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   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,
                      "[port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['this+99']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
-      "{\"type\":\"@Smi\",\"id\":\"objects\\/int-222\","
+      "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"int\"},\"preview\":\"222\"}",
+      "\"user_name\":\"int\"},"
+      "\"id\":\"objects\\/int-222\","
+      "\"valueAsString\":\"222\"}",
       handler.msg());
 
   // eval returning null works
   service_msg = Eval(lib,
                      "[port, ['objects', 'int-123', 'eval'], "
                      "['expr'], ['null']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
-      "{\"type\":\"@Null\",\"id\":\"objects\\/null\",\"preview\":\"null\"}",
+      "{\"type\":\"@Null\",\"id\":\"objects\\/null\","
+      "\"valueAsString\":\"null\"}",
       handler.msg());
 
   // object id ring / invalid => expired
   service_msg = Eval(lib, "[port, ['objects', '99999999', 'eval'], "
                      "['expr'], ['this']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"Error\",\"id\":\"\",\"kind\":\"EvalExpired\","
@@ skipping 63 matching lines @@
   EXPECT_SUBSTRING("\"url\":\"dart:test-lib\"", handler.msg());
 
   // Evaluate an expression from a library.
   service_msg = EvalF(h_lib,
                       "[port, ['libraries', '%" Pd "', 'eval'], "
                       "['expr'], ['libVar - 1']]", lib_id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
-      "{\"type\":\"@Smi\",\"id\":\"objects\\/int-54320\","
+      "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"int\"},\"preview\":\"54320\"}",
+      "\"user_name\":\"int\"},\"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"
       "  var a;\n"
@@ skipping 51 matching lines @@
                    "\"id\":\"classes\\/%" Pd "\",\"name\":\"A\",", cid);
 
   // Evaluate an expression from class A.
   service_msg = EvalF(h_lib,
                       "[port, ['classes', '%" Pd "', 'eval'], "
                       "['expr'], ['cobra + 100000']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
-      "{\"type\":\"@Smi\",\"id\":\"objects\\/int-111235\","
+      "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"user_name\":\"int\"},\"preview\":\"111235\"}",
+      "\"user_name\":\"int\"},"
+      "\"id\":\"objects\\/int-111235\","
+      "\"valueAsString\":\"111235\"}",
       handler.msg());
 
   // Request function 0 from class A.
   service_msg = EvalF(h_lib, "[port, ['classes', '%" Pd "', 'functions', '0'],"
                               "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Function\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/functions\\/0\","
@@ skipping 638 matching lines @@
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
   service_msg = Eval(h_lib, "[port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 }  // namespace dart