summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test-persistance.cpp328
1 files changed, 108 insertions, 220 deletions
diff --git a/test/test-persistance.cpp b/test/test-persistance.cpp
index 7d66675..b6bde3f 100644
--- a/test/test-persistance.cpp
+++ b/test/test-persistance.cpp
@@ -2,237 +2,97 @@
#include <boost/test/unit_test.hpp>
-#include <gfx/models/vertex.hpp>
+#include <functional>
#include <glm/glm.hpp>
+#include <iosfwd>
#include <jsonParse.h>
-#include <maths.h>
#include <memory>
-#include <stack>
-#include <stream_support.hpp>
-#include <utility>
-#include <variant>
+#include <persistance.h>
+#include <string>
#include <vector>
-struct PersistanceStore;
-struct Selection;
-using SelectionPtr = std::unique_ptr<Selection>;
-struct Selection {
- virtual ~Selection() = default;
- virtual void
- operator()(float &)
- {
- throw std::runtime_error("Unexpected float");
- }
- virtual void
- operator()(bool &)
- {
- throw std::runtime_error("Unexpected bool");
- }
- virtual void
- operator()(const std::nullptr_t &)
- {
- throw std::runtime_error("Unexpected null");
- }
- virtual void
- operator()(std::string &)
- {
- throw std::runtime_error("Unexpected string");
- }
- virtual void
- BeginArray()
- {
- throw std::runtime_error("Unexpected array");
- }
- virtual SelectionPtr
- BeginObject()
- {
- throw std::runtime_error("Unexpected object");
- }
- virtual SelectionPtr select(std::string)
- {
- throw std::runtime_error("Unexpected persist");
- }
-};
-
-template<typename T> struct SelectionT : public Selection {
- SelectionT(T & value) : v {value} { }
- void
- operator()(T & evalue) override
- {
- std::swap(v, evalue);
- }
- T & v;
-};
-
-template<glm::length_t L, glm::qualifier Q> struct SelectionT<glm::vec<L, float, Q>> : public Selection {
- SelectionT(glm::vec3 & value) : v {value}
- {
- CLOG(__PRETTY_FUNCTION__);
- }
- void
- operator()(float & value) override
- {
- v[idx++] = value;
- }
- void
- BeginArray() override
- {
- }
- glm::vec3 & v;
- glm::vec3::length_type idx {0};
-};
-
-template<typename T> struct SelectionT<std::vector<T>> : public Selection {
- SelectionT(std::vector<T> & value) : v {value} { }
- void
- operator()(T & value) override
- {
- v.push_back(value);
- }
- void
- BeginArray()
- {
- }
- std::vector<T> & v;
-};
-
struct TestObject;
-template<typename Ptr> struct MakeObjectByTypeName : public Selection {
- MakeObjectByTypeName(Ptr & o) : o {o} { }
- virtual void
- operator()(std::string &)
- {
- o = std::make_unique<TestObject>(); // TODO shared_ptr
- }
- Ptr & o;
-};
+namespace Persistanace {
+ struct JsonLoadPersistanceStore : public json::jsonParser {
+ explicit JsonLoadPersistanceStore(std::istream & in) : json::jsonParser {&in} { }
-struct PersistanceStore {
- // virtual bool persistType(const std::type_info &) = 0;
- template<typename T>
- bool
- persistValue(const std::string_view & key, T & value)
- {
- if (key == name) {
- sel = std::make_unique<SelectionT<T>>(std::ref(value));
- return false;
- }
- return true;
- }
- const std::string & name;
- std::unique_ptr<Selection> sel {};
-};
+ Stack stk;
-template<typename Ptr> struct SelectionObj : public Selection {
- SelectionObj(Ptr & o) : v {o} { }
+ inline SelectionPtr &
+ current()
+ {
+ return stk.top();
+ }
- SelectionPtr
- select(std::string mbr) override
- {
- if (mbr == "@typeid") {
- return std::make_unique<MakeObjectByTypeName<Ptr>>(std::ref(v));
+ template<typename T>
+ void
+ loadState(std::unique_ptr<T> & t)
+ {
+ stk.push(std::make_unique<SelectionT<std::unique_ptr<T>>>(std::ref(t)));
+ yy_push_state(0);
+ yylex();
}
- else if (v) {
- CLOG(mbr);
- PersistanceStore ps {mbr};
- v->persist(ps);
- return std::move(ps.sel);
+ void
+ BeginObject() override
+ {
+ stk.push(current()->BeginObject());
}
- throw std::runtime_error("cannot select member of null object");
- }
-
- Ptr & v;
-};
-
-template<typename T> struct SelectionT<std::unique_ptr<T>> : public Selection {
- SelectionT(std::unique_ptr<T> & o) : v {o} { }
- SelectionPtr
- BeginObject() override
- {
- CLOG(__PRETTY_FUNCTION__);
- return std::make_unique<SelectionObj<std::unique_ptr<T>>>(v);
- }
- std::unique_ptr<T> & v;
-};
-
-struct Persistable {
- virtual void persist(PersistanceStore & store) = 0;
-};
-
-struct JsonLoadPersistanceStore : public json::jsonParser {
- JsonLoadPersistanceStore(std::istream & in) : json::jsonParser {&in} { }
-
- std::stack<std::unique_ptr<Selection>> stk;
- std::unique_ptr<Selection> selection;
-
- template<typename T>
- void
- loadState(std::unique_ptr<T> & t)
- {
- yy_push_state(0);
- stk.push(std::make_unique<SelectionT<std::unique_ptr<T>>>(std::ref(t)));
- yylex();
- }
- void
- BeginObject() override
- {
- CLOG(__FUNCTION__);
- stk.push(stk.top()->BeginObject());
- }
- void
- BeginArray() override
- {
- CLOG(__FUNCTION__);
- selection->BeginArray();
- }
- void
- PushBoolean(bool value) override
- {
- CLOG(__FUNCTION__);
- (*selection)(value);
- }
- void
- PushNumber(float value) override
- {
- CLOG(__FUNCTION__);
- (*selection)(value);
- }
- void
- PushNull() override
- {
- CLOG(__FUNCTION__);
- (*selection)(nullptr);
- }
- void
- PushText(std::string && value) override
- {
- CLOG(__FUNCTION__);
- (*selection)(value);
- }
- void
- PushKey(std::string && k) override
- {
- CLOG(__FUNCTION__);
- selection = stk.top()->select(std::move(k));
- }
- void
- EndArray() override
- {
- CLOG(__FUNCTION__);
- }
- void
- EndObject() override
- {
- CLOG(__FUNCTION__);
- stk.pop();
- }
-};
+ void
+ BeginArray() override
+ {
+ current()->BeginArray(stk);
+ }
+ template<typename T>
+ inline void
+ PushValue(T && value)
+ {
+ current()->beforeValue(stk);
+ (*current())(value);
+ stk.pop();
+ }
+ void
+ PushBoolean(bool value) override
+ {
+ PushValue(value);
+ }
+ void
+ PushNumber(float value) override
+ {
+ PushValue(value);
+ }
+ void
+ PushNull() override
+ {
+ PushValue(nullptr);
+ }
+ void
+ PushText(std::string && value) override
+ {
+ PushValue(value);
+ }
+ void
+ PushKey(std::string && k) override
+ {
+ stk.push(current()->select(k));
+ }
+ void
+ EndArray() override
+ {
+ stk.pop();
+ }
+ void
+ EndObject() override
+ {
+ stk.pop();
+ }
+ };
+}
#define STORE_TYPE store.persistType(typeid(*this))
-#define STORE_MEMBER(mbr) store.persistValue(#mbr##sv, mbr)
+#define STORE_MEMBER(mbr) store.persistValue(#mbr, mbr)
-struct TestObject : public Persistable {
+struct TestObject : public Persistanace::Persistable {
TestObject() = default;
float flt {};
@@ -240,12 +100,15 @@ struct TestObject : public Persistable {
bool bl {};
glm::vec3 pos {};
std::vector<float> flts;
+ std::vector<glm::vec3> poss;
+ std::vector<std::vector<std::vector<std::string>>> nest;
+ std::unique_ptr<TestObject> ptr;
void
- persist(PersistanceStore & store) override
+ persist(Persistanace::PersistanceStore & store) override
{
- using namespace std::literals;
- STORE_MEMBER(flt) && STORE_MEMBER(str) && STORE_MEMBER(bl) && STORE_MEMBER(pos) && STORE_MEMBER(flts);
+ STORE_MEMBER(flt) && STORE_MEMBER(str) && STORE_MEMBER(bl) && STORE_MEMBER(pos) && STORE_MEMBER(flts)
+ && STORE_MEMBER(poss) && STORE_MEMBER(nest) && STORE_MEMBER(ptr);
}
};
@@ -256,12 +119,20 @@ const std::string input(R"J({
"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": {
+ "@typeid": "TestObject",
+ "flt": 3.14,
+ "str": "Lovely string",
+ },
})J");
BOOST_AUTO_TEST_CASE(load_object)
{
+ Persistanace::Persistable::addFactory("TestObject", std::make_unique<TestObject>);
std::stringstream ss {input};
- JsonLoadPersistanceStore jlps {ss};
+ Persistanace::JsonLoadPersistanceStore jlps {ss};
std::unique_ptr<TestObject> to;
jlps.loadState(to);
@@ -278,4 +149,21 @@ BOOST_AUTO_TEST_CASE(load_object)
BOOST_CHECK_CLOSE(to->flts[3], 0, 0.01);
BOOST_CHECK_CLOSE(to->flts[4], -1, 0.01);
BOOST_CHECK_CLOSE(to->flts[5], -3.14, 0.01);
+ BOOST_REQUIRE_EQUAL(to->poss.size(), 2);
+ BOOST_CHECK_CLOSE(to->poss[0][0], 3.14, 0.01);
+ BOOST_CHECK_CLOSE(to->poss[0][1], 6.28, 0.01);
+ BOOST_CHECK_CLOSE(to->poss[0][2], 1.57, 0.01);
+ BOOST_CHECK_CLOSE(to->poss[1][0], 0, 0.01);
+ BOOST_CHECK_CLOSE(to->poss[1][1], -1, 0.01);
+ BOOST_CHECK_CLOSE(to->poss[1][2], -3.14, 0.01);
+ BOOST_REQUIRE_EQUAL(to->nest.size(), 3);
+ BOOST_REQUIRE_EQUAL(to->nest.at(0).size(), 2);
+ BOOST_REQUIRE_EQUAL(to->nest.at(0).at(0).size(), 2);
+ BOOST_REQUIRE_EQUAL(to->nest.at(0).at(1).size(), 3);
+ BOOST_REQUIRE_EQUAL(to->nest.at(1).size(), 1);
+ BOOST_REQUIRE_EQUAL(to->nest.at(1).at(0).size(), 1);
+ BOOST_REQUIRE_EQUAL(to->nest.at(2).size(), 0);
+ BOOST_REQUIRE(to->ptr);
+ BOOST_CHECK_CLOSE(to->ptr->flt, 3.14, 0.01);
+ BOOST_CHECK_EQUAL(to->ptr->str, "Lovely string");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:26:04 +0000