Martchus
/
reflective-rapidjson
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test with size_t (defined in Clang's builtin headers)

This commit is contained in:
Martchus 2018-02-03 16:14:20 +01:00
parent 2098ff702e
commit f0870d3a54
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
generator/tests/jsongenerator.cpp
View File

@ -107,9 +107,11 @@ void JsonGeneratorTests::testIncludingGeneratedHeader()
{ {
TestStruct test; TestStruct test;
test.someInt = 42; test.someInt = 42;
test.someSize = 0xAAAAAAAA;
test.someString = "the answer"; test.someString = "the answer";
test.yetAnotherString = "but what was the question"; test.yetAnotherString = "but what was the question";
const string expectedJSON("{\"someInt\":42,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\"}"); const string expectedJSON(
"{\"someInt\":42,\"someSize\":2863311530,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\"}");
// test serialization // test serialization
CPPUNIT_ASSERT_EQUAL(expectedJSON, string(test.toJson().GetString())); CPPUNIT_ASSERT_EQUAL(expectedJSON, string(test.toJson().GetString()));
@ -117,6 +119,7 @@ void JsonGeneratorTests::testIncludingGeneratedHeader()
// test deserialization // test deserialization
const TestStruct parsedTest(TestStruct::fromJson(expectedJSON)); const TestStruct parsedTest(TestStruct::fromJson(expectedJSON));
CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt); CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt);
CPPUNIT_ASSERT_EQUAL(test.someSize, parsedTest.someSize);
CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString); CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString);
CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString); CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString);
} }
@ -128,13 +131,15 @@ void JsonGeneratorTests::testNesting()
{ {
TestStruct test; TestStruct test;
test.someInt = 42; test.someInt = 42;
test.someSize = 0xAAAAAAAA;
test.someString = "the answer"; test.someString = "the answer";
test.yetAnotherString = "but what was the question"; test.yetAnotherString = "but what was the question";
NestedTestStruct nested; NestedTestStruct nested;
nested.nested.emplace_front(vector<TestStruct>{ test }); nested.nested.emplace_front(vector<TestStruct>{ test });
nested.deq.emplace_back(3.14); nested.deq.emplace_back(3.14);
const string expectedJSON("{\"nested\":[[{\"someInt\":42,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the " const string expectedJSON(
"question\"}]],\"ptr\":null,\"deq\":[3.14]}"); "{\"nested\":[[{\"someInt\":42,\"someSize\":2863311530,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the "
"question\"}]],\"ptr\":null,\"deq\":[3.14]}");
// test serialization // test serialization
CPPUNIT_ASSERT_EQUAL(expectedJSON, string(nested.toJson().GetString())); CPPUNIT_ASSERT_EQUAL(expectedJSON, string(nested.toJson().GetString()));
@ -146,6 +151,7 @@ void JsonGeneratorTests::testNesting()
CPPUNIT_ASSERT_EQUAL(1_st, parsedNested.deq.size()); CPPUNIT_ASSERT_EQUAL(1_st, parsedNested.deq.size());
const TestStruct &parsedTest(parsedNested.nested.front().front()); const TestStruct &parsedTest(parsedNested.nested.front().front());
CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt); CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt);
CPPUNIT_ASSERT_EQUAL(test.someSize, parsedTest.someSize);
CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString); CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString);
CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString); CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString);
CPPUNIT_ASSERT_EQUAL(3.14, parsedNested.deq.front()); CPPUNIT_ASSERT_EQUAL(3.14, parsedNested.deq.front());
@ -158,12 +164,14 @@ void JsonGeneratorTests::testSingleInheritence()
{ {
DerivedTestStruct test; DerivedTestStruct test;
test.someInt = 42; test.someInt = 42;
test.someSize = 5;
test.someString = "the answer"; test.someString = "the answer";
test.yetAnotherString = "but what was the question"; test.yetAnotherString = "but what was the question";
test.someBool = false; test.someBool = false;
const string expectedJSONForBase("{\"someInt\":42,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\"}"); const string expectedJSONForBase(
"{\"someInt\":42,\"someSize\":5,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\"}");
const string expectedJSONForDerived( const string expectedJSONForDerived(
"{\"someInt\":42,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\",\"someBool\":false}"); "{\"someInt\":42,\"someSize\":5,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the question\",\"someBool\":false}");
// test serialization // test serialization
CPPUNIT_ASSERT_EQUAL(expectedJSONForBase, string(as<TestStruct>(test).toJson().GetString())); CPPUNIT_ASSERT_EQUAL(expectedJSONForBase, string(as<TestStruct>(test).toJson().GetString()));
@ -172,6 +180,7 @@ void JsonGeneratorTests::testSingleInheritence()
// test deserialization // test deserialization
const DerivedTestStruct parsedTest(JsonSerializable<DerivedTestStruct>::fromJson(expectedJSONForDerived)); const DerivedTestStruct parsedTest(JsonSerializable<DerivedTestStruct>::fromJson(expectedJSONForDerived));
CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt); CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt);
CPPUNIT_ASSERT_EQUAL(test.someSize, parsedTest.someSize);
CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString); CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString);
CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString); CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString);
CPPUNIT_ASSERT_EQUAL(test.someBool, parsedTest.someBool); CPPUNIT_ASSERT_EQUAL(test.someBool, parsedTest.someBool);
@ -184,12 +193,14 @@ void JsonGeneratorTests::testMultipleInheritence()
{ {
MultipleDerivedTestStruct test; MultipleDerivedTestStruct test;
test.someInt = 42; test.someInt = 42;
test.someSize = 4294967274;
test.someString = "the answer"; test.someString = "the answer";
test.yetAnotherString = "but what was the question"; test.yetAnotherString = "but what was the question";
test.someBool = false; test.someBool = false;
test.arrayOfStrings = { "array", "of", "strings" }; test.arrayOfStrings = { "array", "of", "strings" };
const string expectedJSONForDerived("{\"someInt\":42,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the " const string expectedJSONForDerived(
"question\",\"arrayOfStrings\":[\"array\",\"of\",\"strings\"],\"someBool\":false}"); "{\"someInt\":42,\"someSize\":4294967274,\"someString\":\"the answer\",\"yetAnotherString\":\"but what was the "
"question\",\"arrayOfStrings\":[\"array\",\"of\",\"strings\"],\"someBool\":false}");
// test serialization // test serialization
CPPUNIT_ASSERT_EQUAL(expectedJSONForDerived, string(as<MultipleDerivedTestStruct>(test).toJson().GetString())); CPPUNIT_ASSERT_EQUAL(expectedJSONForDerived, string(as<MultipleDerivedTestStruct>(test).toJson().GetString()));
@ -197,6 +208,7 @@ void JsonGeneratorTests::testMultipleInheritence()
// test deserialization // test deserialization
const MultipleDerivedTestStruct parsedTest(JsonSerializable<MultipleDerivedTestStruct>::fromJson(expectedJSONForDerived)); const MultipleDerivedTestStruct parsedTest(JsonSerializable<MultipleDerivedTestStruct>::fromJson(expectedJSONForDerived));
CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt); CPPUNIT_ASSERT_EQUAL(test.someInt, parsedTest.someInt);
CPPUNIT_ASSERT_EQUAL(test.someSize, parsedTest.someSize);
CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString); CPPUNIT_ASSERT_EQUAL(test.someString, parsedTest.someString);
CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString); CPPUNIT_ASSERT_EQUAL(test.yetAnotherString, parsedTest.yetAnotherString);
CPPUNIT_ASSERT_EQUAL(test.someBool, parsedTest.someBool); CPPUNIT_ASSERT_EQUAL(test.someBool, parsedTest.someBool);

1
generator/tests/structs.h
View File

@ -25,6 +25,7 @@ using namespace ReflectiveRapidJSON;
*/ */
struct TestStruct : public JsonSerializable<TestStruct> { struct TestStruct : public JsonSerializable<TestStruct> {
int someInt = 0; int someInt = 0;
size_t someSize = 1;
string someString = "foo"; string someString = "foo";
string yetAnotherString = "bar"; string yetAnotherString = "bar";
static constexpr const char *staticMember = "static members are just ignored"; static constexpr const char *staticMember = "static members are just ignored";