Refactor service code and service method parameters

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 71 matching lines @@
     _msg = new_msg;
   }
 
   const char* msg() const { return _msg; }
 
  private:
   char* _msg;
 };
 
 
-static RawArray* Eval(Dart_Handle lib, const char* expr) {
+static RawArray* EvalVM(Dart_Handle lib, const char* expr) {
   Dart_Handle expr_val = Dart_EvaluateExpr(lib, NewString(expr));
   EXPECT_VALID(expr_val);
   Isolate* isolate = Isolate::Current();
+  const GrowableObjectArray& value =
+      Api::UnwrapGrowableObjectArrayHandle(isolate, expr_val);
+  const Array& result = Array::Handle(Array::MakeArray(value));
+  GrowableObjectArray& growable = GrowableObjectArray::Handle();
+  growable ^= result.At(3);
+  Array& array = Array::Handle(Array::MakeArray(growable));
+  result.SetAt(3, array);
+  growable ^= result.At(4);
+  array = Array::MakeArray(growable);
+  result.SetAt(4, array);
+  return result.raw();
+}
+
+
+static RawArray* Eval(Dart_Handle lib, const char* expr) {
+  const String& dummy_isolate_id = String::Handle(String::New("isolateId"));
+  Dart_Handle expr_val = Dart_EvaluateExpr(lib, NewString(expr));
+  EXPECT_VALID(expr_val);
+  Isolate* isolate = Isolate::Current();
   const GrowableObjectArray& value =
       Api::UnwrapGrowableObjectArrayHandle(isolate, expr_val);
   const Array& result = Array::Handle(Array::MakeArray(value));
   GrowableObjectArray& growable = GrowableObjectArray::Handle();
   growable ^= result.At(3);
+  // Append dummy isolate id to parameter values.
+  growable.Add(dummy_isolate_id);
   Array& array = Array::Handle(Array::MakeArray(growable));
   result.SetAt(3, array);
   growable ^= result.At(4);
+  // Append dummy isolate id to parameter values.
+  growable.Add(dummy_isolate_id);
   array = Array::MakeArray(growable);
   result.SetAt(4, array);
   return result.raw();
 }
 
 
 static RawArray* EvalF(Dart_Handle lib, const char* fmt, ...) {
   Isolate* isolate = Isolate::Current();
 
   va_list args;
@@ skipping 931 matching lines @@
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, 'getVM', [], []]");
+  service_msg = EvalVM(lib, "[0, port, 'getVM', [], []]");
 
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"VM\",\"id\":\"vm\"", handler.msg());
   EXPECT_SUBSTRING("\"targetCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"hostCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"version\"", handler.msg());
   EXPECT_SUBSTRING("\"uptime\"", handler.msg());
   EXPECT_SUBSTRING("\"isolates\"", handler.msg());
 }
@@ skipping 11 matching lines @@
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, 'getFlagList', [], []]");
+  service_msg = EvalVM(lib, "[0, port, 'getFlagList', [], []]");
 
   // Make sure we can get the FlagList.
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"FlagList\",\"id\":\"flags\"", handler.msg());
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"false\"",
       handler.msg());
 
   // Modify a flag through the vm service.
-  service_msg = Eval(lib,
-                     "[0, port, 'setFlag', "
-                     "['name', 'value'], ['service_testing_flag', 'true']]");
+  service_msg = EvalVM(lib,
+                       "[0, port, 'setFlag', "
+                       "['name', 'value'], ['service_testing_flag', 'true']]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("Success", handler.msg());
 
   // Make sure that the flag changed.
-  service_msg = Eval(lib, "[0, port, 'getFlagList', [], []]");
+  service_msg = EvalVM(lib, "[0, port, 'getFlagList', [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"true\"",
       handler.msg());
 }
 
 
 TEST_CASE(Service_Scripts) {
@@ skipping 310 matching lines @@
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
   service_msg = Eval(lib, "[0, port, 'getCpuProfile', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  // Expect profile
-  EXPECT_SUBSTRING("\"type\":\"CpuProfile\"", handler.msg());
+  // Expect error (tags required).
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   service_msg =
       Eval(lib, "[0, port, 'getCpuProfile', ['tags'], ['None']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
   EXPECT_SUBSTRING("\"type\":\"CpuProfile\"", handler.msg());
 
   service_msg =
       Eval(lib, "[0, port, 'getCpuProfile', ['tags'], ['Bogus']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart