Fix a variety of service protocol bugs.

runtime/vm/object_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 "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 4211 matching lines @@
   ObjectAccumulator acc(&objects);
   heap->IterateObjects(&acc);
   for (intptr_t i = 0; i < objects.length(); ++i) {
     JSONStream js;
     objects[i]->PrintJSON(&js, false);
     EXPECT_SUBSTRING("\"type\":", js.ToCString());
   }
 }
 
 
-// Elide a substring which starts with some prefix and ends with a ".
-//
-// This is used to remove non-deterministic or fragile substrings from
-// JSON output.
-//
-// For example:
-//
-//    prefix = "classes"
-//    in = "\"id\":\"classes/46\""
-//
-// Yields:
-//
-//    out = "\"id\":\"\""
-//
-static void elideSubstring(const char* prefix, const char* in, char* out) {
-  const char* pos = strstr(in, prefix);
-  while (pos != NULL) {
-    // Copy up to pos into the output buffer.
-    while (in < pos) {
-      *out++ = *in++;
-    }
-
-    // Skip to the close quote.
-    in += strcspn(in, "\"");
-    pos = strstr(in, prefix);
-  }
-  // Copy the remainder of in to out.
-  while (*in != '\0') {
-    *out++ = *in++;
-  }
-  *out = '\0';
-}
-
-
 TEST_CASE(PrintJSONPrimitives) {
   char buffer[1024];
   Isolate* isolate = Isolate::Current();
 
   // Class reference
   {
     JSONStream js;
     Class& cls = Class::Handle(isolate->object_store()->bool_class());
     cls.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\",\"name\":\"bool\"}",
         buffer);
   }
   // Function reference
   {
     JSONStream js;
     Class& cls = Class::Handle(isolate->object_store()->bool_class());
     const String& func_name = String::Handle(String::New("toString"));
     Function& func = Function::Handle(cls.LookupFunction(func_name));
     ASSERT(!func.IsNull());
     func.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Function\",\"fixedId\":true,"
         "\"id\":\"\",\"name\":\"toString\","
         "\"owner\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"bool\"},"
         "\"_kind\":\"RegularFunction\","
         "\"static\":false,\"const\":false}",
         buffer);
   }
   // Library reference
   {
     JSONStream js;
     Library& lib = Library::Handle(isolate->object_store()->core_library());
     lib.PrintJSON(&js, true);
-    elideSubstring("libraries", js.ToCString(), buffer);
+    ElideJSONSubstring("libraries", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Library\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"dart.core\",\"uri\":\"dart:core\"}",
         buffer);
   }
   // Bool reference
   {
     JSONStream js;
     Bool::True().PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Bool\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"bool\"},"
         "\"kind\":\"Bool\","
         "\"fixedId\":true,"
         "\"id\":\"objects\\/bool-true\",\"valueAsString\":\"true\"}",
         buffer);
   }
   // Smi reference
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(7));
     smi.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("_Smi@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("_Smi@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Smi\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_Smi\","
         "\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"fixedId\":true,"
         "\"id\":\"objects\\/int-7\",\"valueAsString\":\"7\"}",
         buffer);
   }
   // Mint reference
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(Mint::kMinValue));
     smi.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_Mint@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_Mint@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Mint\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_Mint\",\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"id\":\"\",\"valueAsString\":\"-9223372036854775808\"}",
         buffer);
   }
   // Bigint reference
   {
     JSONStream js;
     const String& bigint_str =
         String::Handle(String::New("44444444444444444444444444444444"));
     const Integer& bigint = Integer::Handle(Integer::New(bigint_str));
     bigint.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_Bigint@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_Bigint@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Bigint\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_Bigint\",\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"id\":\"\",\"valueAsString\":\"44444444444444444444444444444444\"}",
         buffer);
   }
   // Double reference
   {
     JSONStream js;
     const Double& dub = Double::Handle(Double::New(0.1234));
     dub.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_Double@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_Double@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Double\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_Double\",\"_vmName\":\"\"},"
         "\"kind\":\"Double\","
         "\"id\":\"\",\"valueAsString\":\"0.1234\"}",
         buffer);
   }
   // String reference
   {
     JSONStream js;
     const String& str = String::Handle(String::New("dw"));
     str.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_OneByteString@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_OneByteString@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"String\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_OneByteString\",\"_vmName\":\"\"},"
         "\"kind\":\"String\","
         "\"id\":\"\",\"valueAsString\":\"dw\"}",
         buffer);
   }
   // Array reference
   {
     JSONStream js;
     const Array& array = Array::Handle(Array::New(0));
     array.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_List@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_List@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Array\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_List\",\"_vmName\":\"\"},"
         "\"kind\":\"List\","
         "\"id\":\"\",\"length\":0}",
         buffer);
   }
   // GrowableObjectArray reference
   {
     JSONStream js;
     const GrowableObjectArray& array =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     array.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_GrowableList@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_GrowableList@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"GrowableObjectArray\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_GrowableList\","
         "\"_vmName\":\"\"},"
         "\"kind\":\"List\","
         "\"id\":\"\",\"length\":0}",
         buffer);
   }
   // LinkedHashMap reference
   {
     JSONStream js;
     const LinkedHashMap& array =
         LinkedHashMap::Handle(LinkedHashMap::NewDefault());
     array.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_InternalLinkedHashMap@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_InternalLinkedHashMap@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"LinkedHashMap\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_InternalLinkedHashMap\",\"_vmName\":\"\"},"
         "\"kind\":\"Map\","
         "\"id\":\"\","
         "\"length\":0}",
         buffer);
   }
   // UserTag reference
   {
     JSONStream js;
     Instance& tag = Instance::Handle(isolate->default_tag());
     tag.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_UserTag@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_UserTag@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"UserTag\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_UserTag\",\"_vmName\":\"\"},"
         "\"kind\":\"PlainInstance\","
         "\"id\":\"\"}",
         buffer);
   }
   // Type reference
   // TODO(turnidge): Add in all of the other Type siblings.
   {
     JSONStream js;
     Instance& type = Instance::Handle(isolate->object_store()->bool_type());
     type.PrintJSON(&js, true);
-    elideSubstring("classes", js.ToCString(), buffer);
-    elideSubstring("objects", buffer, buffer);
-    elideSubstring("_Type@", buffer, buffer);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", buffer, buffer);
+    ElideJSONSubstring("_Type@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Type\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"_Type\",\"_vmName\":\"\"},"
         "\"kind\":\"Type\","
         "\"fixedId\":true,\"id\":\"\","
         "\"typeClass\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"bool\"},\"name\":\"bool\"}",
         buffer);
   }
   // Null reference
   {
     JSONStream js;
     Object::null_object().PrintJSON(&js, true);
+    ElideJSONSubstring("classes", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"null\","
+        "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
+        "\"name\":\"Null\"},"
         "\"kind\":\"Null\","
         "\"fixedId\":true,"
         "\"id\":\"objects\\/null\","
         "\"valueAsString\":\"null\"}",
-        js.ToCString());
+        buffer);
   }
   // Sentinel reference
   {
     JSONStream js;
     Object::sentinel().PrintJSON(&js, true);
     EXPECT_STREQ(
         "{\"type\":\"Sentinel\","
         "\"kind\":\"NotInitialized\","
         "\"valueAsString\":\"<not initialized>\"}",
         js.ToCString());
   }
   // Transition sentinel reference
   {
     JSONStream js;
     Object::transition_sentinel().PrintJSON(&js, true);
     EXPECT_STREQ(
         "{\"type\":\"Sentinel\","
         "\"kind\":\"BeingInitialized\","
         "\"valueAsString\":\"<being initialized>\"}",
         js.ToCString());
   }
   // LiteralToken reference.  This is meant to be an example of a
   // "weird" type that isn't usually returned by the VM Service except
   // when we are doing direct heap inspection.
   {
     JSONStream js;
     LiteralToken& tok = LiteralToken::Handle(LiteralToken::New());
     tok.PrintJSON(&js, true);
-    elideSubstring("objects", js.ToCString(), buffer);
+    ElideJSONSubstring("objects", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Object\",\"_vmType\":\"LiteralToken\",\"id\":\"\"}",
         buffer);
   }
 }
 
 
 TEST_CASE(InstanceEquality) {
   // Test that Instance::OperatorEquals can call a user-defined operator==.
   const char* kScript =
@@ skipping 228 matching lines @@
   {
     const String& empty = String::Handle(String::New(""));
     const String* data[3] = { &Symbols::FallThroughError(),
                               &empty,
                               &Symbols::isPaused() };
     CheckConcatAll(data, 3);
   }
 }
 
 }  // namespace dart