Added DynamicJsonBuffer::clear()

test/DynamicJsonBuffer/CMakeLists.txt

@@ -8,10 +8,11 @@
 add_executable(DynamicJsonBufferTests 
 	alloc.cpp
 	createArray.cpp
-	no_memory.cpp
 	createObject.cpp
-	strdup.cpp
+	no_memory.cpp
+	size.cpp
 	startString.cpp
+	strdup.cpp
 )
 
 target_link_libraries(DynamicJsonBufferTests catch)

test/DynamicJsonBuffer/alloc.cpp

@@ -7,6 +7,7 @@
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
+#include <sstream>
 
 static bool isAligned(void* ptr) {
   const size_t mask = sizeof(void*) - 1;
@@ -14,26 +15,58 @@ static bool isAligned(void* ptr) {
   return (addr & mask) == 0;
 }
 
+std::stringstream allocatorLog;
+
+struct SpyingAllocator : DefaultAllocator {
+  void* allocate(size_t n) {
+    allocatorLog << "A" << (n - DynamicJsonBuffer::EmptyBlockSize);
+    return DefaultAllocator::allocate(n);
+  }
+  void deallocate(void* p) {
+    allocatorLog << "F";
+    return DefaultAllocator::deallocate(p);
+  }
+};
+
 TEST_CASE("DynamicJsonBuffer::alloc()") {
-  DynamicJsonBuffer buffer;
-
-  SECTION("InitialSizeIsZero") {
-    REQUIRE(0 == buffer.size());
-  }
-
-  SECTION("SizeIncreasesAfterAlloc") {
-    buffer.alloc(1);
-    REQUIRE(1U <= buffer.size());
-    buffer.alloc(1);
-    REQUIRE(2U <= buffer.size());
-  }
-
-  SECTION("ReturnDifferentPointer") {
+  SECTION("Returns different pointers") {
+    DynamicJsonBuffer buffer;
     void* p1 = buffer.alloc(1);
     void* p2 = buffer.alloc(2);
     REQUIRE(p1 != p2);
   }
 
+  SECTION("Doubles allocation size when full") {
+    allocatorLog.str("");
+    {
+      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
+      buffer.alloc(1);
+      buffer.alloc(1);
+    }
+    REQUIRE(allocatorLog.str() == "A1A2FF");
+  }
+
+  SECTION("Keeps increasing allocation size after clear") {
+    allocatorLog.str("");
+    {
+      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
+      buffer.alloc(1);
+      buffer.alloc(1);
+      buffer.clear();
+      buffer.alloc(1);
+    }
+    REQUIRE(allocatorLog.str() == "A1A2FFA4F");
+  }
+
+  SECTION("Makes a big allocation when needed") {
+    allocatorLog.str("");
+    {
+      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
+      buffer.alloc(42);
+    }
+    REQUIRE(allocatorLog.str() == "A42F");
+  }
+
   SECTION("Alignment") {
     // make room for two but not three
     DynamicJsonBuffer tinyBuf(2 * sizeof(void*) + 1);

test/DynamicJsonBuffer/size.cpp

@@ -0,0 +1,30 @@
+// Copyright Benoit Blanchon 2014-2017
+// MIT License
+//
+// Arduino JSON library
+// https://bblanchon.github.io/ArduinoJson/
+// If you like this project, please add a star!
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("DynamicJsonBuffer::size()") {
+  DynamicJsonBuffer buffer;
+
+  SECTION("Initial size is 0") {
+    REQUIRE(0 == buffer.size());
+  }
+
+  SECTION("Increases after alloc()") {
+    buffer.alloc(1);
+    REQUIRE(1U <= buffer.size());
+    buffer.alloc(1);
+    REQUIRE(2U <= buffer.size());
+  }
+
+  SECTION("Goes back to 0 after clear()") {
+    buffer.alloc(1);
+    buffer.clear();
+    REQUIRE(0 == buffer.size());
+  }
+}