Added tests of writeTo() return value

This commit is contained in:
Benoît Blanchon
2014-07-01 13:29:54 +02:00
parent 19e007c3f5
commit 1401665129
2 changed files with 24 additions and 9 deletions

View File

@ -8,6 +8,9 @@ namespace JsonGeneratorTests
{ {
TEST_CLASS(JsonArrayTests) TEST_CLASS(JsonArrayTests)
{ {
JsonArray<2> arr;
char buffer[256];
public: public:
TEST_METHOD(Empty) TEST_METHOD(Empty)
@ -146,9 +149,6 @@ namespace JsonGeneratorTests
private: private:
JsonArray<2> arr;
char buffer[256];
void addNested(JsonObjectBase& value) void addNested(JsonObjectBase& value)
{ {
arr.add(value); arr.add(value);

View File

@ -9,17 +9,21 @@ namespace JsonGeneratorTests
TEST_CLASS(JsonHashTableTests) TEST_CLASS(JsonHashTableTests)
{ {
JsonHashTable<2> hash; JsonHashTable<2> hash;
char buffer[256];
public: public:
TEST_METHOD(Empty) TEST_METHOD(Empty)
{ {
returns(2);
jsonIs("{}"); jsonIs("{}");
} }
TEST_METHOD(OneString) TEST_METHOD(OneString)
{ {
addValue("key", "value"); addValue("key", "value");
returns(15);
jsonIs("{\"key\":\"value\"}"); jsonIs("{\"key\":\"value\"}");
} }
@ -27,6 +31,8 @@ namespace JsonGeneratorTests
{ {
addValue("key1", "value1"); addValue("key1", "value1");
addValue("key2", "value2"); addValue("key2", "value2");
returns(33);
jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}"); jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
} }
@ -35,6 +41,8 @@ namespace JsonGeneratorTests
addValue("key1", "value1"); addValue("key1", "value1");
addValue("key2", "value2"); addValue("key2", "value2");
addValue("key3", "value3"); addValue("key3", "value3");
returns(33);
jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}"); jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
} }
@ -42,6 +50,7 @@ namespace JsonGeneratorTests
{ {
addValue("pi", 3.14); addValue("pi", 3.14);
returns(11);
jsonIs("{\"pi\":3.14}"); jsonIs("{\"pi\":3.14}");
} }
@ -49,6 +58,7 @@ namespace JsonGeneratorTests
{ {
addValue("key", (char*) 0); addValue("key", (char*) 0);
returns(12);
jsonIs("{\"key\":null}"); jsonIs("{\"key\":null}");
} }
@ -56,6 +66,7 @@ namespace JsonGeneratorTests
{ {
addValue("key", true); addValue("key", true);
returns(12);
jsonIs("{\"key\":true}"); jsonIs("{\"key\":true}");
} }
@ -63,24 +74,25 @@ namespace JsonGeneratorTests
{ {
addValue("key", false); addValue("key", false);
returns(13);
jsonIs("{\"key\":false}"); jsonIs("{\"key\":false}");
} }
TEST_METHOD(OneEmptyNestedArray) TEST_METHOD(OneEmptyNestedArray)
{ {
JsonArray<1> nestedArray; JsonArray<1> nestedArray;
addNested("key", nestedArray); addNested("key", nestedArray);
returns(10);
jsonIs("{\"key\":[]}"); jsonIs("{\"key\":[]}");
} }
TEST_METHOD(OneEmptyNestedHash) TEST_METHOD(OneEmptyNestedHash)
{ {
JsonHashTable<1> nestedHash; JsonHashTable<1> nestedHash;
addNested("key", nestedHash); addNested("key", nestedHash);
returns(10);
jsonIs("{\"key\":{}}"); jsonIs("{\"key\":{}}");
} }
@ -99,11 +111,14 @@ namespace JsonGeneratorTests
void jsonIs(const char* expected) void jsonIs(const char* expected)
{ {
char buffer[256];
hash.writeTo(buffer, sizeof(buffer)); hash.writeTo(buffer, sizeof(buffer));
Assert::AreEqual(expected, buffer); Assert::AreEqual(expected, buffer);
} }
void returns(size_t expected)
{
size_t actual = hash.writeTo(buffer, sizeof(buffer));
Assert::AreEqual(expected, actual);
}
}; };
} }