Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/service_test.cc

Issue 487023003: vmservice protocol cleanup (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: gen js Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/service/protocol.md ('k') | tests/standalone/vmservice/isolate_class_field_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service_test.cc
diff --git a/runtime/vm/service_test.cc b/runtime/vm/service_test.cc
index a367035f710ba523c6995212bce741f225cb829b..addb970f49a01864201ac98f6b8a6d133f2c5ccb 100644
--- a/runtime/vm/service_test.cc
+++ b/runtime/vm/service_test.cc
@@ -292,7 +292,7 @@ TEST_CASE(Service_DebugBreakpoints) {
"\"location\":{\"type\":\"Location\","
"\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+ "\"name\":\"test-lib\",\"kind\":\"script\"},"
"\"tokenPos\":5}}",
vmlib.index());
@@ -309,7 +309,7 @@ TEST_CASE(Service_DebugBreakpoints) {
"\"location\":{\"type\":\"Location\","
"\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+ "\"name\":\"test-lib\",\"kind\":\"script\"},"
"\"tokenPos\":5}}]}",
vmlib.index());
@@ -324,7 +324,7 @@ TEST_CASE(Service_DebugBreakpoints) {
"\"location\":{\"type\":\"Location\","
"\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+ "\"name\":\"test-lib\",\"kind\":\"script\"},"
"\"tokenPos\":5}}",
vmlib.index());
@@ -468,7 +468,7 @@ TEST_CASE(Service_Stepping) {
"\"location\":{\"type\":\"Location\","
"\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\",\"kind\":\"script\"},"
+ "\"name\":\"test-lib\",\"kind\":\"script\"},"
"\"tokenPos\":11}}",
vmlib.index());
@@ -522,7 +522,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'null'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/null\","
"\"valueAsString\":\"null\"}",
@@ -532,7 +532,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'not-initialized'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/not-initialized\","
"\"valueAsString\":\"<not initialized>\"}",
@@ -543,7 +543,7 @@ TEST_CASE(Service_Objects) {
"[0, port, ['objects', 'being-initialized'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/being-initialized\","
"\"valueAsString\":\"<being initialized>\"}",
@@ -553,7 +553,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'optimized-out'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/optimized-out\","
"\"valueAsString\":\"<optimized out>\"}",
@@ -563,7 +563,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'collected'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/collected\","
"\"valueAsString\":\"<collected>\"}",
@@ -573,7 +573,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'expired'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/expired\","
"\"valueAsString\":\"<expired>\"}",
@@ -583,22 +583,22 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'bool-true'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Bool\",\"id\":\"objects\\/bool-true\","
"\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/46\","
- "\"user_name\":\"bool\"},\"valueAsString\":\"true\"}",
+ "\"name\":\"bool\"},\"valueAsString\":\"true\"}",
handler.msg());
// int
service_msg = Eval(lib, "[0, port, ['objects', 'int-123'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Smi\","
"\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
- "\"user_name\":\"_Smi\"},"
+ "\"name\":\"_Smi\",},"
"\"fields\":[],"
"\"id\":\"objects\\/int-123\","
"\"valueAsString\":\"123\"}",
@@ -608,18 +608,18 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', '$validId'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
handler.filterMsg("size");
handler.filterMsg("id");
EXPECT_STREQ(
"{\"type\":\"Array\","
- "\"class\":{\"type\":\"@Class\",\"user_name\":\"_List\"},"
+ "\"class\":{\"type\":\"@Class\",\"name\":\"_List\",},"
"\"fields\":[],"
"\"length\":1,"
"\"elements\":[{"
"\"index\":0,"
"\"value\":{\"type\":\"@String\","
- "\"class\":{\"type\":\"@Class\",\"user_name\":\"_OneByteString\"},"
+ "\"class\":{\"type\":\"@Class\",\"name\":\"_OneByteString\",},"
"\"valueAsString\":\"\\\"value\\\"\"}}]}",
handler.msg());
@@ -627,7 +627,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', '99999999'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Null\",\"id\":\"objects\\/expired\","
"\"valueAsString\":\"<expired>\"}",
@@ -637,7 +637,7 @@ TEST_CASE(Service_Objects) {
service_msg = Eval(lib, "[0, port, ['objects', 'expired', 'eval'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Error\",\"id\":\"\","
"\"message\":\"expected at most 2 arguments but found 3\\n\","
@@ -651,11 +651,11 @@ TEST_CASE(Service_Objects) {
"['expr'], ['this+99']]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"@Smi\","
"\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
- "\"user_name\":\"_Smi\"},"
+ "\"name\":\"_Smi\",},"
"\"id\":\"objects\\/int-222\","
"\"valueAsString\":\"222\"}",
handler.msg());
@@ -666,7 +666,7 @@ TEST_CASE(Service_Objects) {
"['expr'], ['null']]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"@Null\",\"id\":\"objects\\/null\","
"\"valueAsString\":\"null\"}",
@@ -677,7 +677,7 @@ TEST_CASE(Service_Objects) {
"['expr'], ['this']]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Error\",\"id\":\"\",\"kind\":\"EvalExpired\","
"\"message\":\"attempt to evaluate against expired object\\n\","
@@ -691,7 +691,7 @@ TEST_CASE(Service_Objects) {
"['expr'], ['this+99']]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"Error\",\"id\":\"\","
"\"message\":\"expected at most 3 arguments but found 4\\n\","
@@ -704,7 +704,7 @@ TEST_CASE(Service_Objects) {
"[0, port, ['objects', '$validId', 'retained'], [], []]");
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
ExpectSubstringF(handler.msg(),
"\"id\":\"objects\\/int-%" Pd "\"",
arr.raw()->Size() + arr.At(0)->Size());
@@ -897,11 +897,11 @@ TEST_CASE(Service_Libraries) {
vmlib.index());
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"@Smi\","
"\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
- "\"user_name\":\"_Smi\"},\"id\":\"objects\\/int-54320\","
+ "\"name\":\"_Smi\",},\"id\":\"objects\\/int-54320\","
"\"valueAsString\":\"54320\"}",
handler.msg());
}
@@ -976,11 +976,11 @@ TEST_CASE(Service_Classes) {
"['expr'], ['cobra + 100000']]", cid);
Service::HandleIsolateMessage(isolate, service_msg);
handler.HandleNextMessage();
- handler.filterMsg("name");
+ handler.filterMsg("vmName");
EXPECT_STREQ(
"{\"type\":\"@Smi\","
"\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
- "\"user_name\":\"_Smi\"},"
+ "\"name\":\"_Smi\",},"
"\"id\":\"objects\\/int-111235\","
"\"valueAsString\":\"111235\"}",
handler.msg());
@@ -1451,10 +1451,10 @@ TEST_CASE(Service_Scripts) {
OS::SNPrint(buf, sizeof(buf),
"{\"type\":\"Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\","
"\"owning_library\":{\"type\":\"@Library\","
- "\"id\":\"libraries\\/%" Pd "\",\"user_name\":\"\",\"name\":\"\","
+ "\"id\":\"libraries\\/%" Pd "\",\"name\":\"\","
"\"url\":\"test-lib\"},"
"\"source\":\"var port;\\n\\nmain() {\\n}\","
"\"tokenPosTable\":[[1,0,1,1,5,2,9],[3,5,1,6,5,7,6,8,8],[4,10,1]]}",
@@ -1501,7 +1501,7 @@ TEST_CASE(Service_Coverage) {
OS::SNPrint(buf, sizeof(buf),
"{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\"},\"hits\":"
"[5,1,6,1]}",
vmlib.index());
@@ -1549,7 +1549,7 @@ TEST_CASE(Service_LibrariesScriptsCoverage) {
"{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
"{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}", vmlib.index());
EXPECT_STREQ(buf, handler.msg());
}
@@ -1594,7 +1594,7 @@ TEST_CASE(Service_LibrariesCoverage) {
"{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
"{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}",
vmlib.index());
EXPECT_STREQ(buf, handler.msg());
@@ -1658,7 +1658,7 @@ TEST_CASE(Service_ClassesCoverage) {
"{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
"{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\"},\"hits\":[5,1,7,4,8,3]}]}",
vmlib.index());
EXPECT_STREQ(buf, handler.msg());
@@ -1730,7 +1730,7 @@ TEST_CASE(Service_ClassesFunctionsCoverage) {
"{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
"{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
"\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
- "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
+ "\"name\":\"test-lib\","
"\"kind\":\"script\"},\"hits\":[7,4,8,3]}]}", vmlib.index());
EXPECT_STREQ(buf, handler.msg());
}
« no previous file with comments | « runtime/vm/service/protocol.md ('k') | tests/standalone/vmservice/isolate_class_field_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698