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

Added JsonPrintable::measureLength() (issue #75)

Browse Source
This commit is contained in:
Benoit Blanchon
2015-05-09 16:53:48 +02:00
parent c385862be1
commit 08d05df00e
8 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/JsonArray_PrettyPrintTo_Tests.cpp
View File

@ -16,13 +16,15 @@ class JsonArray_PrettyPrintTo_Tests : public testing::Test {
JsonArray& array;
void outputMustBe(const char* expected) {
size_t n = array.prettyPrintTo(_buffer, sizeof(_buffer));
EXPECT_STREQ(expected, _buffer);
EXPECT_EQ(strlen(expected), n);
}
char actual[256];
private:
char _buffer[256];
size_t actualLen = array.prettyPrintTo(actual, sizeof(actual));
size_t measuredLen = array.measurePrettyLength();
EXPECT_STREQ(expected, actual);
EXPECT_EQ(strlen(expected), actualLen);
EXPECT_EQ(strlen(expected), measuredLen);
}
};
TEST_F(JsonArray_PrettyPrintTo_Tests, Empty) { outputMustBe("[]"); }

7
test/JsonArray_PrintTo_Tests.cpp
View File

@ -16,9 +16,12 @@ class JsonArray_PrintTo_Tests : public testing::Test {
JsonArray &array;
void outputMustBe(const char *expected) {
size_t n = array.printTo(buffer, sizeof(buffer));
size_t actualLen = array.printTo(buffer, sizeof(buffer));
size_t measuredLen = array.measureLength();
EXPECT_STREQ(expected, buffer);
EXPECT_EQ(strlen(expected), n);
EXPECT_EQ(strlen(expected), actualLen);
EXPECT_EQ(strlen(expected), measuredLen);
}
private:

14
test/JsonObject_PrettyPrintTo_Tests.cpp
View File

@ -16,13 +16,15 @@ class JsonObject_PrettyPrintTo_Tests : public testing::Test {
JsonObject &_object;
void outputMustBe(const char *expected) {
size_t n = _object.prettyPrintTo(buffer, sizeof(buffer));
EXPECT_STREQ(expected, buffer);
EXPECT_EQ(strlen(expected), n);
}
char buffer[256];
private:
char buffer[256];
size_t actualLen = _object.prettyPrintTo(buffer, sizeof(buffer));
size_t measuredLen = _object.measurePrettyLength();
EXPECT_STREQ(expected, buffer);
EXPECT_EQ(strlen(expected), actualLen);
EXPECT_EQ(strlen(expected), measuredLen);
}
};
TEST_F(JsonObject_PrettyPrintTo_Tests, EmptyObject) { outputMustBe("{}"); }

6
test/JsonObject_PrintTo_Tests.cpp
View File

@ -16,10 +16,12 @@ class JsonObject_PrintTo_Tests : public testing::Test {
protected:
void outputMustBe(const char *expected) {
char actual[256];
int result = object.printTo(actual, sizeof(actual));
size_t actualLen = object.printTo(actual, sizeof(actual));
size_t measuredLen = object.measureLength();
EXPECT_STREQ(expected, actual);
EXPECT_EQ(strlen(expected), result);
EXPECT_EQ(strlen(expected), actualLen);
EXPECT_EQ(strlen(expected), measuredLen);
}
StaticJsonBuffer<JSON_OBJECT_SIZE(2)> json;