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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/object_test.cc

Issue 1162133002: Introduce Instance.kind. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: regis feedback Created 5 years, 7 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/object.cc ('k') | runtime/vm/report_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object_test.cc
diff --git a/runtime/vm/object_test.cc b/runtime/vm/object_test.cc
index ac5dc2291144a48058602bc621372879da8742b6..ebe0ba0372ad153a428885260d1bd2d43303cae9 100644
--- a/runtime/vm/object_test.cc
+++ b/runtime/vm/object_test.cc
@@ -4352,9 +4352,12 @@ TEST_CASE(PrintJSONPrimitives) {
Bool::True().PrintJSON(&js, true);
elideSubstring("classes", js.ToCString(), buffer);
EXPECT_STREQ(
- "{\"type\":\"@bool\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Bool\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
- "\"name\":\"bool\"},\"fixedId\":true,"
+ "\"name\":\"bool\"},"
+ "\"kind\":\"Bool\","
+ "\"fixedId\":true,"
"\"id\":\"objects\\/bool-true\",\"valueAsString\":\"true\"}",
buffer);
}
@@ -4366,10 +4369,13 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("classes", js.ToCString(), buffer);
elideSubstring("_Smi@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@int\",\"_vmType\":\"@Smi\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Smi\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_Smi\","
- "\"_vmName\":\"\"},\"fixedId\":true,"
+ "\"_vmName\":\"\"},"
+ "\"kind\":\"Int\","
+ "\"fixedId\":true,"
"\"id\":\"objects\\/int-7\",\"valueAsString\":\"7\"}",
buffer);
}
@@ -4382,9 +4388,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_Mint@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@int\",\"_vmType\":\"@Mint\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Mint\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_Mint\",\"_vmName\":\"\"},"
+ "\"kind\":\"Int\","
"\"id\":\"\",\"valueAsString\":\"-9223372036854775808\"}",
buffer);
}
@@ -4399,9 +4407,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_Bigint@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@int\",\"_vmType\":\"@Bigint\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Bigint\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_Bigint\",\"_vmName\":\"\"},"
+ "\"kind\":\"Int\","
"\"id\":\"\",\"valueAsString\":\"44444444444444444444444444444444\"}",
buffer);
}
@@ -4414,9 +4424,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_Double@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@double\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Double\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_Double\",\"_vmName\":\"\"},"
+ "\"kind\":\"Double\","
"\"id\":\"\",\"valueAsString\":\"0.1234\"}",
buffer);
}
@@ -4429,9 +4441,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_OneByteString@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@String\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"String\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_OneByteString\",\"_vmName\":\"\"},"
+ "\"kind\":\"String\","
"\"id\":\"\",\"valueAsString\":\"dw\"}",
buffer);
}
@@ -4444,9 +4458,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_List@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@List\",\"_vmType\":\"@Array\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Array\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_List\",\"_vmName\":\"\"},"
+ "\"kind\":\"List\","
"\"id\":\"\",\"length\":0}",
buffer);
}
@@ -4460,10 +4476,13 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_GrowableList@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@List\",\"_vmType\":\"@GrowableObjectArray\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"GrowableObjectArray\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_GrowableList\","
- "\"_vmName\":\"\"},\"id\":\"\",\"length\":0}",
+ "\"_vmName\":\"\"},"
+ "\"kind\":\"List\","
+ "\"id\":\"\",\"length\":0}",
buffer);
}
// LinkedHashMap reference
@@ -4476,9 +4495,12 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_InternalLinkedHashMap@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@Instance\",\"_vmType\":\"@LinkedHashMap\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"LinkedHashMap\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
- "\"name\":\"_InternalLinkedHashMap\",\"_vmName\":\"\"},\"id\":\"\"}",
+ "\"name\":\"_InternalLinkedHashMap\",\"_vmName\":\"\"},"
+ "\"kind\":\"Map\","
+ "\"id\":\"\"}",
buffer);
}
// UserTag reference
@@ -4490,9 +4512,11 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_UserTag@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@Instance\",\"_vmType\":\"@UserTag\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"UserTag\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"_UserTag\",\"_vmName\":\"\"},"
+ "\"kind\":\"PlainInstance\","
"\"id\":\"\"}",
buffer);
}
@@ -4506,9 +4530,12 @@ TEST_CASE(PrintJSONPrimitives) {
elideSubstring("objects", buffer, buffer);
elideSubstring("_Type@", buffer, buffer);
EXPECT_STREQ(
- "{\"type\":\"@Type\","
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"Type\","
"\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
- "\"name\":\"_Type\",\"_vmName\":\"\"},\"fixedId\":true,\"id\":\"\","
+ "\"name\":\"_Type\",\"_vmName\":\"\"},"
+ "\"kind\":\"Type\","
+ "\"fixedId\":true,\"id\":\"\","
"\"typeClass\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
"\"name\":\"bool\"},\"name\":\"bool\"}",
buffer);
@@ -4518,7 +4545,10 @@ TEST_CASE(PrintJSONPrimitives) {
JSONStream js;
Object::null_object().PrintJSON(&js, true);
EXPECT_STREQ(
- "{\"type\":\"@null\",\"fixedId\":true,"
+ "{\"type\":\"@Instance\","
+ "\"_vmType\":\"null\","
+ "\"kind\":\"Null\","
+ "\"fixedId\":true,"
"\"id\":\"objects\\/null\","
"\"valueAsString\":\"null\"}",
js.ToCString());
@@ -4552,7 +4582,7 @@ TEST_CASE(PrintJSONPrimitives) {
tok.PrintJSON(&js, true);
elideSubstring("objects", js.ToCString(), buffer);
EXPECT_STREQ(
- "{\"type\":\"@Object\",\"_vmType\":\"@LiteralToken\",\"id\":\"\"}",
+ "{\"type\":\"@Object\",\"_vmType\":\"LiteralToken\",\"id\":\"\"}",
buffer);
}
}
« no previous file with comments | « runtime/vm/object.cc ('k') | runtime/vm/report_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698