Test that DynamicJsonBuffer.size() is the sum of all blocks

bblanchon · bblanchon · commit 13e907c894b9 · 2014-12-13T21:02:42.000+01:00
diff --git a/include/ArduinoJson/DynamicJsonBuffer.hpp b/include/ArduinoJson/DynamicJsonBuffer.hpp
@@ -15,11 +15,13 @@ namespace ArduinoJson {
 // more suitable for embedded systems.
 class DynamicJsonBuffer : public JsonBuffer {
  public:
-  explicit DynamicJsonBuffer() : _next(NULL), _size(0) {}
+  DynamicJsonBuffer() : _next(NULL), _size(0) {}
 
-  size_t size() const { return _size; }
+  ~DynamicJsonBuffer() { delete _next; }
 
-  size_t blockCount() const { return _next ? _next->blockCount() + 1 : 1; }
+  size_t size() const { return _size + (_next ? _next->size() : 0); }
+
+  size_t blockCount() const { return 1 + (_next ? _next->blockCount() : 0); }
 
   static const size_t BLOCK_CAPACITY = 32;
 
@@ -43,10 +45,11 @@ class DynamicJsonBuffer : public JsonBuffer {
     _size += bytes;
     return p;
   }
+
   bool canAllocInOtherBlocks(size_t bytes) const {
     // by design a DynamicJsonBuffer can't alloc a block bigger than
     // BLOCK_CAPACITY
-    return bytes < BLOCK_CAPACITY;
+    return bytes <= BLOCK_CAPACITY;
   }
 
   void* allocInOtherBlocks(size_t bytes) {
diff --git a/test/DynamicJsonBuffer_Basic_Tests.cpp b/test/DynamicJsonBuffer_Basic_Tests.cpp
@@ -29,6 +29,8 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, SizeIncreasesAfterAlloc) {
   ASSERT_EQ(1, buffer.size());
   buffer.alloc(1);
   ASSERT_EQ(2, buffer.size());
+  buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+  ASSERT_EQ(2 + DynamicJsonBuffer::BLOCK_CAPACITY, buffer.size());
 }
 
 TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountDoesntChangeWhenNotFull) {
@@ -43,8 +45,10 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountChangesWhenFull) {
 }
 
 TEST_F(DynamicJsonBuffer_Basic_Tests, CanAllocLessThanBlockCapacity) {
-  void* p = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
-  ASSERT_TRUE(p);
+  void* p1 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+  ASSERT_TRUE(p1);
+  void* p2 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+  ASSERT_TRUE(p2);
 }
 
 TEST_F(DynamicJsonBuffer_Basic_Tests, CantAllocMoreThanBlockCapacity) {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, SizeIncreasesAfterAlloc) {`
`29`	`29`	`ASSERT_EQ(1, buffer.size());`
`30`	`30`	`buffer.alloc(1);`
`31`	`31`	`ASSERT_EQ(2, buffer.size());`
	`32`	`+ buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);`
	`33`	`+ ASSERT_EQ(2 + DynamicJsonBuffer::BLOCK_CAPACITY, buffer.size());`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountDoesntChangeWhenNotFull) {`
`@@ -43,8 +45,10 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountChangesWhenFull) {`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`TEST_F(DynamicJsonBuffer_Basic_Tests, CanAllocLessThanBlockCapacity) {`
`46`		`- void* p = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);`
`47`		`- ASSERT_TRUE(p);`
	`48`	`+ void* p1 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);`
	`49`	`+ ASSERT_TRUE(p1);`
	`50`	`+ void* p2 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);`
	`51`	`+ ASSERT_TRUE(p2);`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`TEST_F(DynamicJsonBuffer_Basic_Tests, CantAllocMoreThanBlockCapacity) {`