diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-09 00:23:16 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-01-09 00:23:16 +0000 |
| commit | bfea0319aa07ad2c921ba29ba216e921d65f2ed1 (patch) | |
| tree | 8a61e8b5a1280445c94d1443205cc1d2a5a23736 /test | |
| parent | Fix test-persistence dependencies (diff) | |
| download | ilt-bfea0319aa07ad2c921ba29ba216e921d65f2ed1.tar.bz2 ilt-bfea0319aa07ad2c921ba29ba216e921d65f2ed1.tar.xz ilt-bfea0319aa07ad2c921ba29ba216e921d65f2ed1.zip | |
Integer support in persistence
Splits bool and arithmatic types, pass arithmatic values as string views from JSON and
parse according to the target type.
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/json/load_object.json | 5 | ||||
| -rw-r--r-- | test/test-persistence.cpp | 9 | ||||
| -rw-r--r-- | test/testStructures.cpp | 4 | ||||
| -rw-r--r-- | test/testStructures.h | 1 |
4 files changed, 14 insertions, 5 deletions
diff --git a/test/fixtures/json/load_object.json b/test/fixtures/json/load_object.json index c622885..5848e87 100644 --- a/test/fixtures/json/load_object.json +++ b/test/fixtures/json/load_object.json @@ -8,6 +8,11 @@ 6.28, 1.57 ], + "gpos": [ + 2147483647, + 2147483646, + -2147483648 + ], "flts": [ 3.14, 6.28, diff --git a/test/test-persistence.cpp b/test/test-persistence.cpp index abb68c2..ce53f72 100644 --- a/test/test-persistence.cpp +++ b/test/test-persistence.cpp @@ -42,6 +42,9 @@ BOOST_FIXTURE_TEST_CASE(load_object, JPP) BOOST_CHECK_CLOSE(to->pos[0], 3.14, 0.01); BOOST_CHECK_CLOSE(to->pos[1], 6.28, 0.01); BOOST_CHECK_CLOSE(to->pos[2], 1.57, 0.01); + BOOST_CHECK_EQUAL(to->gpos[0], 2147483647); + BOOST_CHECK_EQUAL(to->gpos[1], 2147483646); + BOOST_CHECK_EQUAL(to->gpos[2], -2147483648); BOOST_REQUIRE_EQUAL(to->flts.size(), 6); BOOST_CHECK_CLOSE(to->flts[0], 3.14, 0.01); BOOST_CHECK_CLOSE(to->flts[1], 6.28, 0.01); @@ -255,7 +258,7 @@ BOOST_AUTO_TEST_CASE(write_test_dfl) std::stringstream ss; Persistence::JsonWritePersistence {ss}.saveState(to); BOOST_CHECK_EQUAL(ss.str(), - R"({"p.typeid":"TestObject","flt":0,"str":"","bl":false,"pos":[0,0,0],"flts":[],"poss":[],"nest":[],"vptr":[]})"); + R"({"p.typeid":"TestObject","flt":0,"str":"","bl":false,"pos":[0,0,0],"gpos":[0,0,0],"flts":[],"poss":[],"nest":[],"vptr":[]})"); } BOOST_FIXTURE_TEST_CASE(write_test_loaded, JPP) @@ -264,7 +267,7 @@ BOOST_FIXTURE_TEST_CASE(write_test_loaded, JPP) std::stringstream ss; Persistence::JsonWritePersistence {ss}.saveState(to); BOOST_CHECK_EQUAL(ss.str(), - R"({"p.typeid":"TestObject","flt":3.14,"str":"Lovely string","bl":true,"pos":[3.14,6.28,1.57],"flts":[3.14,6.28,1.57,0,-1,-3.14],"poss":[[3.14,6.28,1.57],[0,-1,-3.14]],"nest":[[["a","b"],["c","d","e"]],[["f"]],[]],"ptr":{"p.typeid":"TestObject","flt":3.14,"str":"Lovely string","bl":false,"pos":[0,0,0],"flts":[],"poss":[],"nest":[],"vptr":[]},"vptr":[]})"); + R"({"p.typeid":"TestObject","flt":3.14,"str":"Lovely string","bl":true,"pos":[3.14,6.28,1.57],"gpos":[2147483647,2147483646,-2147483648],"flts":[3.14,6.28,1.57,0,-1,-3.14],"poss":[[3.14,6.28,1.57],[0,-1,-3.14]],"nest":[[["a","b"],["c","d","e"]],[["f"]],[]],"ptr":{"p.typeid":"TestObject","flt":3.14,"str":"Lovely string","bl":false,"pos":[0,0,0],"gpos":[0,0,0],"flts":[],"poss":[],"nest":[],"vptr":[]},"vptr":[]})"); } BOOST_FIXTURE_TEST_CASE(write_test_loaded_abs, JPP) @@ -273,7 +276,7 @@ BOOST_FIXTURE_TEST_CASE(write_test_loaded_abs, JPP) std::stringstream ss; Persistence::JsonWritePersistence {ss}.saveState(to); BOOST_CHECK_EQUAL(ss.str(), - R"({"p.typeid":"TestObject","flt":0,"str":"","bl":false,"pos":[0,0,0],"flts":[],"poss":[],"nest":[],"aptr":{"p.typeid":"SubObject","base":"set base","sub":"set sub"},"vptr":[]})"); + R"({"p.typeid":"TestObject","flt":0,"str":"","bl":false,"pos":[0,0,0],"gpos":[0,0,0],"flts":[],"poss":[],"nest":[],"aptr":{"p.typeid":"SubObject","base":"set base","sub":"set sub"},"vptr":[]})"); } BOOST_FIXTURE_TEST_CASE(write_test_loaded_shared, JPP) diff --git a/test/testStructures.cpp b/test/testStructures.cpp index 469ec37..fd07158 100644 --- a/test/testStructures.cpp +++ b/test/testStructures.cpp @@ -38,8 +38,8 @@ bool TestObject::persist(Persistence::PersistenceStore & store) { return STORE_TYPE && STORE_MEMBER(flt) && STORE_MEMBER(str) && STORE_MEMBER(bl) && STORE_MEMBER(pos) - && STORE_MEMBER(flts) && STORE_MEMBER(poss) && STORE_MEMBER(nest) && STORE_MEMBER(ptr) && STORE_MEMBER(aptr) - && STORE_MEMBER(vptr); + && STORE_MEMBER(gpos) && STORE_MEMBER(flts) && STORE_MEMBER(poss) && STORE_MEMBER(nest) && STORE_MEMBER(ptr) + && STORE_MEMBER(aptr) && STORE_MEMBER(vptr); } void diff --git a/test/testStructures.h b/test/testStructures.h index 064c00c..4eb4764 100644 --- a/test/testStructures.h +++ b/test/testStructures.h @@ -33,6 +33,7 @@ struct TestObject : public Persistence::Persistable { std::string str {}; bool bl {}; RelativePosition3D pos {}; + GlobalPosition3D gpos {}; std::vector<float> flts; std::vector<RelativePosition3D> poss; std::vector<std::vector<std::vector<std::string>>> nest; |