Changed the rules of string duplication (fixes #658)

test/JsonObject/CMakeLists.txt

@@ -12,6 +12,7 @@ add_executable(JsonObjectTests
 	printTo.cpp
 	remove.cpp
 	set.cpp
+	size.cpp
 	subscript.cpp
 )
 

test/JsonObject/set.cpp

@@ -10,17 +10,6 @@ TEST_CASE("JsonObject::set()") {
   DynamicJsonBuffer jb;
   JsonObject& _object = jb.createObject();
 
-  SECTION("SizeIncreased_WhenValuesAreAdded") {
-    _object.set("hello", 42);
-    REQUIRE(1 == _object.size());
-  }
-
-  SECTION("SizeUntouched_WhenSameValueIsAdded") {
-    _object["hello"] = 1;
-    _object["hello"] = 2;
-    REQUIRE(1 == _object.size());
-  }
-
   SECTION("int") {
     _object.set("hello", 123);
 
@@ -91,17 +80,59 @@ TEST_CASE("JsonObject::set()") {
     REQUIRE(42 == _object["a"]);
   }
 
-  SECTION("ShouldReturnTrue_WhenAllocationSucceeds") {
+  SECTION("returns true when allocation succeeds") {
     StaticJsonBuffer<JSON_OBJECT_SIZE(1) + 15> jsonBuffer;
     JsonObject& obj = jsonBuffer.createObject();
 
     REQUIRE(true == obj.set(std::string("hello"), std::string("world")));
   }
 
-  SECTION("ShouldReturnFalse_WhenAllocationFails") {
+  SECTION("returns false when allocation fails") {
     StaticJsonBuffer<JSON_OBJECT_SIZE(1) + 10> jsonBuffer;
     JsonObject& obj = jsonBuffer.createObject();
 
     REQUIRE(false == obj.set(std::string("hello"), std::string("world")));
   }
+
+  SECTION("should not duplicate const char*") {
+    _object.set("hello", "world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1);
+    REQUIRE(expectedSize == jb.size());
+  }
+
+  SECTION("should duplicate char* value") {
+    _object.set("hello", const_cast<char*>("world"));
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == jb.size());
+  }
+
+  SECTION("should duplicate char* key") {
+    _object.set(const_cast<char*>("hello"), "world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == jb.size());
+  }
+
+  SECTION("should duplicate char* key&value") {
+    _object.set(const_cast<char*>("hello"), const_cast<char*>("world"));
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 12;
+    REQUIRE(expectedSize <= jb.size());
+  }
+
+  SECTION("should duplicate std::string value") {
+    _object.set("hello", std::string("world"));
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == jb.size());
+  }
+
+  SECTION("should duplicate std::string key") {
+    _object.set(std::string("hello"), "world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == jb.size());
+  }
+
+  SECTION("should duplicate std::string key&value") {
+    _object.set(std::string("hello"), std::string("world"));
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 12;
+    REQUIRE(expectedSize <= jb.size());
+  }
 }

test/JsonObject/size.cpp

@@ -0,0 +1,23 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+TEST_CASE("JsonObject::size()") {
+  DynamicJsonBuffer jb;
+  JsonObject& _object = jb.createObject();
+
+  SECTION("increases when values are added") {
+    _object.set("hello", 42);
+    REQUIRE(1 == _object.size());
+  }
+
+  SECTION("doesn't increase when the smae key is added twice") {
+    _object["hello"] = 1;
+    _object["hello"] = 2;
+    REQUIRE(1 == _object.size());
+  }
+}

test/JsonObject/subscript.cpp

@@ -9,17 +9,6 @@ TEST_CASE("JsonObject::operator[]") {
   DynamicJsonBuffer _jsonBuffer;
   JsonObject& _object = _jsonBuffer.createObject();
 
-  SECTION("SizeIncreased_WhenValuesAreAdded") {
-    _object["hello"] = 1;
-    REQUIRE(1 == _object.size());
-  }
-
-  SECTION("SizeUntouched_WhenSameValueIsAdded") {
-    _object["hello"] = 1;
-    _object["hello"] = 2;
-    REQUIRE(1 == _object.size());
-  }
-
   SECTION("int") {
     _object["hello"] = 123;
 
@@ -113,9 +102,51 @@ TEST_CASE("JsonObject::operator[]") {
     REQUIRE(42 == _object["a"]);
   }
 
-  SECTION("KeyAsCharArray") {  // issue #423
+  SECTION("char key[]") {  // issue #423
     char key[] = "hello";
     _object[key] = 42;
     REQUIRE(42 == _object[key]);
   }
+
+  SECTION("should not duplicate const char*") {
+    _object["hello"] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1);
+    REQUIRE(expectedSize == _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate char* value") {
+    _object["hello"] = const_cast<char*>("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate char* key") {
+    _object[const_cast<char*>("hello")] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate char* key&value") {
+    _object[const_cast<char*>("hello")] = const_cast<char*>("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 12;
+    REQUIRE(expectedSize <= _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate std::string value") {
+    _object["hello"] = std::string("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate std::string key") {
+    _object[std::string("hello")] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 6;
+    REQUIRE(expectedSize == _jsonBuffer.size());
+  }
+
+  SECTION("should duplicate std::string key&value") {
+    _object[std::string("hello")] = std::string("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 12;
+    REQUIRE(expectedSize <= _jsonBuffer.size());
+  }
 }