|
|
@@ -15,7 +15,6 @@ namespace JsonGeneratorTests
|
|
|
|
|
|
TEST_METHOD(Empty)
|
|
|
{
|
|
|
- returnValueIs(2);
|
|
|
jsonIs("{}");
|
|
|
}
|
|
|
|
|
|
@@ -23,7 +22,6 @@ namespace JsonGeneratorTests
|
|
|
{
|
|
|
addValue("key", "value");
|
|
|
|
|
|
- returnValueIs(15);
|
|
|
jsonIs("{\"key\":\"value\"}");
|
|
|
}
|
|
|
|
|
|
@@ -32,7 +30,6 @@ namespace JsonGeneratorTests
|
|
|
addValue("key1", "value1");
|
|
|
addValue("key2", "value2");
|
|
|
|
|
|
- returnValueIs(33);
|
|
|
jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
|
|
|
}
|
|
|
|
|
|
@@ -42,39 +39,36 @@ namespace JsonGeneratorTests
|
|
|
addValue("key2", "value2");
|
|
|
addValue("key3", "value3");
|
|
|
|
|
|
- returnValueIs(33);
|
|
|
jsonIs("{\"key1\":\"value1\",\"key2\":\"value2\"}");
|
|
|
}
|
|
|
|
|
|
TEST_METHOD(OneInteger)
|
|
|
{
|
|
|
addValue("key", 1);
|
|
|
-
|
|
|
- returnValueIs(9);
|
|
|
jsonIs("{\"key\":1}");
|
|
|
}
|
|
|
|
|
|
+ TEST_METHOD(OneDouble)
|
|
|
+ {
|
|
|
+ addValue("key", 3.14159265358979323846, 4);
|
|
|
+ jsonIs("{\"key\":3.1416}");
|
|
|
+ }
|
|
|
+
|
|
|
TEST_METHOD(OneNull)
|
|
|
{
|
|
|
addValue("key", (char*) 0);
|
|
|
-
|
|
|
- returnValueIs(12);
|
|
|
jsonIs("{\"key\":null}");
|
|
|
}
|
|
|
|
|
|
TEST_METHOD(OneTrue)
|
|
|
{
|
|
|
addValue("key", true);
|
|
|
-
|
|
|
- returnValueIs(12);
|
|
|
jsonIs("{\"key\":true}");
|
|
|
}
|
|
|
|
|
|
TEST_METHOD(OneFalse)
|
|
|
{
|
|
|
addValue("key", false);
|
|
|
-
|
|
|
- returnValueIs(13);
|
|
|
jsonIs("{\"key\":false}");
|
|
|
}
|
|
|
|
|
|
@@ -83,7 +77,6 @@ namespace JsonGeneratorTests
|
|
|
JsonArray<1> nestedArray;
|
|
|
addNested("key", nestedArray);
|
|
|
|
|
|
- returnValueIs(10);
|
|
|
jsonIs("{\"key\":[]}");
|
|
|
}
|
|
|
|
|
|
@@ -92,7 +85,6 @@ namespace JsonGeneratorTests
|
|
|
JsonHashTable<1> nestedHash;
|
|
|
addNested("key", nestedHash);
|
|
|
|
|
|
- returnValueIs(10);
|
|
|
jsonIs("{\"key\":{}}");
|
|
|
}
|
|
|
|
|
|
@@ -109,16 +101,16 @@ namespace JsonGeneratorTests
|
|
|
hash.add(key, value);
|
|
|
}
|
|
|
|
|
|
- void jsonIs(const char* expected)
|
|
|
- {
|
|
|
- hash.printTo(buffer, sizeof(buffer));
|
|
|
- Assert::AreEqual(expected, buffer);
|
|
|
+ void addValue(const char* key, double value, int digits)
|
|
|
+ {
|
|
|
+ hash.add(key, value, digits);
|
|
|
}
|
|
|
|
|
|
- void returnValueIs(size_t expected)
|
|
|
- {
|
|
|
+ void jsonIs(const char* expected)
|
|
|
+ {
|
|
|
size_t actual = hash.printTo(buffer, sizeof(buffer));
|
|
|
- Assert::AreEqual(expected, actual);
|
|
|
+ Assert::AreEqual(expected, buffer);
|
|
|
+ Assert::AreEqual(strlen(expected), actual);
|
|
|
}
|
|
|
};
|
|
|
}
|