(); @@ -19,6 +26,119 @@ void EmTest::cleanupTestCase() { } } +void EmTest::testChainedHeritageCreate() { +// QList> groups; +// QList> childListAAA; +// QList> grandChildListBBB; +// QList> greatGrandChildListCCC; + + auto testPerson = QSharedPointer(new TestPerson()); + auto testPupil = QSharedPointer(new TestPupil()); + auto testPupilChild = QSharedPointer(new TestPupilChild()); + auto testPupilGrandChild = QSharedPointer(new TestPupilGrandChild()); + auto testPupilGreatGrandChild = QSharedPointer(new TestPupilGreatGrandChild()); + + QVERIFY(this->e->save(testPerson)); + QVERIFY(this->e->save(testPupil)); + QVERIFY(this->e->save(testPupilChild)); + QVERIFY(this->e->save(testPupilGrandChild)); + QVERIFY(this->e->save(testPupilGreatGrandChild)); + + auto tim = QSharedPointer(new TestPupilGreatGrandChild()); +// //set TestPerson's properties +// tim->setFirstName("Tim"); +// tim->setFamilyName("Thaler"); +// tim->setNickName("Timmy"); +// tim->setBirthday(QDate(1973,3,8)); +// tim->setGender(TestPerson::Gender::MALE); +// tim->setCustomPictureFileName("someFile.jpg"); + +// //set TestPupil's properties +// tim->setLegalGuardianNote("lost his parens, lives with stepmother"); +// tim->setGroups(groups); + +// //setTestPupilChild's properties +// tim->setChildPropertyString("childPropertyStringAAA"); +// tim->setChildPropertyPersons(childListAAA); + +// //setTestPupilGrandChild's properties +// tim->setGrandChildPropertyString("grandChildPropertyStringBBB"); +// tim->setGrandChildPropertyPersons(grandChildListBBB); + +// //setTestPupilGreatGrandChild's properties +// tim->setGreatGrandChildPropertyString("greatGrandChildPropertyStringCCC"); +// tim->setGrandChildPropertyPersons(greatGrandChildListCCC); + + QVERIFY(this->e->save(tim)); +} + +void EmTest::testChainedHeritageUpdate() +{ +// auto albert = QSharedPointer (new TestPupil()); +// albert->setFirstName("Albert"); +// albert->setFamilyName("Einstein"); +// auto bette = QSharedPointer (new TestPupil()); +// bette->setFirstName("Bette"); +// bette->setFamilyName("Middler"); +// auto cassandra = QSharedPointer (new TestPupil()); +// cassandra ->setFirstName("Cassandra "); +// cassandra ->setFamilyName("Wilson"); +// auto dean = QSharedPointer (new TestPupil()); +// dean ->setFirstName("Dean "); +// dean ->setFamilyName("Martin"); + +// auto group1 = QSharedPointer(new TestGroup()); +// group1->setName("group one"); +// auto group2 = QSharedPointer(new TestGroup()); +// group1->setName("group two"); + +// QList> groups; +// groups << group1; +// groups << group2; + +// QList> childListAAA; +// childListAAA << albert; +// childListAAA << bette; +// childListAAA << cassandra; +// childListAAA << dean; + +// QList> grandChildListBBB; +// grandChildListBBB << bette; +// grandChildListBBB << cassandra; +// grandChildListBBB << dean; + +// QList> greatGrandChildListCCC; +// greatGrandChildListCCC << cassandra; +// greatGrandChildListCCC << dean; + + auto tim = QSharedPointer(new TestPupilGreatGrandChild()); +// //set TestPerson's properties +// tim->setFirstName("Tim"); +// tim->setFamilyName("Thaler"); +// tim->setNickName("Timmy"); +// tim->setBirthday(QDate(1973,3,8)); +// tim->setGender(TestPerson::Gender::MALE); +// tim->setCustomPictureFileName("someFile.jpg"); + +// //set TestPupil's properties +// tim->setLegalGuardianNote("lost his parens, lives with stepmother"); +// tim->setGroups(groups); + +// //setTestPupilChild's properties +// tim->setChildPropertyString("childPropertyStringAAA"); +// tim->setChildPropertyPersons(childListAAA); + +// //setTestPupilGrandChild's properties +// tim->setGrandChildPropertyString("grandChildPropertyStringBBB"); +// tim->setGrandChildPropertyPersons(grandChildListBBB); + +// //setTestPupilGreatGrandChild's properties +// tim->setGreatGrandChildPropertyString("greatGrandChildPropertyStringCCC"); +// tim->setGrandChildPropertyPersons(greatGrandChildListCCC); + + QVERIFY(this->e->save(tim)); + qDebug()<<"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"; +} void EmTest::testCheckDuplicates() { QSharedPointer

article = QSharedPointer

(new Article(10, QString("TestItem"))); diff --git a/tests/em/tst_em.h b/tests/em/tst_em.h index 27cc3d9..cce5306 100644 --- a/tests/em/tst_em.h +++ b/tests/em/tst_em.h @@ -13,6 +13,8 @@ class EmTest : public QObject { private Q_SLOTS: void initTestCase(); void cleanupTestCase(); + void testChainedHeritageCreate(); + void testChainedHeritageUpdate(); void testCheckDuplicates(); void testBasics(); void init(); diff --git a/tests/model/testgroup.cpp b/tests/model/testgroup.cpp new file mode 100644 index 0000000..5cf6436 --- /dev/null +++ b/tests/model/testgroup.cpp @@ -0,0 +1,33 @@ +#include "testgroup.h" +#include "testperson.h" +#include "testpupil.h" +#include + +TestGroup::TestGroup() : Entity() { +} + +const QHash TestGroup::getRelations() const { + auto hash = QHash(); + hash.insert("pupils", CuteEntityManager::Relation( + "pupils", CuteEntityManager::RelationType::MANY_TO_MANY)); + return hash; +} + + +QList > TestGroup::pupils() const { + return m_pupils; +} + +void TestGroup::setPupils(const QList > &pupils) { + m_pupils = pupils; +} + +QString TestGroup::name() const { + return m_name; +} + +void TestGroup::setName(const QString &value) { + m_name = value; +} + + diff --git a/tests/model/testgroup.h b/tests/model/testgroup.h new file mode 100644 index 0000000..51edf50 --- /dev/null +++ b/tests/model/testgroup.h @@ -0,0 +1,42 @@ +#ifndef TESTGROUP_H +#define TESTGROUP_H + +#include +#include "entitymanager.h" + +class TestPupil; +class SeatingPlan; +class TestPerson; +class AppData; + +using namespace CuteEntityManager; + +class TestGroup: public CuteEntityManager::Entity +{ + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(QList> pupils READ pupils WRITE setPupils) + +public: + EM_MACRO(TestGroup) + Q_INVOKABLE TestGroup(); + virtual ~TestGroup() override {} + + QString name() const; + void setName(const QString &value); + + QList > pupils() const; + void setPupils(const QList > &pupils); + QSharedPointer pupilAt(int i) { return m_pupils.at(i); } + void addPupil(QSharedPointer p) {m_pupils.append(p);} + + virtual const QHash getRelations() const override; + +protected: + // members + QString m_name; + QList > m_pupils; +}; + +#endif // TESTGROUP_H diff --git a/tests/model/testperson.cpp b/tests/model/testperson.cpp new file mode 100644 index 0000000..4898cb4 --- /dev/null +++ b/tests/model/testperson.cpp @@ -0,0 +1,13 @@ +#include "testperson.h" + +TestPerson::TestPerson() + : Entity() +{ +} + +const QHash TestPerson::getRelations() const +{ + auto hash = QHash(); + return hash; + +} diff --git a/tests/model/testperson.h b/tests/model/testperson.h new file mode 100644 index 0000000..fb09c70 --- /dev/null +++ b/tests/model/testperson.h @@ -0,0 +1,91 @@ +#ifndef TESTPERSON_H +#define TESTPERSON_H + +#include +#include + +#include "entity.h" +#include "testgroup.h" + +using namespace CuteEntityManager; + +class Gender; +class NameOrder; + +class TestPerson: public Entity +{ + Q_OBJECT + Q_PROPERTY(QString firstName READ firstName WRITE setFirstName) + Q_PROPERTY(QString familyName READ familyName WRITE setFamilyName) + Q_PROPERTY(QString namePrefix READ namePrefix WRITE setNamePrefix) + Q_PROPERTY(QString nickName READ nickName WRITE setNickName) + Q_PROPERTY(QDate birthday READ birthday WRITE setBirthday) + Q_PROPERTY(Gender gender READ gender WRITE setGender) + Q_PROPERTY(QString customPictureFileName READ customPictureFileName WRITE setCustomPictureFileName) + +signals: + void firstNameChanged(); + void familyNameChanged(); + void namePrefixChanged(); + void nickNameChanged(); + void birthdayChanged(); + void genderChanged(); + void customPictureFileNameChanged(); + +public: + EM_MACRO(TestPerson) + + enum class Gender { + MALE = 0, + FEMALE = 1, + UNKNOWNGENDER = -1 + }; + Q_ENUM(Gender) + + enum class NameOrder { + FIRST_FAMILY=0, + FAMILY_FIRST=1 + }; + Q_ENUM(NameOrder) + + + Q_INVOKABLE explicit TestPerson(); + virtual ~TestPerson() override {} + + virtual const QHash getRelations() const override; + + // getters + QString firstName() const {return m_firstName;} + QString familyName() const {return m_familyName;} + QString namePrefix() const {return m_namePrefix;} + QString nickName() const {return m_nickName;} + + QDate birthday() const {return m_birthday;} + Gender gender() const {return m_gender;} + QString customPictureFileName() const {return m_customPictureFileName;} + + // setters + void setFirstName(QString firstName) {m_firstName=firstName; emit firstNameChanged();} + void setFamilyName(QString familyName) {m_familyName=familyName; emit familyNameChanged();} + void setNamePrefix(QString namePrefix) {m_namePrefix=namePrefix; emit namePrefixChanged();} + void setNickName(QString nickName) {m_nickName=nickName; emit nickNameChanged();} + + void setBirthday(QDate birthday) {m_birthday=birthday; emit birthdayChanged();} + void setGender(Gender gender) {m_gender=gender; emit genderChanged();} + void setCustomPictureFileName(QString fileName) {m_customPictureFileName=fileName; emit customPictureFileNameChanged();} + + QList > groups() const; + void setGroups(const QList > &groups); + +protected: + // members + QString m_firstName = QString(); + QString m_familyName = QString(); + QString m_namePrefix = QString(); + QString m_nickName = QString(); + QDate m_birthday = QDate(); + Gender m_gender = Gender::UNKNOWNGENDER; + QString m_customPictureFileName = QString(); +}; + +#endif // TESTPERSON_H diff --git a/tests/model/testpupil.cpp b/tests/model/testpupil.cpp new file mode 100644 index 0000000..426c93b --- /dev/null +++ b/tests/model/testpupil.cpp @@ -0,0 +1,32 @@ +#include "testpupil.h" + +TestPupil::TestPupil() + :TestPerson() +{ +} + +const QHash TestPupil::getRelations() const +{ + auto hash = TestPerson::getRelations(); + hash.insert("groups",Relation("groups",CuteEntityManager::RelationType::MANY_TO_MANY,QString("pupils"))); + return hash; +} +QList > TestPupil::groups() const +{ + return m_groups; +} + +void TestPupil::setGroups(const QList > &groups) +{ + m_groups = groups; +} + +QString TestPupil::legalGuardianNote() const +{ + return m_legalGuardianNote; +} + +void TestPupil::setLegalGuardianNote(const QString &legalGuardianNote) +{ + m_legalGuardianNote = legalGuardianNote; +} diff --git a/tests/model/testpupil.h b/tests/model/testpupil.h new file mode 100644 index 0000000..8fcac1e --- /dev/null +++ b/tests/model/testpupil.h @@ -0,0 +1,29 @@ +#ifndef TESTPUPIL_H +#define TESTPUPIL_H + +#include "testperson.h" + +class TestPupil : public TestPerson +{ + Q_OBJECT + Q_PROPERTY(QString legalGuardianNote READ legalGuardianNote WRITE setLegalGuardianNote) + Q_PROPERTY(QList> groups READ groups WRITE setGroups) +public: + EM_MACRO(TestPupil) + Q_INVOKABLE TestPupil(); + virtual ~TestPupil() override {} + + virtual const QHash getRelations() const override; + + QList > groups() const; + void setGroups(const QList > &groups); + + QString legalGuardianNote() const; + void setLegalGuardianNote(const QString &legalGuardianNote); + +protected: + QString m_legalGuardianNote = QString(); + QList> m_groups = QList>(); +}; + +#endif // TESTPUPIL_H diff --git a/tests/model/testpupilchild.cpp b/tests/model/testpupilchild.cpp new file mode 100644 index 0000000..de76bbd --- /dev/null +++ b/tests/model/testpupilchild.cpp @@ -0,0 +1,32 @@ +#include "testpupilchild.h" + +TestPupilChild::TestPupilChild() : TestPupil() +{ +} + +QString TestPupilChild::childPropertyString() const +{ + return m_childPropertyString; +} + +void TestPupilChild::setChildPropertyString(const QString &childPropertyString) +{ + m_childPropertyString = childPropertyString; +} + +QList > TestPupilChild::childPropertyPersons() const +{ + return m_childPropertyPersons; +} + +void TestPupilChild::setChildPropertyPersons(const QList > &childPropertyPersons) +{ + m_childPropertyPersons = childPropertyPersons; +} + +const QHash TestPupilChild::getRelations() const +{ + auto hash = TestPupil::getRelations(); + hash.insert("childPropertyPersons", Relation("childPropertyPersons",RelationType::MANY_TO_MANY)); + return hash; +} diff --git a/tests/model/testpupilchild.h b/tests/model/testpupilchild.h new file mode 100644 index 0000000..494d8b1 --- /dev/null +++ b/tests/model/testpupilchild.h @@ -0,0 +1,37 @@ +#ifndef TESTPUPILCHILD_H +#define TESTPUPILCHILD_H + +#include +#include "testpupil.h" +#include "entitymanager.h" + +class TestPupilChild : public TestPupil +{ + Q_OBJECT + Q_PROPERTY(QString childPropertyString READ childPropertyString WRITE setChildPropertyString) + Q_PROPERTY(QList> childPropertyPersons READ childPropertyPersons WRITE setChildPropertyPersons) + +public: + EM_MACRO(TestPupilChild) + Q_INVOKABLE TestPupilChild(); + virtual ~TestPupilChild() override {} + + QString childPropertyString() const; + void setChildPropertyString(const QString &childPropertyString); + + QList > childPropertyPersons() const; + void setChildPropertyPersons(const QList > &childPropertyPersons); + + virtual const QHash getRelations() const override; + virtual InheritanceStrategy getInheritanceStrategy() const override { return InheritanceStrategy::JOINED_TABLE; } + +signals: + +public slots: +private: + QString m_childPropertyString = "m_childPropertyString"; + QList> m_childPropertyPersons = QList>(); + +}; + +#endif // TESTPUPILCHILD_H diff --git a/tests/model/testpupilgrandchild.cpp b/tests/model/testpupilgrandchild.cpp new file mode 100644 index 0000000..c04ea92 --- /dev/null +++ b/tests/model/testpupilgrandchild.cpp @@ -0,0 +1,32 @@ +#include "testpupilgrandchild.h" + +TestPupilGrandChild::TestPupilGrandChild() : TestPupilChild() +{ +} + +QString TestPupilGrandChild::grandChildPropertyString() const +{ + return m_grandChildPropertyString; +} + +void TestPupilGrandChild::setGrandChildPropertyString(const QString &grandChildPropertyString) +{ + m_grandChildPropertyString = grandChildPropertyString; +} + +QList > TestPupilGrandChild::grandChildPropertyPersons() const +{ + return m_grandChildPropertyPersons; +} + +void TestPupilGrandChild::setGrandChildPropertyPersons(const QList > &grandChildPropertyPersons) +{ + m_grandChildPropertyPersons = grandChildPropertyPersons; +} + +const QHash TestPupilGrandChild::getRelations() const +{ + auto hash = TestPupilChild::getRelations(); + hash.insert("grandChildPropertyPersons", Relation("grandChildPropertyPersons",RelationType::MANY_TO_MANY)); + return hash; +} diff --git a/tests/model/testpupilgrandchild.h b/tests/model/testpupilgrandchild.h new file mode 100644 index 0000000..e79f174 --- /dev/null +++ b/tests/model/testpupilgrandchild.h @@ -0,0 +1,36 @@ +#ifndef TESTPUPILGRANDCHILD_H +#define TESTPUPILGRANDCHILD_H + +#include +#include "testpupilchild.h" +#include "entitymanager.h" +#include "testpupilchild.h" + +class TestPupilGrandChild : public TestPupilChild +{ + Q_OBJECT + Q_PROPERTY(QString grandChildPropertyString READ grandChildPropertyString WRITE setGrandChildPropertyString) + Q_PROPERTY(QList> grandChildPropertyPersons READ grandChildPropertyPersons WRITE setGrandChildPropertyPersons) + + +public: + EM_MACRO(TestPupilGrandChild) + Q_INVOKABLE TestPupilGrandChild(); + virtual ~TestPupilGrandChild() override {} + + QString grandChildPropertyString() const; + void setGrandChildPropertyString(const QString &grandChildPropertyString); + + QList > grandChildPropertyPersons() const; + void setGrandChildPropertyPersons(const QList > &grandChildPropertyPersons); + + virtual const QHash getRelations() const override; + virtual InheritanceStrategy getInheritanceStrategy() const override { return InheritanceStrategy::JOINED_TABLE; } + +private: + QString m_grandChildPropertyString = "m_grandChildPropertyString"; + QList> m_grandChildPropertyPersons = QList>(); + +}; + +#endif // TESTPUPILGRANDCHILD_H diff --git a/tests/model/testpupilgreatgrandchild.cpp b/tests/model/testpupilgreatgrandchild.cpp new file mode 100644 index 0000000..52ba98d --- /dev/null +++ b/tests/model/testpupilgreatgrandchild.cpp @@ -0,0 +1,33 @@ +#include "testpupilgreatgrandchild.h" + +TestPupilGreatGrandChild::TestPupilGreatGrandChild() : TestPupilGrandChild() +{ +} + +QString TestPupilGreatGrandChild::greatGrandChildPropertyString() const +{ + return m_greatGrandChildPropertyString; +} + +void TestPupilGreatGrandChild::setGreatGrandChildPropertyString(const QString &greatGrandChildPropertyString) +{ + m_greatGrandChildPropertyString = greatGrandChildPropertyString; +} + +QList > TestPupilGreatGrandChild::greatGrandChildPropertyPersons() const +{ + return m_greatGrandChildPropertyPersons; +} + +void TestPupilGreatGrandChild::setGreatGrandChildPropertyPersons(const QList > &greatGrandChildPropertyPersons) +{ + m_greatGrandChildPropertyPersons = greatGrandChildPropertyPersons; +} + +const QHash TestPupilGreatGrandChild::getRelations() const +{ + auto hash = TestPupilGrandChild::getRelations(); +// hash.insert("greatGrandChildPropertyPersons", Relation("greatGrandChildPropertyPersons",RelationType::MANY_TO_MANY)); + return hash; +} + diff --git a/tests/model/testpupilgreatgrandchild.h b/tests/model/testpupilgreatgrandchild.h new file mode 100644 index 0000000..ffcd01d --- /dev/null +++ b/tests/model/testpupilgreatgrandchild.h @@ -0,0 +1,37 @@ +#ifndef TESTPUPILGREATGRANDCHILD_H +#define TESTPUPILGREATGRANDCHILD_H + +#include +#include "testpupilgrandchild.h" +#include "entitymanager.h" + +class TestPupilGreatGrandChild : public TestPupilGrandChild +{ + Q_OBJECT + Q_PROPERTY(QString greatGrandChildPropertyString READ greatGrandChildPropertyString WRITE setGreatGrandChildPropertyString) + +public: + EM_MACRO(TestPupilGreatGrandChild) + Q_INVOKABLE TestPupilGreatGrandChild(); + virtual ~TestPupilGreatGrandChild() override {} + + QString greatGrandChildPropertyString() const; + void setGreatGrandChildPropertyString(const QString &greatGrandChildPropertyString); + + // not used with Q_PROPERTY, nor in getRelations + QList > greatGrandChildPropertyPersons() const; + void setGreatGrandChildPropertyPersons(const QList > &greatGrandChildPropertyPersons); + + virtual const QHash getRelations() const override; + virtual InheritanceStrategy getInheritanceStrategy() const override { return InheritanceStrategy::JOINED_TABLE; } + +signals: + +public slots: +private: + QString m_greatGrandChildPropertyString = "m_greatGrandChildPropertyString"; + QList> m_greatGrandChildPropertyPersons; +}; + + +#endif // TESTPUPILGREATGRANDCHILD_H