Renamed JsonBuffer to MemoryPool

test/StaticMemoryPool/CMakeLists.txt

@@ -0,0 +1,12 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2018
+# MIT License
+
+add_executable(StaticMemoryPoolTests 
+	alloc.cpp
+	size.cpp
+	startString.cpp
+)
+
+target_link_libraries(StaticMemoryPoolTests catch)
+add_test(StaticMemoryPool StaticMemoryPoolTests)

test/StaticMemoryPool/alloc.cpp

@@ -0,0 +1,54 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson/Memory/StaticMemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ArduinoJson::Internals;
+
+static bool isAligned(void *ptr) {
+  const size_t mask = sizeof(void *) - 1;
+  size_t addr = reinterpret_cast<size_t>(ptr);
+  return (addr & mask) == 0;
+}
+
+TEST_CASE("StaticMemoryPool::alloc()") {
+  StaticMemoryPool<64> memoryPool;
+
+  SECTION("Returns different addresses") {
+    void *p1 = memoryPool.alloc(1);
+    void *p2 = memoryPool.alloc(1);
+    REQUIRE(p1 != p2);
+  }
+
+  SECTION("Returns non-NULL when using full capacity") {
+    void *p = memoryPool.alloc(64);
+    REQUIRE(0 != p);
+  }
+
+  SECTION("Returns NULL when full") {
+    memoryPool.alloc(64);
+    void *p = memoryPool.alloc(1);
+    REQUIRE(0 == p);
+  }
+
+  SECTION("Returns NULL when memoryPool is too small") {
+    void *p = memoryPool.alloc(65);
+    REQUIRE(0 == p);
+  }
+
+  SECTION("Returns aligned pointers") {
+    for (size_t size = 1; size <= sizeof(void *); size++) {
+      void *p = memoryPool.alloc(1);
+      REQUIRE(isAligned(p));
+    }
+  }
+
+  SECTION("Returns same address after clear()") {
+    void *p1 = memoryPool.alloc(1);
+    memoryPool.clear();
+    void *p2 = memoryPool.alloc(1);
+    REQUIRE(p1 == p2);
+  }
+}

test/StaticMemoryPool/size.cpp

@@ -0,0 +1,44 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson/Memory/StaticMemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ArduinoJson::Internals;
+
+TEST_CASE("StaticMemoryPool::size()") {
+  StaticMemoryPool<64> memoryPool;
+
+  SECTION("Capacity equals template parameter") {
+    REQUIRE(64 == memoryPool.capacity());
+  }
+
+  SECTION("Initial size is 0") {
+    REQUIRE(0 == memoryPool.size());
+  }
+
+  SECTION("Increases after alloc()") {
+    memoryPool.alloc(1);
+    REQUIRE(1U <= memoryPool.size());
+    memoryPool.alloc(1);
+    REQUIRE(2U <= memoryPool.size());
+  }
+
+  SECTION("Doesn't grow when memoryPool is full") {
+    memoryPool.alloc(64);
+    memoryPool.alloc(1);
+    REQUIRE(64 == memoryPool.size());
+  }
+
+  SECTION("Does't grow when memoryPool is too small for alloc") {
+    memoryPool.alloc(65);
+    REQUIRE(0 == memoryPool.size());
+  }
+
+  SECTION("Goes back to zero after clear()") {
+    memoryPool.alloc(1);
+    memoryPool.clear();
+    REQUIRE(0 == memoryPool.size());
+  }
+}

test/StaticMemoryPool/startString.cpp

@@ -0,0 +1,49 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ArduinoJson::Internals;
+
+TEST_CASE("StaticMemoryPool::startString()") {
+  SECTION("WorksWhenBufferIsBigEnough") {
+    StaticMemoryPool<6> memoryPool;
+
+    StaticMemoryPoolBase::String str = memoryPool.startString();
+    str.append('h');
+    str.append('e');
+    str.append('l');
+    str.append('l');
+    str.append('o');
+
+    REQUIRE(std::string("hello") == str.c_str());
+  }
+
+  SECTION("ReturnsNullWhenTooSmall") {
+    StaticMemoryPool<5> memoryPool;
+
+    StaticMemoryPoolBase::String str = memoryPool.startString();
+    str.append('h');
+    str.append('e');
+    str.append('l');
+    str.append('l');
+    str.append('o');
+
+    REQUIRE(0 == str.c_str());
+  }
+
+  SECTION("SizeIncreases") {
+    StaticMemoryPool<5> memoryPool;
+
+    StaticMemoryPoolBase::String str = memoryPool.startString();
+    REQUIRE(0 == memoryPool.size());
+
+    str.append('h');
+    REQUIRE(1 == memoryPool.size());
+
+    str.c_str();
+    REQUIRE(2 == memoryPool.size());
+  }
+}