From d63a40a05d5f56ed42df92d94ddc90b9eecc6752 Mon Sep 17 00:00:00 2001
From: "Philipp A. Hartmann" <pah@qo.cx>
Date: Wed, 27 Aug 2014 15:38:19 +0200
Subject: [PATCH] valuetest: extended value comparison tests

Prepare equalto_operator tests to test comparisons between
 * GenericValue and GenericDocument
 * GenericValue with different SourceAllocator types

Both combinations currently fail due to ambiguities with the
templated operators on several compilers.
---
 test/unittest/valuetest.cpp | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/test/unittest/valuetest.cpp b/test/unittest/valuetest.cpp
index c9241d4..ce8fce7 100644
--- a/test/unittest/valuetest.cpp
+++ b/test/unittest/valuetest.cpp
@@ -106,15 +106,35 @@ TEST(Value, equalto_operator) {
     TestEqual(x["pi"], 3.14);
 
     // Test operator==()
+#ifdef RAPIDJSON_COMPARE_DIFFERENT_ALLOCATORS
+    CrtAllocator crtAllocator;
+    GenericValue<UTF8<>, CrtAllocator> y;
+    GenericDocument<UTF8<>, CrtAllocator> z(&crtAllocator);
+    CrtAllocator& yAllocator = crtAllocator;
+#else
+    Value::AllocatorType& yAllocator = allocator;
     Value y;
-    y.CopyFrom(x, allocator);
+    Document z;
+#endif // RAPIDJSON_COMPARE_DIFFERENT_ALLOCATORS
+    y.CopyFrom(x, yAllocator);
+    z.CopyFrom(y, z.GetAllocator());
+
     TestEqual(x, y);
+    TestEqual(y, z);
+    TestEqual(z, x);
 
     // Swapping member order should be fine.
-    y.RemoveMember("t");
+    EXPECT_TRUE(y.RemoveMember("t"));
     TestUnequal(x, y);
-    y.AddMember("t", Value(true).Move(), allocator);
+    TestUnequal(z, y);
+    EXPECT_TRUE(z.RemoveMember("t"));
+    TestUnequal(x, z);
+    TestEqual(y, z);
+    y.AddMember("t", true, yAllocator);
+    z.AddMember("t", true, z.GetAllocator());
     TestEqual(x, y);
+    TestEqual(y, z);
+    TestEqual(z, x);
 }
 
 template <typename Value>