Index: runtime/vm/service_test.cc |
diff --git a/runtime/vm/service_test.cc b/runtime/vm/service_test.cc |
index 385c05727ba04b7ed33c56afd396534fa8b6579f..f6defee6e5fedb8d0a1c5ab9cb043ed18008816b 100644 |
--- a/runtime/vm/service_test.cc |
+++ b/runtime/vm/service_test.cc |
@@ -1877,6 +1877,81 @@ TEST_CASE(Service_EmbedderIsolateHandler) { |
} |
+TEST_CASE(Service_MetricsList) { |
+ const char* kScript = |
+ "import 'dart:profiler';\n" |
+ "var port;\n" // Set to our mock port by C++. |
+ "\n" |
+ "main() {\n" |
+ " var counter = new Counter('hello', 'apple');\n" |
koda
2014/07/29 15:34:30
Consider using slightly more realistic names to he
|
+ " Metrics.add(counter);\n" |
+ " return counter;\n" |
+ "}\n" |
+ ""; |
+ |
+ Isolate* isolate = Isolate::Current(); |
+ Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL); |
+ EXPECT_VALID(h_lib); |
+ Library& lib = Library::Handle(); |
+ lib ^= Api::UnwrapHandle(h_lib); |
+ EXPECT(!lib.IsNull()); |
+ Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL); |
+ EXPECT_VALID(result); |
+ |
+ // 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(h_lib, NewString("port"), port)); |
+ |
+ Array& service_msg = Array::Handle(); |
+ service_msg = Eval(h_lib, "[0, port, ['metrics'], [], []]"); |
+ Service::HandleIsolateMessage(isolate, service_msg); |
+ handler.HandleNextMessage(); |
+ // Expect MetricList. |
+ EXPECT_SUBSTRING("\"type\":\"MetricList\"", handler.msg()); |
koda
2014/07/29 15:34:30
Check that it contains exactly one member?
Cutch
2014/07/29 18:27:01
Oi, testing this in C++ is going to be painful. Pe
koda
2014/07/29 19:44:13
Please make it a TODO, since I have a feeling ther
Cutch
2014/07/30 00:01:23
Done.
|
+} |
+ |
+ |
+TEST_CASE(Service_Metric) { |
+ const char* kScript = |
+ "import 'dart:profiler';\n" |
+ "var port;\n" // Set to our mock port by C++. |
+ "\n" |
+ "main() {\n" |
+ " var counter = new Counter('hello', 'apple');\n" |
+ " Metrics.add(counter);\n" |
+ " return counter;\n" |
+ "}\n" |
+ ""; |
+ |
+ Isolate* isolate = Isolate::Current(); |
+ Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL); |
+ EXPECT_VALID(h_lib); |
+ Library& lib = Library::Handle(); |
+ lib ^= Api::UnwrapHandle(h_lib); |
+ EXPECT(!lib.IsNull()); |
+ Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL); |
+ EXPECT_VALID(result); |
+ |
+ // 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(h_lib, NewString("port"), port)); |
+ |
+ Array& service_msg = Array::Handle(); |
+ service_msg = Eval(h_lib, "[0, port, ['metrics', '0'], [], []]"); |
+ Service::HandleIsolateMessage(isolate, service_msg); |
+ handler.HandleNextMessage(); |
+ |
+ // Expect MetricList. |
koda
2014/07/29 15:34:30
MetricList -> Counter
Cutch
2014/07/29 18:27:01
Done.
|
+ EXPECT_SUBSTRING("\"type\":\"Counter\"", handler.msg()); |
+} |
+ |
+ |
// TODO(zra): Remove when tests are ready to enable. |
#if !defined(TARGET_ARCH_ARM64) |