Show flags in Observatory.

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"
 #include "vm/globals.h"
 #include "vm/message_handler.h"
 #include "vm/object_id_ring.h"
 #include "vm/os.h"
 #include "vm/port.h"
 #include "vm/service.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
+// This flag is used in the Service_Flags test below.
+DEFINE_FLAG(bool, service_testing_flag, false, "Comment");
+
 class ServiceTestMessageHandler : public MessageHandler {
  public:
   ServiceTestMessageHandler() : _msg(NULL) {}
 
   ~ServiceTestMessageHandler() {
     free(_msg);
   }
 
   bool HandleMessage(Message* message) {
     if (_msg != NULL) {
@@ skipping 1027 matching lines @@
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
   service_msg = Eval(lib, "[port, ['vm'], [], []]");
 
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"VM\",\"id\":\"vm\"", handler.msg());
-  EXPECT_SUBSTRING("\"architecture\"", 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());
 }
 
 
+TEST_CASE(Service_Flags) {
+  const char* kScript =
+      "var port;\n"  // Set to our mock port by C++.
+      "\n"
+      "main() {\n"
+      "}";
+
+  Isolate* isolate = Isolate::Current();
+  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
+  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));
+
+  Instance& service_msg = Instance::Handle();
+  service_msg = Eval(lib, "[port, ['flags'], [], []]");
+
+  // 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,
+                     "[port, ['flags', 'set'], "
+                     "['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, "[port, ['flags'], [], []]");
+  Service::HandleRootMessage(service_msg);
+  handler.HandleNextMessage();
+  EXPECT_SUBSTRING(
+      "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
+      "\"flagType\":\"bool\",\"valueAsString\":\"true\"",
+      handler.msg());
+}
+
+
 TEST_CASE(Service_Scripts) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(h_lib);
@@ skipping 353 matching lines @@
   service_msg = Eval(h_lib, "[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