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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/snapshot_test.cc

Issue 9104041: Added API Dart_PostCMessage for posting a Dart_CMessage structure (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed review comments from asiva@ Created 8 years, 10 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
« runtime/include/dart_api.h ('K') | « runtime/vm/snapshot.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/snapshot_test.cc
diff --git a/runtime/vm/snapshot_test.cc b/runtime/vm/snapshot_test.cc
index bb8fe8f453b77df7d54c81a3a0224886e960173a..9903f10c59cca6982298123eed1a9a962c85c701 100644
--- a/runtime/vm/snapshot_test.cc
+++ b/runtime/vm/snapshot_test.cc
@@ -52,14 +52,70 @@ static uint8_t* zone_allocator(
}
-static Dart_CMessage* DecodeMessage(uint8_t* message,
- intptr_t length,
- ReAlloc allocator) {
+static Dart_CObject* DecodeMessage(uint8_t* message,
+ intptr_t length,
+ ReAlloc allocator) {
CMessageReader message_reader(message, length, allocator);
return message_reader.ReadMessage();
}
+// Compare two Dart_CObject object graphs rooted in first and
+// second. The second graph will be destroyed by this operation no matter
+// whether the graphs are equal or not.
+static void CompareDartCObjects(Dart_CObject* first, Dart_CObject* second) {
+ // Return immediately if entering a cycle.
+ if (second->type == Dart_CObject::kNumberOfTypes) return;
+
+ EXPECT_NE(first, second);
+ EXPECT_EQ(first->type, second->type);
+ switch (first->type) {
+ case Dart_CObject::kNull:
+ // Nothing more to compare.
+ break;
+ case Dart_CObject::kBool:
+ EXPECT_EQ(first->value.as_bool, second->value.as_bool);
+ break;
+ case Dart_CObject::kInt32:
+ EXPECT_EQ(first->value.as_int32, second->value.as_int32);
+ break;
+ case Dart_CObject::kDouble:
+ EXPECT_EQ(first->value.as_double, second->value.as_double);
+ break;
+ case Dart_CObject::kString:
+ EXPECT_STREQ(first->value.as_string, second->value.as_string);
+ break;
+ case Dart_CObject::kArray:
+ // Use invalid type as a visited marker to avoid infinite
+ // recursion on graphs with cycles.
+ second->type = Dart_CObject::kNumberOfTypes;
+ EXPECT_EQ(first->value.as_array.length, second->value.as_array.length);
+ for (int i = 0; i < first->value.as_array.length; i++) {
+ CompareDartCObjects(first->value.as_array.values[i],
+ second->value.as_array.values[i]);
+ }
+ break;
+ default:
+ EXPECT(false);
+ }
+}
+
+
+static void CheckEncodeDecodeMessage(Dart_CObject* root) {
+ // Encode and decode the message.
+ uint8_t* buffer = NULL;
+ MessageWriter writer(&buffer, &malloc_allocator);
+ writer.WriteCMessage(root);
+
+ Zone zone(Isolate::Current());
+ Dart_CObject* new_root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+
+ // Check that the two messages are the same.
+ CompareDartCObjects(root, new_root);
+}
+
TEST_CASE(SerializeNull) {
Zone zone(Isolate::Current());
@@ -79,12 +135,12 @@ TEST_CASE(SerializeNull) {
EXPECT(Equals(null_object, serialized_object));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kNull, cobject->type);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kNull, root->type);
+ CheckEncodeDecodeMessage(root);
}
@@ -107,13 +163,13 @@ TEST_CASE(SerializeSmi1) {
EXPECT(Equals(smi, serialized_object));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
- EXPECT_EQ(smi.Value(), cobject->value.as_int32);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kInt32, root->type);
+ EXPECT_EQ(smi.Value(), root->value.as_int32);
+ CheckEncodeDecodeMessage(root);
}
@@ -136,13 +192,13 @@ TEST_CASE(SerializeSmi2) {
EXPECT(Equals(smi, serialized_object));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
- EXPECT_EQ(smi.Value(), cobject->value.as_int32);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kInt32, root->type);
+ EXPECT_EQ(smi.Value(), root->value.as_int32);
+ CheckEncodeDecodeMessage(root);
}
@@ -165,13 +221,13 @@ TEST_CASE(SerializeDouble) {
EXPECT(Equals(dbl, serialized_object));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kDouble, cobject->type);
- EXPECT_EQ(dbl.value(), cobject->value.as_double);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kDouble, root->type);
+ EXPECT_EQ(dbl.value(), root->value.as_double);
+ CheckEncodeDecodeMessage(root);
}
@@ -211,13 +267,13 @@ TEST_CASE(SerializeTrue) {
Snapshot::SetupFromBuffer(buffer);
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kBool, cobject->type);
- EXPECT_EQ(true, cobject->value.as_bool);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kBool, root->type);
+ EXPECT_EQ(true, root->value.as_bool);
+ CheckEncodeDecodeMessage(root);
}
@@ -235,13 +291,13 @@ TEST_CASE(SerializeFalse) {
Snapshot::SetupFromBuffer(buffer);
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kBool, cobject->type);
- EXPECT_EQ(false, cobject->value.as_bool);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kBool, root->type);
+ EXPECT_EQ(false, root->value.as_bool);
+ CheckEncodeDecodeMessage(root);
}
@@ -266,12 +322,11 @@ TEST_CASE(SerializeBigint) {
EXPECT_EQ(BigintOperations::ToInt64(bigint), BigintOperations::ToInt64(obj));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
// Bigint not supported.
- EXPECT(cobject == NULL);
+ EXPECT(root == NULL);
}
@@ -350,12 +405,12 @@ TEST_CASE(SerializeString) {
EXPECT(str.Equals(serialized_str));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_EQ(Dart_CObject::kString, cobject->type);
- EXPECT_STREQ(cstr, cobject->value.as_string);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_EQ(Dart_CObject::kString, root->type);
+ EXPECT_STREQ(cstr, root->value.as_string);
+ CheckEncodeDecodeMessage(root);
}
@@ -385,17 +440,17 @@ TEST_CASE(SerializeArray) {
EXPECT(array.Equals(serialized_array));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_EQ(Dart_CObject::kArray, cobject->type);
- EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = cobject->value.as_array.values[i];
+ Dart_CObject* element = root->value.as_array.values[i];
EXPECT_EQ(Dart_CObject::kInt32, element->type);
EXPECT_EQ(i, element->value.as_int32);
}
+ CheckEncodeDecodeMessage(root);
}
@@ -420,13 +475,13 @@ TEST_CASE(SerializeEmptyArray) {
EXPECT(array.Equals(serialized_array));
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_EQ(Dart_CObject::kArray, cobject->type);
- EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
- EXPECT(cobject->value.as_array.values == NULL);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
+ EXPECT(root->value.as_array.values == NULL);
+ CheckEncodeDecodeMessage(root);
}
@@ -748,24 +803,24 @@ TEST_CASE(IntArrayMessage) {
writer.WriteMessage(len, data);
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_EQ(Dart_CObject::kArray, cobject->type);
- EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = cobject->value.as_array.values[i];
+ Dart_CObject* element = root->value.as_array.values[i];
EXPECT_EQ(Dart_CObject::kInt32, element->type);
EXPECT_EQ(i + 1, element->value.as_int32);
}
+ CheckEncodeDecodeMessage(root);
}
// Helper function to call a top level Dart function, serialize the
// result and deserialize the result into a Dart_CObject structure.
-static Dart_CMessage* GetDeserializedDartMessage(Dart_Handle lib,
- const char* dart_function) {
+static Dart_CObject* GetDeserializedDartMessage(Dart_Handle lib,
+ const char* dart_function) {
Dart_Handle result;
result = Dart_InvokeStatic(lib,
Dart_NewString(""),
@@ -782,10 +837,9 @@ static Dart_CMessage* GetDeserializedDartMessage(Dart_Handle lib,
writer.FinalizeBuffer();
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- return cmessage;
+ return DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
}
@@ -838,13 +892,13 @@ UNIT_TEST_CASE(DartGeneratedMessages) {
writer.FinalizeBuffer();
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
- EXPECT_EQ(42, cobject->value.as_int32);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kInt32, root->type);
+ EXPECT_EQ(42, root->value.as_int32);
+ CheckEncodeDecodeMessage(root);
}
{
Zone zone(Isolate::Current());
@@ -856,13 +910,13 @@ UNIT_TEST_CASE(DartGeneratedMessages) {
writer.FinalizeBuffer();
// Read object back from the snapshot into a C structure.
- Dart_CMessage* cmessage = DecodeMessage(buffer + Snapshot::kHeaderSize,
- writer.BytesWritten(),
- &zone_allocator);
- Dart_CObject* cobject = cmessage->root;
- EXPECT_NOTNULL(cobject);
- EXPECT_EQ(Dart_CObject::kString, cobject->type);
- EXPECT_STREQ("Hello, world!", cobject->value.as_string);
+ Dart_CObject* root = DecodeMessage(buffer + Snapshot::kHeaderSize,
+ writer.BytesWritten(),
+ &zone_allocator);
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kString, root->type);
+ EXPECT_STREQ("Hello, world!", root->value.as_string);
+ CheckEncodeDecodeMessage(root);
}
}
Dart_ExitScope();
@@ -906,69 +960,65 @@ UNIT_TEST_CASE(DartGeneratedListMessages) {
{
DARTSCOPE_NOCHECKS(isolate);
-
{
// Generate a list of nulls from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getList");
- Dart_CObject* value = cmessage->root;
- EXPECT_NOTNULL(value);
- EXPECT_EQ(Dart_CObject::kArray, value->type);
- EXPECT_EQ(kArrayLength, value->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- EXPECT_EQ(Dart_CObject::kNull, value->value.as_array.values[i]->type);
+ EXPECT_EQ(Dart_CObject::kNull, root->value.as_array.values[i]->type);
}
+ CheckEncodeDecodeMessage(root);
}
{
// Generate a list of ints from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getIntList");
- Dart_CObject* value = cmessage->root;
- EXPECT_NOTNULL(value);
- EXPECT_EQ(Dart_CObject::kArray, value->type);
- EXPECT_EQ(kArrayLength, value->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getIntList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- EXPECT_EQ(Dart_CObject::kInt32, value->value.as_array.values[i]->type);
- EXPECT_EQ(i, value->value.as_array.values[i]->value.as_int32);
+ EXPECT_EQ(Dart_CObject::kInt32, root->value.as_array.values[i]->type);
+ EXPECT_EQ(i, root->value.as_array.values[i]->value.as_int32);
}
+ CheckEncodeDecodeMessage(root);
}
{
// Generate a list of strings from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage =
- GetDeserializedDartMessage(lib, "getStringList");
- Dart_CObject* value = cmessage->root;
- EXPECT_NOTNULL(value);
- EXPECT_EQ(Dart_CObject::kArray, value->type);
- EXPECT_EQ(kArrayLength, value->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getStringList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- EXPECT_EQ(Dart_CObject::kString, value->value.as_array.values[i]->type);
+ EXPECT_EQ(Dart_CObject::kString, root->value.as_array.values[i]->type);
char buffer[3];
snprintf(buffer, sizeof(buffer), "%d", i);
- EXPECT_STREQ(buffer, value->value.as_array.values[i]->value.as_string);
+ EXPECT_STREQ(buffer, root->value.as_array.values[i]->value.as_string);
}
}
{
// Generate a list of objects of different types from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getMixedList");
- Dart_CObject* value = cmessage->root;
- EXPECT_NOTNULL(value);
- EXPECT_EQ(Dart_CObject::kArray, value->type);
- EXPECT_EQ(kArrayLength, value->value.as_array.length);
-
- EXPECT_EQ(Dart_CObject::kInt32, value->value.as_array.values[0]->type);
- EXPECT_EQ(0, value->value.as_array.values[0]->value.as_int32);
- EXPECT_EQ(Dart_CObject::kString, value->value.as_array.values[1]->type);
- EXPECT_STREQ("1", value->value.as_array.values[1]->value.as_string);
- EXPECT_EQ(Dart_CObject::kDouble, value->value.as_array.values[2]->type);
- EXPECT_EQ(2.2, value->value.as_array.values[2]->value.as_double);
- EXPECT_EQ(Dart_CObject::kBool, value->value.as_array.values[3]->type);
- EXPECT_EQ(true, value->value.as_array.values[3]->value.as_bool);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getMixedList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
+
+ EXPECT_EQ(Dart_CObject::kInt32, root->value.as_array.values[0]->type);
+ EXPECT_EQ(0, root->value.as_array.values[0]->value.as_int32);
+ EXPECT_EQ(Dart_CObject::kString, root->value.as_array.values[1]->type);
+ EXPECT_STREQ("1", root->value.as_array.values[1]->value.as_string);
+ EXPECT_EQ(Dart_CObject::kDouble, root->value.as_array.values[2]->type);
+ EXPECT_EQ(2.2, root->value.as_array.values[2]->value.as_double);
+ EXPECT_EQ(Dart_CObject::kBool, root->value.as_array.values[3]->type);
+ EXPECT_EQ(true, root->value.as_array.values[3]->value.as_bool);
for (int i = 0; i < kArrayLength; i++) {
if (i > 3) {
- EXPECT_EQ(Dart_CObject::kNull, value->value.as_array.values[i]->type);
+ EXPECT_EQ(Dart_CObject::kNull, root->value.as_array.values[i]->type);
}
}
}
@@ -1023,15 +1073,13 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
{
// Generate a list of strings from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage =
- GetDeserializedDartMessage(lib, "getStringList");
- Dart_CObject* object = cmessage->root;
- EXPECT_NOTNULL(object);
- EXPECT_EQ(Dart_CObject::kArray, object->type);
- EXPECT_EQ(kArrayLength, object->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getStringList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = object->value.as_array.values[i];
- EXPECT_EQ(object->value.as_array.values[0], element);
+ Dart_CObject* element = root->value.as_array.values[i];
+ EXPECT_EQ(root->value.as_array.values[0], element);
EXPECT_EQ(Dart_CObject::kString, element->type);
EXPECT_STREQ("Hello, world!", element->value.as_string);
}
@@ -1039,15 +1087,13 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
{
// Generate a list of doubles from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage =
- GetDeserializedDartMessage(lib, "getDoubleList");
- Dart_CObject* object = cmessage->root;
- EXPECT_NOTNULL(object);
- EXPECT_EQ(Dart_CObject::kArray, object->type);
- EXPECT_EQ(kArrayLength, object->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getDoubleList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = object->value.as_array.values[i];
- EXPECT_EQ(object->value.as_array.values[0], element);
+ Dart_CObject* element = root->value.as_array.values[i];
+ EXPECT_EQ(root->value.as_array.values[0], element);
EXPECT_EQ(Dart_CObject::kDouble, element->type);
EXPECT_EQ(3.14, element->value.as_double);
}
@@ -1055,19 +1101,18 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
{
// Generate a list of objects of different types from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getMixedList");
- Dart_CObject* object = cmessage->root;
- EXPECT_NOTNULL(object);
- EXPECT_EQ(Dart_CObject::kArray, object->type);
- EXPECT_EQ(kArrayLength, object->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getMixedList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = object->value.as_array.values[i];
+ Dart_CObject* element = root->value.as_array.values[i];
if ((i % 2) == 0) {
- EXPECT_EQ(object->value.as_array.values[0], element);
+ EXPECT_EQ(root->value.as_array.values[0], element);
EXPECT_EQ(Dart_CObject::kString, element->type);
EXPECT_STREQ("A", element->value.as_string);
} else {
- EXPECT_EQ(object->value.as_array.values[1], element);
+ EXPECT_EQ(root->value.as_array.values[1], element);
EXPECT_EQ(Dart_CObject::kDouble, element->type);
EXPECT_STREQ(2.72, element->value.as_double);
}
@@ -1076,16 +1121,14 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
{
// Generate a list of objects of different types from Dart code.
Zone zone(Isolate::Current());
- Dart_CMessage* cmessage =
- GetDeserializedDartMessage(lib, "getSelfRefList");
- Dart_CObject* object = cmessage->root;
- EXPECT_NOTNULL(object);
- EXPECT_EQ(Dart_CObject::kArray, object->type);
- EXPECT_EQ(kArrayLength, object->value.as_array.length);
+ Dart_CObject* root = GetDeserializedDartMessage(lib, "getSelfRefList");
+ EXPECT_NOTNULL(root);
+ EXPECT_EQ(Dart_CObject::kArray, root->type);
+ EXPECT_EQ(kArrayLength, root->value.as_array.length);
for (int i = 0; i < kArrayLength; i++) {
- Dart_CObject* element = object->value.as_array.values[i];
+ Dart_CObject* element = root->value.as_array.values[i];
EXPECT_EQ(Dart_CObject::kArray, element->type);
- EXPECT_EQ(object, element);
+ EXPECT_EQ(root, element);
}
}
}
@@ -1093,6 +1136,79 @@ UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
Dart_ShutdownIsolate();
}
+
+UNIT_TEST_CASE(PostCObject) {
+ // Create a native port for posting from C to Dart
+ TestIsolateScope __test_isolate__;
+ const char* kScriptChars =
+ "void main() {\n"
+ " var messageCount = 0;\n"
+ " var exception = '';\n"
+ " var port = new ReceivePort();\n"
+ " port.receive((message, replyTo) {\n"
+ " exception += message.toString();\n"
+ " messageCount++;\n"
+ " if (messageCount == 7) throw new Exception(exception);\n"
+ " });\n"
+ " return port.toSendPort();\n"
+ "}\n";
+ Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+ Dart_EnterScope();
+
+ // xxx
+ Dart_Handle send_port = Dart_InvokeStatic(lib,
+ Dart_NewString(""),
+ Dart_NewString("main"),
+ 0,
+ NULL);
+ EXPECT_VALID(send_port);
+ Dart_Handle result =
+ Dart_GetInstanceField(send_port, Dart_NewString("_id"));
+ ASSERT(!Dart_IsError(result));
+ ASSERT(Dart_IsInteger(result));
+ int64_t send_port_id;
+ Dart_Handle result2 = Dart_IntegerToInt64(result, &send_port_id);
+ ASSERT(!Dart_IsError(result2));
+
+ // Setup single object message.
+ Dart_CObject object;
+
+ object.type = Dart_CObject::kNull;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kBool;
+ object.value.as_bool = true;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kBool;
+ object.value.as_bool = false;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kInt32;
+ object.value.as_int32 = 123;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kString;
+ object.value.as_string = const_cast<char*>("456");
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kDouble;
+ object.value.as_double = 3.14;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ object.type = Dart_CObject::kArray;
+ object.value.as_array.length = 0;
+ EXPECT(Dart_PostCObject(send_port_id, &object));
+
+ result = Dart_RunLoop();
+ EXPECT(Dart_IsError(result));
+ EXPECT(Dart_ErrorHasException(result));
+ EXPECT_SUBSTRING("Exception: nulltruefalse1234563.14[]\n",
+ Dart_GetError(result));
+
+ Dart_ExitScope();
+}
+
#endif // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
} // namespace dart
« runtime/include/dart_api.h ('K') | « runtime/vm/snapshot.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698