Kill service_test.cc tests in favor of dart tests for the service protocol.

runtime/vm/service.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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 1585 matching lines @@
   intptr_t count = visitor.count();
   if (count < limit) {
     // Truncate the list using utility method for GrowableObjectArray.
     GrowableObjectArray& wrapper = GrowableObjectArray::Handle(
         GrowableObjectArray::New(storage));
     wrapper.SetLength(count);
     storage = Array::MakeArray(wrapper);
   }
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "InstanceSet");
-  jsobj.AddProperty("id", "instance_set");
   jsobj.AddProperty("totalCount", count);
-  jsobj.AddProperty("sampleCount", storage.Length());
-  jsobj.AddProperty("sample", storage);
+  {
+    JSONArray samples(&jsobj, "samples");
+    for (int i = 0; i < storage.Length(); i++) {
+      const Object& sample = Object::Handle(storage.At(i));
+      samples.AddValue(Instance::Cast(sample));
+    }
+  }
   return true;
 }
 
 
 class LibraryCoverageFilter : public CoverageFilter {
  public:
   explicit LibraryCoverageFilter(const Library& lib) : lib_(lib) {}
   bool ShouldOutputCoverageFor(const Library& lib,
                                const Script& script,
                                const Class& cls,
@@ skipping 184 matching lines @@
   if (bpt == NULL) {
     fprintf(stderr, "ERROR1");
     PrintInvalidParamError(js, "breakpointId");
     return true;
   }
   isolate->debugger()->RemoveBreakpoint(bpt->id());
 
   // TODO(turnidge): Consider whether the 'Success' type is proper.
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Success");
-  jsobj.AddProperty("id", "");
   return true;
 }
 
 
 static RawClass* GetMetricsClass(Isolate* isolate) {
   const Library& prof_lib =
       Library::Handle(isolate, Library::ProfilerLibrary());
   ASSERT(!prof_lib.IsNull());
   const String& metrics_cls_name =
       String::Handle(isolate, String::New("Metrics"));
@@ skipping 177 matching lines @@
   NULL,
 };
 
 
 static bool Resume(Isolate* isolate, JSONStream* js) {
   const char* step_param = js->LookupParam("step");
   if (isolate->message_handler()->paused_on_start()) {
     isolate->message_handler()->set_pause_on_start(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
-    jsobj.AddProperty("id", "");
     {
       ServiceEvent event(isolate, ServiceEvent::kResume);
       Service::HandleEvent(&event);
     }
     return true;
   }
   if (isolate->message_handler()->paused_on_exit()) {
     isolate->message_handler()->set_pause_on_exit(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
-    jsobj.AddProperty("id", "");
     // We don't send a resume event because we will be exiting.
     return true;
   }
   if (isolate->debugger()->PauseEvent() != NULL) {
     if (step_param != NULL) {
       if (strcmp(step_param, "into") == 0) {
         isolate->debugger()->SetSingleStep();
       } else if (strcmp(step_param, "over") == 0) {
         isolate->debugger()->SetStepOver();
       } else if (strcmp(step_param, "out") == 0) {
         isolate->debugger()->SetStepOut();
       } else {
         PrintInvalidParamError(js, "step");
         return true;
       }
     }
     isolate->Resume();
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
-    jsobj.AddProperty("id", "");
     return true;
   }
 
   PrintError(js, "VM was not paused");
   return true;
 }
 
 
 static const MethodParameter* pause_params[] = {
   ISOLATE_PARAMETER,
   NULL,
 };
 
 
 static bool Pause(Isolate* isolate, JSONStream* js) {
   // TODO(turnidge): Don't double-interrupt the isolate here.
   isolate->ScheduleInterrupts(Isolate::kApiInterrupt);
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Success");
-  jsobj.AddProperty("id", "");
   return true;
 }
 
 
 static const MethodParameter* get_tag_profile_params[] = {
   ISOLATE_PARAMETER,
   NULL,
 };
 
 
@@ skipping 179 matching lines @@
     PrintInvalidParamError(js, "address");
     return true;
   }
   bool ref = js->HasParam("ref") && js->ParamIs("ref", "true");
   Object& object = Object::Handle(isolate);
   {
     NoSafepointScope no_safepoint;
     ContainsAddressVisitor visitor(isolate, addr);
     object = isolate->heap()->FindObject(&visitor);
   }
-  object.PrintJSON(js, ref);
+  if (object.IsNull()) {
+    PrintSentinel(js, "objects/free", "<free>");
+  } else {
+    object.PrintJSON(js, ref);
+  }
   return true;
 }
 
 
 static bool _RespondWithMalformedJson(Isolate* isolate,
                                       JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("a", "a");
   JSONObject jsobj1(js);
   jsobj1.AddProperty("a", "a");
@@ skipping 180 matching lines @@
   }
   const char* flag_value = js->LookupParam("value");
   if (flag_value == NULL) {
     PrintMissingParamError(js, "value");
     return true;
   }
   JSONObject jsobj(js);
   const char* error = NULL;
   if (Flags::SetFlag(flag_name, flag_value, &error)) {
     jsobj.AddProperty("type", "Success");
-    jsobj.AddProperty("id", "");
     return true;
   } else {
-    jsobj.AddProperty("type", "Failure");
-    jsobj.AddProperty("id", "");
+    jsobj.AddProperty("type", "Error");
     jsobj.AddProperty("message", error);
     return true;
   }
 }
 
 
 static const MethodParameter* set_name_params[] = {
   ISOLATE_PARAMETER,
   new MethodParameter("name", true),
   NULL,
@@ skipping 24 matching lines @@
   { "addBreakpoint", AddBreakpoint,
     add_breakpoint_params },
   { "addBreakpointAtEntry", AddBreakpointAtEntry,
     add_breakpoint_at_entry_params },
   { "clearCpuProfile", ClearCpuProfile,
     clear_cpu_profile_params },
   { "eval", Eval,
     eval_params },
   { "evalFrame", EvalFrame,
     eval_frame_params },
-  { "getAllocationProfile", GetAllocationProfile,
+  { "_getAllocationProfile", GetAllocationProfile,
     get_allocation_profile_params },
   { "_getCallSiteData", GetCallSiteData,
     get_call_site_data_params },
   { "getClassList", GetClassList,
     get_class_list_params },
   { "getCoverage", GetCoverage,
     get_coverage_params },
   { "getCpuProfile", GetCpuProfile,
     get_cpu_profile_params },
   { "getFlagList", GetFlagList ,
     get_flag_list_params },
   { "getHeapMap", GetHeapMap,
     get_heap_map_params },
-  { "getInboundReferences", GetInboundReferences,
+  { "_getInboundReferences", GetInboundReferences,
     get_inbound_references_params },
-  { "getInstances", GetInstances,
+  { "_getInstances", GetInstances,
     get_instances_params },
   { "getIsolate", GetIsolate,
     get_isolate_params },
   { "getIsolateMetric", GetIsolateMetric,
     get_isolate_metric_params },
   { "getIsolateMetricList", GetIsolateMetricList,
     get_isolate_metric_list_params },
   { "getObject", GetObject,
     get_object_params },
   { "getObjectByAddress", GetObjectByAddress,
     get_object_by_address_params },
-  { "getRetainedSize", GetRetainedSize,
+  { "_getRetainedSize", GetRetainedSize,
     get_retained_size_params },
-  { "getRetainingPath", GetRetainingPath,
+  { "_getRetainingPath", GetRetainingPath,
     get_retaining_path_params },
   { "getStack", GetStack,
     get_stack_params },
   { "getTagProfile", GetTagProfile,
     get_tag_profile_params },
   { "getTypeArgumentsList", GetTypeArgumentsList,
     get_type_arguments_list_params },
   { "getVM", GetVM,
     get_vm_params },
   { "getVMMetric", GetVMMetric,
@@ skipping 22 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart