feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Huge refactoring in progress...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-30 10:49:02 +01:00
parent 5cf744dbac
commit c3001e9ea9
9 changed files with 119 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
test/JsonArray_Container_Tests.cpp
View File

@ -15,30 +15,43 @@ using namespace ArduinoJson;
class JsonArray_Container_Tests : public ::testing::Test {
protected:
JsonArray_Container_Tests()
: array(json.createArray()) {
JsonArray_Container_Tests() : array(json.createArray()) {}
template <typename T>
void firstMustEqual(T expected) {
itemMustEqual(0, expected);
}
template <typename T>
void firstElementMustBe(T expected) {
elementAtIndexMustBe(0, expected);
void secondMustEqual(T expected) {
itemMustEqual(1, expected);
}
template <typename T>
void secondElementMustBe(T expected) {
elementAtIndexMustBe(1, expected);
void firstMustReference(const T& expected) {
itemMustReference(0, expected);
}
template <typename T>
void secondMustReference(const T& expected) {
itemMustReference(1, expected);
}
void sizeMustBe(int expected) { EXPECT_EQ(expected, array.size()); }
StaticJsonBuffer<256> json;
JsonArray &array;
JsonArray& array;
private:
template <typename T>
void elementAtIndexMustBe(int index, T expected) {
void itemMustEqual(int index, T expected) {
EXPECT_EQ(expected, array[index].as<T>());
}
template <typename T>
void itemMustReference(int index, const T& expected) {
EXPECT_EQ(&expected, &array[index].as<T&>());
}
};
TEST_F(JsonArray_Container_Tests, SuccessIsTrue) {
@ -59,24 +72,24 @@ TEST_F(JsonArray_Container_Tests, CanStoreIntegers) {
array.add(123);
array.add(456);
firstElementMustBe(123);
secondElementMustBe(456);
firstMustEqual(123);
secondMustEqual(456);
}
TEST_F(JsonArray_Container_Tests, CanStoreDoubles) {
array.add(123.45);
array.add(456.78);
firstElementMustBe(123.45);
secondElementMustBe(456.78);
firstMustEqual(123.45);
secondMustEqual(456.78);
}
TEST_F(JsonArray_Container_Tests, CanStoreBooleans) {
array.add(true);
array.add(false);
firstElementMustBe(true);
secondElementMustBe(false);
firstMustEqual(true);
secondMustEqual(false);
}
TEST_F(JsonArray_Container_Tests, CanStoreStrings) {
@ -86,44 +99,44 @@ TEST_F(JsonArray_Container_Tests, CanStoreStrings) {
array.add(firstString);
array.add(secondString);
firstElementMustBe(firstString);
secondElementMustBe(secondString);
firstMustEqual(firstString);
secondMustEqual(secondString);
}
TEST_F(JsonArray_Container_Tests, CanStoreNestedArrays) {
JsonArray &innerarray1 = json.createArray();
JsonArray &innerarray2 = json.createArray();
JsonArray& innerarray1 = json.createArray();
JsonArray& innerarray2 = json.createArray();
array.add(innerarray1);
array.add(innerarray2);
firstElementMustBe(innerarray1);
secondElementMustBe(innerarray2);
firstMustReference(innerarray1);
secondMustReference(innerarray2);
}
TEST_F(JsonArray_Container_Tests, CanStoreNestedObjects) {
JsonObject innerObject1 = json.createObject();
JsonObject innerObject2 = json.createObject();
JsonObject& innerObject1 = json.createObject();
JsonObject& innerObject2 = json.createObject();
array.add(innerObject1);
array.add(innerObject2);
firstElementMustBe(innerObject1);
secondElementMustBe(innerObject2);
firstMustReference(innerObject1);
secondMustReference(innerObject2);
}
TEST_F(JsonArray_Container_Tests, CanCreateNestedArrays) {
JsonArray innerarray1 = array.createNestedArray();
JsonArray innerarray2 = array.createNestedArray();
JsonArray& innerarray1 = array.createNestedArray();
JsonArray& innerarray2 = array.createNestedArray();
firstElementMustBe(innerarray1);
secondElementMustBe(innerarray2);
firstMustReference(innerarray1);
secondMustReference(innerarray2);
}
TEST_F(JsonArray_Container_Tests, CanCreateNestedObjects) {
JsonObject innerObject1 = array.createNestedObject();
JsonObject innerObject2 = array.createNestedObject();
JsonObject& innerObject1 = array.createNestedObject();
JsonObject& innerObject2 = array.createNestedObject();
firstElementMustBe(innerObject1);
secondElementMustBe(innerObject2);
firstMustReference(innerObject1);
secondMustReference(innerObject2);
}

13
test/JsonArray_PrettyPrintTo_Tests.cpp
View File

@ -13,13 +13,14 @@
using namespace ArduinoJson;
class JsonArray_PrettyPrintTo_Tests : public testing::Test {
public:
JsonArray_PrettyPrintTo_Tests() : array(json.createArray()) {}
protected:
JsonArray array;
JsonArray& array;
StaticJsonBuffer<30> json;
virtual void SetUp() { array = json.createArray(); }
void outputMustBe(const char *expected) {
void outputMustBe(const char* expected) {
size_t n = array.prettyPrintTo(buffer, sizeof(buffer));
EXPECT_STREQ(expected, buffer);
EXPECT_EQ(strlen(expected), n);
@ -63,11 +64,11 @@ TEST_F(JsonArray_PrettyPrintTo_Tests, EmptyNestedArrays) {
}
TEST_F(JsonArray_PrettyPrintTo_Tests, NestedArrays) {
JsonArray nested1 = array.createNestedArray();
JsonArray& nested1 = array.createNestedArray();
nested1.add(1);
nested1.add(2);
JsonObject nested2 = array.createNestedObject();
JsonObject& nested2 = array.createNestedObject();
nested2["key"] = 3;
outputMustBe(

9
test/JsonArray_PrintTo_Tests.cpp
View File

@ -12,11 +12,12 @@
using namespace ArduinoJson;
class JsonArray_PrintTo_Tests : public testing::Test {
protected:
JsonArray array;
StaticJsonBuffer<3> json;
public:
JsonArray_PrintTo_Tests() : array(json.createArray()) {}
virtual void SetUp() { array = json.createArray(); }
protected:
JsonArray &array;
StaticJsonBuffer<3> json;
void outputMustBe(const char *expected) {
size_t n = array.printTo(buffer, sizeof(buffer));

23
test/JsonObject_Container_Tests.cpp
View File

@ -14,11 +14,12 @@
using namespace ArduinoJson;
class JsonObject_Container_Tests : public ::testing::Test {
protected:
virtual void SetUp() { object = json.createObject(); }
public:
JsonObject_Container_Tests() : object(json.createObject()) {}
protected:
StaticJsonBuffer<42> json;
JsonObject object;
JsonObject& object;
};
TEST_F(JsonObject_Container_Tests, InitialSizeIsZero) {
@ -95,23 +96,23 @@ TEST_F(JsonObject_Container_Tests, CanStoreStrings) {
}
TEST_F(JsonObject_Container_Tests, CanStoreInnerArrays) {
JsonArray innerarray1 = json.createArray();
JsonArray innerarray2 = json.createArray();
JsonArray& innerarray1 = json.createArray();
JsonArray& innerarray2 = json.createArray();
object["hello"] = innerarray1;
object["world"] = innerarray2;
EXPECT_EQ(innerarray1, object["hello"].as<JsonArray>());
EXPECT_EQ(innerarray2, object["world"].as<JsonArray>());
EXPECT_EQ(&innerarray1, &object["hello"].asArray());
EXPECT_EQ(&innerarray2, &object["world"].asArray());
}
TEST_F(JsonObject_Container_Tests, CanStoreInnerObjects) {
JsonObject innerObject1 = json.createObject();
JsonObject innerObject2 = json.createObject();
JsonObject& innerObject1 = json.createObject();
JsonObject& innerObject2 = json.createObject();
object["hello"] = innerObject1;
object["world"] = innerObject2;
EXPECT_EQ(innerObject1, object["hello"].as<JsonObject>());
EXPECT_EQ(innerObject2, object["world"].as<JsonObject>());
EXPECT_EQ(&innerObject1, &object["hello"].asObject());
EXPECT_EQ(&innerObject2, &object["world"].asObject());
}

10
test/JsonObject_Iterator_Tests.cpp
View File

@ -13,7 +13,7 @@ using namespace ArduinoJson;
TEST(JsonObject_Iterator_Test, SimpleTest) {
StaticJsonBuffer<42> jsonBuffer;
JsonObject object = jsonBuffer.createObject();
JsonObject &object = jsonBuffer.createObject();
object["ab"] = 12;
object["cd"] = 34;
@ -21,12 +21,12 @@ TEST(JsonObject_Iterator_Test, SimpleTest) {
JsonObject::iterator end = object.end();
EXPECT_NE(end, it);
EXPECT_STREQ("ab", it->key());
EXPECT_EQ(12, it->value().as<int>());
EXPECT_STREQ("ab", it->key);
EXPECT_EQ(12, it->value.as<int>());
++it;
EXPECT_NE(end, it);
EXPECT_STREQ("cd", it->key());
EXPECT_EQ(34, it->value().as<int>());
EXPECT_STREQ("cd", it->key);
EXPECT_EQ(34, it->value.as<int>());
++it;
EXPECT_EQ(object.end(), it);
}