test assignment over-writes comments, but swapPayload() does not

cdunn2001 · cdunn2001 · commit 3976f17ffd7e · 2015-03-06T09:16:19.000-06:00
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
@@ -1544,17 +1544,44 @@ JSONTEST_FIXTURE(ValueTest, StaticString) {
 JSONTEST_FIXTURE(ValueTest, CommentBefore) {
   Json::Value val; // fill val
   val.setComment("// this comment should appear before", Json::CommentPlacement::commentBefore);
-  // Configure the Builder, then ...
   Json::StreamWriterBuilder wbuilder;
   wbuilder.settings_["commentStyle"] = "All";
-  char const expected[] = "// this comment should appear before\nnull";
-  std::string result = Json::writeString(wbuilder, val);
-  JSONTEST_ASSERT_STRING_EQUAL(expected, result);
-  std::string res2 = val.toStyledString();
-  std::string exp2 = "\n";
-  exp2 += expected;
-  exp2 += "\n";
-  JSONTEST_ASSERT_STRING_EQUAL(exp2, res2);
+  {
+    char const expected[] = "// this comment should appear before\nnull";
+    std::string result = Json::writeString(wbuilder, val);
+    JSONTEST_ASSERT_STRING_EQUAL(expected, result);
+    std::string res2 = val.toStyledString();
+    std::string exp2 = "\n";
+    exp2 += expected;
+    exp2 += "\n";
+    JSONTEST_ASSERT_STRING_EQUAL(exp2, res2);
+  }
+  Json::Value other = "hello";
+  val.swapPayload(other);
+  {
+    char const expected[] = "// this comment should appear before\n\"hello\"";
+    std::string result = Json::writeString(wbuilder, val);
+    JSONTEST_ASSERT_STRING_EQUAL(expected, result);
+    std::string res2 = val.toStyledString();
+    std::string exp2 = "\n";
+    exp2 += expected;
+    exp2 += "\n";
+    JSONTEST_ASSERT_STRING_EQUAL(exp2, res2);
+    JSONTEST_ASSERT_STRING_EQUAL("null\n", other.toStyledString());
+  }
+  val = "hello";
+  // val.setComment("// this comment should appear before", Json::CommentPlacement::commentBefore);
+  // Assignment over-writes comments.
+  {
+    char const expected[] = "\"hello\"";
+    std::string result = Json::writeString(wbuilder, val);
+    JSONTEST_ASSERT_STRING_EQUAL(expected, result);
+    std::string res2 = val.toStyledString();
+    std::string exp2 = "";
+    exp2 += expected;
+    exp2 += "\n";
+    JSONTEST_ASSERT_STRING_EQUAL(exp2, res2);
+  }
 }
 
 JSONTEST_FIXTURE(ValueTest, zeroes) {
