bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-14 11:06:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test with clang

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-31 11:38:58 +01:00
parent 889f059758
commit a5dbb397ca
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/ArduinoJson/StaticJsonBuffer.hpp
View File

@ -10,17 +10,15 @@
#include "JsonBuffer.hpp"
namespace ArduinoJson {
template <int CAPACITY>
template <size_t CAPACITY>
class StaticJsonBuffer : public JsonBuffer {
public:
explicit StaticJsonBuffer() : _size(0) {}
virtual ~StaticJsonBuffer() {}
int capacity() const { return CAPACITY; }
int size() const { return _size; }
size_t capacity() const { return CAPACITY; }
size_t size() const { return _size; }
void clear() { _size = 0; }
protected:
@ -33,6 +31,6 @@ class StaticJsonBuffer : public JsonBuffer {
private:
char _buffer[CAPACITY];
int _size;
size_t _size;
};
}

45
test/StaticJsonBufferTests.cpp
View File

@ -11,68 +11,69 @@
using namespace ArduinoJson;
const size_t SIZEOF_ONE_OBJECT = JSON_OBJECT_SIZE(0);
const size_t SIZEOF_TWO_OBJECTS = 2 * SIZEOF_ONE_OBJECT;
const size_t SIZEOF_OBJECT_WITH_ONE_VALUE = JSON_OBJECT_SIZE(1);
const size_t SIZEOF_OBJECT_WITH_TWO_VALUES = JSON_OBJECT_SIZE(2);
TEST(StaticJsonBuffer, CapacityMatchTemplateParameter) {
StaticJsonBuffer<42> json;
EXPECT_EQ(42, json.capacity());
}
TEST(StaticJsonBuffer, InitialSizeIsZero) {
StaticJsonBuffer<42> json;
EXPECT_EQ(0, json.size());
}
TEST(StaticJsonBuffer, WhenCreateObjectIsCalled_ThenSizeIsIncreasedSizeOfJsonObject) {
StaticJsonBuffer<42> json;
TEST(StaticJsonBuffer,
WhenCreateObjectIsCalled_ThenSizeIsIncreasedSizeOfJsonObject) {
StaticJsonBuffer<SIZEOF_TWO_OBJECTS> json;
json.createObject();
EXPECT_EQ(sizeof(JsonObject), json.size());
json.createObject();
EXPECT_EQ(sizeof(JsonObject)*2, json.size());
EXPECT_EQ(SIZEOF_TWO_OBJECTS, json.size());
}
TEST(StaticJsonBuffer,
GivenBufferIsFull_WhenCreateObjectIsCalled_ThenSizeDoesNotChange) {
StaticJsonBuffer<sizeof(JsonObject)> json;
StaticJsonBuffer<SIZEOF_ONE_OBJECT> json;
json.createObject();
EXPECT_EQ(sizeof(JsonObject), json.size());
json.createObject();
EXPECT_EQ(sizeof(JsonObject), json.size());
EXPECT_EQ(SIZEOF_ONE_OBJECT, json.size());
}
TEST(StaticJsonBuffer,
WhenCreateObjectIsCalled_ThenAnEmptyJsonObjectIsReturned) {
StaticJsonBuffer<42> json;
StaticJsonBuffer<SIZEOF_ONE_OBJECT> json;
JsonObject &obj = json.createObject();
EXPECT_EQ(0, obj.size());
}
TEST(StaticJsonBuffer,
GivenAJsonObject_WhenValuesAreAdded_ThenSizeIsIncreasedAccordingly) {
StaticJsonBuffer<200> json;
StaticJsonBuffer<SIZEOF_OBJECT_WITH_TWO_VALUES> json;
JsonObject &obj = json.createObject();
obj["hello"];
EXPECT_EQ(sizeof(JsonObject)+sizeof(Internals::JsonObjectNode), json.size());
obj["world"];
EXPECT_EQ(sizeof(JsonObject) + sizeof(Internals::JsonObjectNode)*2, json.size());
EXPECT_EQ(SIZEOF_OBJECT_WITH_TWO_VALUES, json.size());
}
TEST(
StaticJsonBuffer,
GivenAJsonObject_WhenSameValuesAreAddedTwice_ThenSizeIsOnlyIncreasedByTwo) {
StaticJsonBuffer<42> json;
StaticJsonBuffer<SIZEOF_OBJECT_WITH_TWO_VALUES> json;
JsonObject &obj = json.createObject();
obj["hello"];
obj["hello"];
size_t sizeBefore = json.size();
obj["hello"];
size_t sizeAfter = json.size();
EXPECT_EQ(sizeBefore, sizeAfter);
EXPECT_EQ(SIZEOF_OBJECT_WITH_ONE_VALUE, json.size());
}