commit 21826301b39dbb57ac73223a57f4d7e6866a9e98 Author: Christian Ehringfeld Date: Sat Jan 2 19:08:06 2016 +0100 cleanup tests diff --git a/tests/em/tst_em.cpp b/tests/em/tst_em.cpp index 16a1f25..01fa94e 100644 --- a/tests/em/tst_em.cpp +++ b/tests/em/tst_em.cpp @@ -87,12 +87,10 @@ void EmTest::testTableCreation() { if(containsPerson) { auto schema = tables.value("person"); auto columns = schema->getColumns(); - QCOMPARE(columns.size(), 8); + QCOMPARE(columns.size(), 6); this->containsColumn(columns, "id", QVariant::Int, "person", true); - this->containsColumn(columns, "namePrefix", QVariant::String); this->containsColumn(columns, "firstName", QVariant::String); this->containsColumn(columns, "familyName", QVariant::String); - this->containsColumn(columns, "customPictureFileName", QVariant::String); this->containsColumn(columns, "birthday", QVariant::String); this->containsColumn(columns, "nickName", QVariant::String); this->containsColumn(columns, "gender", QVariant::Int); @@ -140,16 +138,12 @@ void EmTest::containsColumn(QHash> &columns, } } - void EmTest::cleanup() { auto qb = this->e->getQueryBuilder(); 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"))); -// QVERIFY(this->e->executeQuery(qb->dropTable("workergroup_workers"))); -// QVERIFY(this->e->executeQuery(qb->dropTable("workergroup"))); -// QVERIFY(this->e->executeQuery(qb->dropTable("employee"))); auto tableNames = this->e->getSchema()->getTableNames(); QVERIFY(!tableNames.contains("person")); QVERIFY(!tableNames.contains("group")); @@ -168,7 +162,7 @@ void EmTest::testRelationTableCreation() { auto schema = tables.value("employee"); auto columns = schema->getColumns(); QCOMPARE(columns.size(), 4); - this->containsColumn(columns, "id", QVariant::Int, "employee", true); + this->containsColumn(columns, "id", QVariant::Int, "employee", false); this->containsColumn(columns, "persNumber", QVariant::String); this->containsColumn(columns, "manager", QVariant::Int); this->containsColumn(columns, "department", QVariant::String); @@ -186,10 +180,10 @@ void EmTest::testRelationTableCreation() { void EmTest::testInheritedRelations() { QSharedPointer e1 = QSharedPointer(new Employee(42, "Fenja", "S.", - Person::Gender::FEMALE, "fenja.jpeg", "", "Lotta", QDate(1990, 10, 10), "Psychology")); + Person::Gender::FEMALE, "Lotta", QDate(1990, 10, 10), "Psychology")); QSharedPointer e2 = QSharedPointer(new Employee(11, "Janine", "Musterfrau", - Person::Gender::FEMALE, "janine.jpeg", "", "", QDate(2000, 1, 1), "Health", true)); + Person::Gender::FEMALE, "", QDate(2000, 1, 1), "Health", true)); QSharedPointer wg = QSharedPointer(new WorkerGroup("Taskforce P&H", 42)); wg->addWorker(e1); @@ -235,7 +229,7 @@ void EmTest::deleteRelationTables() { void EmTest::testFindById() { QSharedPointer p = QSharedPointer(new Person("Patrick", "De", - Person::Gender::MALE, "patrick.jpeg", "", "Pat", QDate(2000, 1, 1))); + Person::Gender::MALE, "Pat", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); auto id = p->getId(); @@ -245,7 +239,7 @@ void EmTest::testFindById() { void EmTest::testFindId() { QSharedPointer p = QSharedPointer(new Person("Essi", "Sa", - Person::Gender::MALE, "essi.jpeg", "", "Essi", QDate(2000, 1, 1))); + Person::Gender::MALE, "Essi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); auto entity = QSharedPointer(p->copy()); @@ -255,7 +249,7 @@ void EmTest::testFindId() { void EmTest::testHasChanged() { QSharedPointer p = QSharedPointer(new Person("Jelena", "Fl", - Person::Gender::MALE, "max.jpeg", "", "Maxi", QDate(2000, 1, 1))); + Person::Gender::MALE, "Maxi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->create(ent)); p->setFirstName("Laura"); @@ -266,7 +260,7 @@ void EmTest::testHasChanged() { void EmTest::testValidate() { QSharedPointer p = QSharedPointer(new Person("Patrick", "Pe", - Person::Gender::MALE, "patrick2.jpeg", "", "Maxi", QDate(2000, 1, 1))); + Person::Gender::MALE, "Maxi", QDate(2000, 1, 1))); auto ent = p.objectCast(); QVERIFY(this->e->validate(ent)); p->setFirstName("M"); @@ -277,11 +271,11 @@ void EmTest::testValidate() { void EmTest::testRelations() { QSharedPointer p1 = QSharedPointer(new Person("Lucien", "We", - Person::Gender::MALE, "lucien.jpeg", "", "Luc", QDate(2000, 1, 1))); + Person::Gender::MALE, "Luc", QDate(2000, 1, 1))); QSharedPointer p2 = QSharedPointer(new Person("Janine", "Musterfrau", - Person::Gender::FEMALE, "janine.jpeg", "", "", QDate(2000, 1, 1))); + Person::Gender::FEMALE, "", QDate(2000, 1, 1))); QSharedPointer p3 = QSharedPointer(new Person("Fenja", "Sey.", - Person::Gender::FEMALE, "fenja.jpeg", "", "Lotta", QDate(1990, 11, 11))); + Person::Gender::FEMALE, "Lotta", QDate(1990, 11, 11))); QSharedPointer g = QSharedPointer(new Group("TestGroup")); QSharedPointer g2 = QSharedPointer(new Group("TestGroup2")); g->setLeader(p1); diff --git a/tests/em/tst_querybuilder.cpp b/tests/em/tst_querybuilder.cpp index ca04319..8f70e75 100644 --- a/tests/em/tst_querybuilder.cpp +++ b/tests/em/tst_querybuilder.cpp @@ -3,7 +3,6 @@ void QuerybuilderTest::initTestCase() { CuteEntityManager::EntityInstanceFactory::registerClass(); CuteEntityManager::EntityInstanceFactory::registerClass(); - CuteEntityManager::EntityInstanceFactory::registerClass
(); CuteEntityManager::EntityInstanceFactory::registerClass(); CuteEntityManager::EntityInstanceFactory::registerClass(); this->e = new CuteEntityManager::EntityManager("QSQLITE", @@ -11,18 +10,18 @@ void QuerybuilderTest::initTestCase() { QStringList inits = QStringList() << "Person" << "Group" << "Employee" << "WorkerGroup"; QVERIFY2(this->e->startup("queryBuilderTest", inits), "Failure"); QSharedPointer p1 = QSharedPointer(new Person("Lucien", "We", - Person::Gender::MALE, "lucien.jpeg", "", "Luc", QDate(1995, 2, 4))); + Person::Gender::MALE, "Luc", QDate(1995, 2, 4))); QSharedPointer p2 = QSharedPointer(new Employee(11, "Janine", "Musterfrau", - Person::Gender::FEMALE, "janine.jpeg", "", "", QDate(1992, 8, 5), "B")); + Person::Gender::FEMALE, "", QDate(1992, 8, 5), "B")); QSharedPointer p3 = QSharedPointer(new Employee(42, "Fenja", "Sey.", - Person::Gender::FEMALE, "fenja.jpeg", "", "Lotta", QDate(1990, 11, 11), "A")); + Person::Gender::FEMALE, "Lotta", QDate(1990, 11, 11), "A")); QSharedPointer p4 = QSharedPointer(new Person("Fenja", "Neu", - Person::Gender::FEMALE, "fenja2.jpeg", "", "Fenni", QDate(1980, 5, 30))); + Person::Gender::FEMALE, "Fenni", QDate(1980, 5, 30))); QSharedPointer p5 = QSharedPointer(new Employee(90, "Milan", "Mes.", - Person::Gender::MALE, "milan.jpeg", "", "", QDate(1994, 3, 27), "D")); + Person::Gender::MALE, "", QDate(1994, 3, 27), "D")); QSharedPointer p6 = QSharedPointer(new Person("Kristina", "Zero", - Person::Gender::FEMALE, "kristina.jpeg", "", "", QDate(1996, 5, 17))); + Person::Gender::FEMALE, "", QDate(1996, 5, 17))); QSharedPointer g = QSharedPointer(new Group("Group Psy")); QSharedPointer g2 = QSharedPointer(new Group("Group Health")); QSharedPointer g3 = QSharedPointer(new Group("Group ABC")); diff --git a/tests/models.cpp b/tests/models.cpp index dc983be..90dfc83 100644 --- a/tests/models.cpp +++ b/tests/models.cpp @@ -4,15 +4,13 @@ Person::Person(QObject *parent): Entity(parent) { } Person::Person(QString firstName, QString familyName, Gender gender, - QString customPictureFileName, QString namePrefix, QString nickName, + QString nickName, QDate birthday, QObject *parent): Entity(parent) { setFirstName(firstName); setFamilyName(familyName); - setNamePrefix(namePrefix); setNickName(nickName); setBirthday(birthday); setGender(gender); - setCustomPictureFileName(customPictureFileName); } const QHash Person::getRelations() const { @@ -30,19 +28,11 @@ QString Person::fullName(NameOrder nameOrder) const { if (nameOrder == NameOrder::FAMILY_FIRST_NAME_ORDER) { name += this->getFamilyName(); name += ", "; - if (!this->getNamePrefix().isEmpty()) { - name += this->getNamePrefix(); - name += " "; - } name += this->getFirstName(); } else { name += this->getFirstName(); name += " "; name += this->getFamilyName(); - if (!this->getNamePrefix().isEmpty()) { - name += ", "; - name += this->getNamePrefix(); - } } return name; } @@ -60,13 +50,6 @@ QString Person::getFamilyName() const { void Person::setFamilyName(const QString &value) { familyName = value; } -QString Person::getNamePrefix() const { - return namePrefix; -} - -void Person::setNamePrefix(const QString &value) { - namePrefix = value; -} QString Person::getNickName() const { return nickName; @@ -92,14 +75,6 @@ void Person::setGender(const Gender &value) { gender = value; } -QString Person::getCustomPictureFileName() const { - return customPictureFileName; -} - -void Person::setCustomPictureFileName(const QString &value) { - customPictureFileName = value; -} - QList> Person::getGroups() const { return groups; } @@ -266,7 +241,6 @@ void WorkerGroup::setWorkers(const QList> &value) { workers = value; } -void WorkerGroup::addWorker(const QSharedPointer &value) -{ +void WorkerGroup::addWorker(const QSharedPointer &value) { this->workers.append(value); } diff --git a/tests/models.h b/tests/models.h index a96d77f..17a07fa 100644 --- a/tests/models.h +++ b/tests/models.h @@ -16,10 +16,7 @@ class Person: public Entity { Q_OBJECT Q_PROPERTY(QString firstName READ getFirstName WRITE setFirstName) Q_PROPERTY(QString familyName READ getFamilyName WRITE setFamilyName) - Q_PROPERTY(QString namePrefix READ getNamePrefix WRITE setNamePrefix) Q_PROPERTY(QString nickName READ getNickName WRITE setNickName) - Q_PROPERTY(QString customPictureFileName READ getCustomPictureFileName WRITE - setCustomPictureFileName) Q_PROPERTY(QDate birthday READ getBirthday WRITE setBirthday) Q_PROPERTY(Gender gender READ getGender WRITE setGender) Q_PROPERTY(QList> groups READ getGroups WRITE setGroups) @@ -33,7 +30,6 @@ class Person: public Entity { Q_INVOKABLE explicit Person(QObject *parent = 0); Person(QString firstName, QString familyName, Gender gender = Gender::UNKNOWNGENDER, - QString customPictureFileName = QString(), QString namePrefix = QString(), QString nickName = QString(), QDate birthday = QDate(), QObject *parent = 0); virtual const QHash getRelations() const @@ -49,9 +45,6 @@ class Person: public Entity { QString getFamilyName() const; void setFamilyName(const QString &value); - QString getNamePrefix() const; - void setNamePrefix(const QString &value); - QString getNickName() const; void setNickName(const QString &value); @@ -61,9 +54,6 @@ class Person: public Entity { Gender getGender() const; void setGender(const Gender &value); - QString getCustomPictureFileName() const; - void setCustomPictureFileName(const QString &value); - QList> getGroups() const; void setGroups(const QList> &value); @@ -74,11 +64,9 @@ class Person: public Entity { protected: QString firstName; QString familyName; - QString namePrefix; QString nickName; QDate birthday; Gender gender; - QString customPictureFileName; QList > groups; QList > maintainedGroups; }; @@ -92,10 +80,9 @@ class Employee : public Person { Employee() : Person() { } Employee(quint64 persNumber, QString firstName, QString familyName, Gender gender = Gender::UNKNOWNGENDER, - QString customPictureFileName = QString(), QString namePrefix = QString(), QString nickName = QString(), QDate birthday = QDate(), QString department = QString(), bool manager = false, QObject *parent = 0) : Person(firstName, familyName, gender, - customPictureFileName, namePrefix, nickName, birthday, parent) { + nickName, birthday, parent) { this->department = department; this->manager = manager; this->persNumber = persNumber;