commit f8b8663b25c9040c33d41ba1b0cd2c33a9a25722 Author: Christian Ehringfeld Date: Tue Dec 1 19:17:39 2015 +0100 fixxed possible crash in detection of nonInheritedRelations test case update diff --git a/src/entityhelper.cpp b/src/entityhelper.cpp index 89fa70b..dea965b 100644 --- a/src/entityhelper.cpp +++ b/src/entityhelper.cpp @@ -29,12 +29,10 @@ const QHash EntityHelper::getNonInheritedRelations( auto superObject = EntityInstanceFactory::newSuperClassInstance(entity); if (superObject) { auto superRelations = superObject->getRelations(); - auto iterator = superRelations.constBegin(); - while (iterator != relations.constEnd()) { - if (relations.contains(iterator.key())) { - relations.remove(iterator.key()); + for (auto i = superRelations.constBegin(); i != superRelations.constEnd(); ++i) { + if (relations.contains(i.key())) { + relations.remove(i.key()); } - ++iterator; } delete superObject; superObject = nullptr; @@ -186,7 +184,8 @@ void EntityHelper::addEntityToListProperty(const QSharedPointer &entity, QSharedPointer add, const QMetaProperty &property) { QVariant var = property.read(entity.data()); QList> list = (!var.isNull() && var.data() && - var.canConvert>() ? EntityInstanceFactory::castQVariantList( var) : QList>()); + var.canConvert>() ? EntityInstanceFactory::castQVariantList( + var) : QList>()); if (!list.contains(add)) { list.append(add); EntityHelper::setListProperty(entity, list, property); diff --git a/tests/em/em.pro b/tests/em/em.pro index 0d4ef0b..c3fb61f 100644 --- a/tests/em/em.pro +++ b/tests/em/em.pro @@ -17,6 +17,7 @@ TEMPLATE = app SOURCES += tst_em.cpp \ + tst_querybuildertest.cpp \ ../models.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/em/tst_em.cpp b/tests/em/tst_em.cpp index baeb703..8b1d5fe 100644 --- a/tests/em/tst_em.cpp +++ b/tests/em/tst_em.cpp @@ -21,6 +21,7 @@ class Em : public QObject { void testHasChanged(); void testValidate(); void testRelations(); + void testRelationTableCreation(); private: CuteEntityManager::EntityManager *e; @@ -33,6 +34,8 @@ void Em::initTestCase() { CuteEntityManager::EntityInstanceFactory::registerClass(); CuteEntityManager::EntityInstanceFactory::registerClass(); CuteEntityManager::EntityInstanceFactory::registerClass
(); + CuteEntityManager::EntityInstanceFactory::registerClass(); + CuteEntityManager::EntityInstanceFactory::registerClass(); this->e = new CuteEntityManager::EntityManager("QSQLITE", ":memory:", "", "", "", "", true, "foreign_keys = ON"); } @@ -74,21 +77,22 @@ void Em::testBasics() { void Em::init() { QStringList inits = QStringList() << "Person" << "Group" << "Article"; - QVERIFY2(this->e->startup("test0.1", inits), "Failure"); + QVERIFY2(this->e->startup("emTestA", inits), "Failure"); auto tableNames = this->e->getSchema()->getTableNames(); QVERIFY(tableNames.contains("article")); QVERIFY(tableNames.contains("person")); QVERIFY(tableNames.contains("group")); - QVERIFY(tableNames.contains("group_persons")); + QVERIFY(tableNames.contains("person_groups")); + QVERIFY(!tableNames.contains("group_persons")); QVERIFY(tableNames.contains("cuteentitymanager::databasemigration")); auto migrations = this->e->findAll(); QCOMPARE(migrations.size(), 1); - QCOMPARE(migrations.at(0)->getVersion(), QString("test0.1")); + QCOMPARE(migrations.at(0)->getVersion(), QString("emTestA")); } void Em::cleanup() { auto qb = this->e->getQueryBuilder(); - QVERIFY(this->e->executeQuery(qb->dropTable("group_persons"))); + QVERIFY(this->e->executeQuery(qb->dropTable("person_groups"))); QVERIFY(this->e->executeQuery(qb->dropTable("group"))); QVERIFY(this->e->executeQuery(qb->dropTable("person"))); QVERIFY(this->e->executeQuery(qb->dropTable("article"))); @@ -96,13 +100,33 @@ void Em::cleanup() { QVERIFY(!tableNames.contains("person")); QVERIFY(!tableNames.contains("group")); QVERIFY(!tableNames.contains("article")); - QVERIFY(!tableNames.contains("group_persons")); + QVERIFY(!tableNames.contains("person_groups")); QVERIFY(this->e->removeAll("cuteentitymanager::databasemigration")); } +void Em::testRelationTableCreation() { + QStringList relationTables = QStringList() << "Employee" << "WorkerGroup"; + QVERIFY2(this->e->startup("emTestB", relationTables), "Failure"); + auto tableNames = this->e->getSchema()->getTableNames(); + QVERIFY(tableNames.contains("workergroup")); + QVERIFY(tableNames.contains("employee")); + QVERIFY(tableNames.contains("workergroup_workers")); + QVERIFY(!tableNames.contains("group_employee")); + QVERIFY(!tableNames.contains("employee_workergroups")); + QVERIFY(!tableNames.contains("employee_groups")); + QVERIFY(tableNames.contains("cuteentitymanager::databasemigration")); + auto migrations = this->e->findAll(); + QCOMPARE(migrations.size(), 2); + QCOMPARE(migrations.at(1)->getVersion(), QString("emTestB")); + auto qb = this->e->getQueryBuilder(); + QVERIFY(this->e->executeQuery(qb->dropTable("workergroup_workers"))); + QVERIFY(this->e->executeQuery(qb->dropTable("employee"))); + QVERIFY(this->e->executeQuery(qb->dropTable("workergroup"))); +} + void Em::testFindById() { - QSharedPointer p = QSharedPointer(new Person("Max", "Mustermann", - Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); + QSharedPointer p = QSharedPointer(new Person("Patrick", "De", + Person::Gender::MALE, "patrick.jpeg", "", "Pat", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); auto id = p->getId(); @@ -111,8 +135,8 @@ void Em::testFindById() { } void Em::testFindId() { - QSharedPointer p = QSharedPointer(new Person("Max", "Mustermann", - Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); + QSharedPointer p = QSharedPointer(new Person("Essi", "Sa", + Person::Gender::MALE, "essi.jpeg", "", "Essi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); auto entity = QSharedPointer(p->copy()); @@ -121,19 +145,19 @@ void Em::testFindId() { } void Em::testHasChanged() { - QSharedPointer p = QSharedPointer(new Person("Max", "Mustermann", + QSharedPointer p = QSharedPointer(new Person("Jelena", "Fl", Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); - p->setFirstName("Charlotte"); + p->setFirstName("Laura"); p->setFamilyName("Musterfrau"); p->setBirthday(QDate(200, 1, 2)); QVERIFY(this->e->hasChanged(ent)); } void Em::testValidate() { - QSharedPointer p = QSharedPointer(new Person("Max", "Mustermann", - Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); + QSharedPointer p = QSharedPointer(new Person("Patrick", "Pe", + Person::Gender::MALE, "patrick2.jpeg", "", "Maxi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->validate(ent)); p->setFirstName("M"); @@ -143,12 +167,12 @@ void Em::testValidate() { } void Em::testRelations() { - QSharedPointer p1 = QSharedPointer(new Person("Max", "Mustermann", - Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); - QSharedPointer p2 = QSharedPointer(new Person("Marie", "Musterfrau", - Person::Gender::FEMALE, "max.jpeg", "", "", QDate(2000, 1, 1))); - QSharedPointer p3 = QSharedPointer(new Person("Fenja", "Musterfrau", - Person::Gender::FEMALE, "max.jpeg", "", "Fenni", QDate(2000, 1, 1))); + QSharedPointer p1 = QSharedPointer(new Person("Lucien", "We", + Person::Gender::MALE, "lucien.jpeg", "", "Luc", QDate(2000, 1, 1))); + QSharedPointer p2 = QSharedPointer(new Person("Janine", "Musterfrau", + Person::Gender::FEMALE, "janine.jpeg", "", "", QDate(2000, 1, 1))); + QSharedPointer p3 = QSharedPointer(new Person("Fenja", "Sey.", + Person::Gender::FEMALE, "fenja.jpeg", "", "Lotta", QDate(1990, 1, 1))); QSharedPointer g = QSharedPointer(new Group()); g->setName("TestGroup"); g->setLeader(p1); diff --git a/tests/em/tst_querybuildertest.cpp b/tests/em/tst_querybuildertest.cpp index cbe1c5d..2059196 100644 --- a/tests/em/tst_querybuildertest.cpp +++ b/tests/em/tst_querybuildertest.cpp @@ -39,6 +39,6 @@ void QuerybuilderTest::testCase1() QVERIFY2(true, "Failure"); } -QTEST_APPLESS_MAIN(QuerybuilderTest) +//QTEST_APPLESS_MAIN(QuerybuilderTest) #include "tst_querybuildertest.moc" diff --git a/tests/models.cpp b/tests/models.cpp index 9b76719..15fd04e 100644 --- a/tests/models.cpp +++ b/tests/models.cpp @@ -18,8 +18,7 @@ Person::Person(QString firstName, QString familyName, Gender gender, const QHash Person::getRelations() const { auto hash = QHash(); hash.insert("groups", CuteEntityManager::Relation("groups", - RelationType::MANY_TO_MANY, - QString("persons"))); + RelationType::MANY_TO_MANY)); hash.insert("maintainedGroups", CuteEntityManager::Relation("maintainedGroups", RelationType::ONE_TO_MANY, QString("leader"))); @@ -123,7 +122,7 @@ Group::Group() : Entity() { const QHash Group::getRelations() const { auto hash = QHash(); hash.insert("persons", CuteEntityManager::Relation("persons", - RelationType::MANY_TO_MANY)); + RelationType::MANY_TO_MANY, QString("groups"))); hash.insert("leader", CuteEntityManager::Relation("leader", RelationType::MANY_TO_ONE)); return hash; @@ -198,3 +197,71 @@ QList Person::validationRules() const { rules.append(ValidationRule("date", "birthday", params)); return rules; } + +const QHash Employee::getRelations() const { + auto relations = Person::getRelations(); + return relations; +} + +QString Employee::getDepartment() const { + return department; +} + +void Employee::setDepartment(const QString &value) { + department = value; +} + +bool Employee::isManager() const { + return manager; +} + +void Employee::setManager(bool value) { + manager = value; +} + +quint64 Employee::getPersNumber() const { + return persNumber; +} + +void Employee::setPersNumber(const quint64 &value) { + persNumber = value; +} + +const QHash WorkerGroup::getRelations() const { + auto hash = QHash(); + hash.insert("workers", CuteEntityManager::Relation("workers", + RelationType::MANY_TO_MANY)); + return hash; +} + +QString WorkerGroup::getName() const { + return name; +} + +void WorkerGroup::setName(const QString &value) { + name = value; +} + +quint32 WorkerGroup::getEfficiency() const { + return efficiency; +} + +void WorkerGroup::setEfficiency(const quint32 &value) { + efficiency = value; +} + +bool WorkerGroup::isActive() const { + return active; +} + +void WorkerGroup::setActive(bool value) { + active = value; +} + +QList> WorkerGroup::getWorkers() const { + return workers; +} + +void WorkerGroup::setWorkers(const QList> &value) { + workers = value; +} diff --git a/tests/models.h b/tests/models.h index 7efe92f..d0d7f99 100644 --- a/tests/models.h +++ b/tests/models.h @@ -10,6 +10,7 @@ using namespace CuteEntityManager; class Group; +class Relation; class Person: public Entity { Q_OBJECT @@ -82,7 +83,63 @@ class Person: public Entity { QList > maintainedGroups; }; -class Relation; +class Employee : public Person { + Q_OBJECT + Q_PROPERTY(QString department READ getDepartment WRITE setDepartment) + Q_PROPERTY(quint64 persNumber READ getPersNumber WRITE setPersNumber) + Q_PROPERTY(bool manager READ isManager WRITE setManager) + public: + Employee() : Person() { } + virtual const QHash getRelations() const + override; + QString getDepartment() const; + void setDepartment(const QString &value); + + bool isManager() const; + void setManager(bool value); + + quint64 getPersNumber() const; + void setPersNumber(const quint64 &value); + + private: + QString department; + quint64 persNumber; + bool manager = false; +}; + + +class WorkerGroup : public Entity { + Q_OBJECT + Q_PROPERTY(QString name READ getName WRITE setName) + Q_PROPERTY(quint32 efficiency READ getEfficiency WRITE setEfficiency) + Q_PROPERTY(bool active READ isActive WRITE setActive) + Q_PROPERTY(QList> workers READ getWorkers WRITE + setWorkers) + public: + WorkerGroup() : Entity() { } + virtual const QHash getRelations() const + override; + QString getName() const; + void setName(const QString &value); + + quint32 getEfficiency() const; + void setEfficiency(const quint32 &value); + + bool isActive() const; + void setActive(bool value); + + QList> getWorkers() const; + void setWorkers(const QList> &value); + + private: + QString name; + quint32 efficiency; + bool active = true; + QList> workers; +}; + + + class Group: public CuteEntityManager::Entity { Q_OBJECT Q_PROPERTY(QList> persons READ getPersons WRITE @@ -97,10 +154,8 @@ class Group: public CuteEntityManager::Entity { QString getName() const; void setName(const QString &value); - QSharedPointer getLeader() const; void setLeader(const QSharedPointer &value); - QList> getPersons() const; void addPerson(const QSharedPointer &value); void setPersons(const QList> &value); diff --git a/tests/tests.pro b/tests/tests.pro index f752f68..0f8684f 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ em \ - querybuilder \ validators