commit 10cc871ac7d2d8842eb193fd8e29f47286c5b573 Author: Christian Ehringfeld Date: Sun Oct 11 21:15:50 2015 +0200 testing diff --git a/EntityManager.pro b/EntityManager.pro index 9623ad3..83b0e80 100644 --- a/EntityManager.pro +++ b/EntityManager.pro @@ -1,121 +1,15 @@ -include (EntityManager.pri) -QT += core -QT += sql -#if you need Image Validation you must compile with += gui -#QT += gui -QT -= gui +include(EntityManager.pri) -TARGET = CuteEntityManager -TEMPLATE = lib -CONFIG += $$EM_LIBRARY_TYPE -VERSION = $$EM_VERSION +TEMPLATE = subdirs -HEADERS += \ -src/entity.h \ - src/entitymanager.h \ - src/database.h \ - src/enums/databasetype.h \ - src/schema.h \ - src/schema/sqlitequerybuilder.h \ - src/schema/sqliteschema.h \ - src/tableschema.h \ - src/schema/pgsqlschema.h \ - src/schema/mysqlschema.h \ - src/databasemigration.h \ - src/querybuilder.h \ - src/relation.h \ - src/entityinstancefactory.h \ - src/cache.h \ - src/entityhelper.h \ - src/logger.h \ - src/query.h \ - src/join.h \ - src/queryinterpreter.h \ - src/expression.h \ - src/orderby.h \ - src/validators/validator.h \ - src/validators/param.h \ - src/validators/errormsg.h \ - src/validators/defaultvalidator.h \ - src/validators/validatorfactory.h \ - src/validators/validatorrule.h \ - src/validators/requiredvalidator.h \ - src/validators/numbervalidator.h \ - src/validators/urlvalidator.h \ - src/validators/comparevalidator.h \ - src/validators/datevalidator.h \ - src/validators/emailvalidator.h \ - src/validators/existvalidator.h \ - src/validators/filevalidator.h \ - src/validators/imagevalidator.h \ - src/validators/uniquevalidator.h \ - src/validators/patternvalidator.h \ - src/validators/lengthvalidator.h \ - src/schema/mysqlquerybuilder.h \ - src/entityinspector.h +SUBDIRS = src -SOURCES += \ -src/entity.cpp \ - src/entitymanager.cpp \ - src/database.cpp \ - src/schema.cpp \ - src/schema/sqliteschema.cpp \ - src/tableschema.cpp \ - src/schema/pgsqlschema.cpp \ - src/schema/mysqlschema.cpp \ - src/databasemigration.cpp \ - src/querybuilder.cpp \ - src/schema/sqlitequerybuilder.cpp \ - src/relation.cpp \ - src/entityinstancefactory.cpp \ - src/cache.cpp \ - src/entityhelper.cpp \ - src/logger.cpp \ - src/query.cpp \ - src/join.cpp \ - src/queryinterpreter.cpp \ - src/expression.cpp \ - src/orderby.cpp \ - src/validators/validator.cpp \ - src/validators/param.cpp \ - src/validators/errormsg.cpp \ - src/validators/defaultvalidator.cpp \ - src/validators/validatorfactory.cpp \ - src/validators/validatorrule.cpp \ - src/validators/requiredvalidator.cpp \ - src/validators/numbervalidator.cpp \ - src/validators/urlvalidator.cpp \ - src/validators/comparevalidator.cpp \ - src/validators/datevalidator.cpp \ - src/validators/emailvalidator.cpp \ - src/validators/existvalidator.cpp \ - src/validators/filevalidator.cpp \ - src/validators/imagevalidator.cpp \ - src/validators/uniquevalidator.cpp \ - src/validators/patternvalidator.cpp \ - src/validators/lengthvalidator.cpp \ - src/schema/mysqlquerybuilder.cpp \ - src/entityinspector.cpp - -!win32 { # looks bad. - HEADERS += \ - src/sqlitebackupprocessor.h - SOURCES += \ - src/sqlitebackupprocessor.cpp - LIBS += -lsqlite3 +android { +} else { + SUBDIRS += tests samples } - -CONFIG += c++14 -QMAKE_CXXFLAGS += -Wall -Wextra -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -#headers.path = $$PREFIX/include/cuteEntityManager -#headers.files = $$HEADERS -#target.path = $$PREFIX/$$LIBDIR -#INSTALLS += target -CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT +CONFIG += ordered -DISTFILES += \ - README.md \ - LICENSE \ - AUTHORS \ - Doxyfile +tests.depends = src +samples.depends = tests diff --git a/samples/example/Example.pro b/samples/example/Example.pro deleted file mode 100644 index ec8e8f4..0000000 --- a/samples/example/Example.pro +++ /dev/null @@ -1,42 +0,0 @@ -QT += core -QT += sql -QT -= gui - -#TARGET = EntityManager -CONFIG += console -CONFIG -= app_bundle - -TEMPLATE = app - -HEADERS += \ - models/person.h \ - models/group.h \ - models/pupil.h \ - models/address.h \ - models/contact.h \ - models/faker/createfakemodeldata.h - -SOURCES += \ - main.cpp \ - models/person.cpp \ - models/group.cpp \ - models/pupil.cpp \ - models/address.cpp \ - models/contact.cpp \ - models/faker/createfakemodeldata.cpp - -unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager -else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager -CONFIG += c++14 - -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager - -INCLUDEPATH += $$PWD/../../src -DEPENDPATH += $$PWD/../../src - -unix { -QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self -} - -CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/example/example.pro b/samples/example/example.pro new file mode 100644 index 0000000..3d66f5a --- /dev/null +++ b/samples/example/example.pro @@ -0,0 +1,42 @@ +QT += core +QT += sql +QT -= gui + +#TARGET = EntityManager +CONFIG += console +CONFIG -= app_bundle +CONFIG += c++14 + +TEMPLATE = app + +HEADERS += \ + models/person.h \ + models/group.h \ + models/pupil.h \ + models/address.h \ + models/contact.h \ + models/faker/createfakemodeldata.h + +SOURCES += \ + main.cpp \ + models/person.cpp \ + models/group.cpp \ + models/pupil.cpp \ + models/address.cpp \ + models/contact.cpp \ + models/faker/createfakemodeldata.cpp + +unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager +else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager + +INCLUDEPATH += $$PWD/../../src +DEPENDPATH += $$PWD/../../src + +unix { +QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self +} + +CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/samples.pro b/samples/samples.pro new file mode 100644 index 0000000..8fb8a9b --- /dev/null +++ b/samples/samples.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = example simple validators diff --git a/samples/simple/Simple.pro b/samples/simple/Simple.pro deleted file mode 100644 index abad0a4..0000000 --- a/samples/simple/Simple.pro +++ /dev/null @@ -1,50 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-08-01T15:03:24 -# -#------------------------------------------------- - -QT += core -QT += sql - -QT -= gui - -#TARGET = EntityManager -CONFIG += console -CONFIG -= app_bundle - -TEMPLATE = app - -HEADERS += \ - artikel.h - -SOURCES += \ - main.cpp \ - artikel.cpp - -unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager -else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager -unix:INCLUDEPATH += $$PWD/../../src -unix:DEPENDPATH += $$PWD/../../src -CONFIG += c++14 -QMAKE_CXXFLAGS += -std=c++14 - -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager - -win32:INCLUDEPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug -win32:DEPENDPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug - -INCLUDEPATH += $$PWD/../../src -DEPENDPATH += $$PWD/../../src - -unix { -QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self -} - -win32-g++ { - CONFIG += c++11 - QMAKE_CXXFLAGS += -std=c++11 -Wall -} - -CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/simple/main.cpp b/samples/simple/main.cpp index 8679736..96ec600 100644 --- a/samples/simple/main.cpp +++ b/samples/simple/main.cpp @@ -26,6 +26,5 @@ int main(int argc, char *argv[]) { i++; } qDebug() << i; - return 0; } diff --git a/samples/simple/simple.pro b/samples/simple/simple.pro new file mode 100644 index 0000000..abad0a4 --- /dev/null +++ b/samples/simple/simple.pro @@ -0,0 +1,50 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-08-01T15:03:24 +# +#------------------------------------------------- + +QT += core +QT += sql + +QT -= gui + +#TARGET = EntityManager +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + +HEADERS += \ + artikel.h + +SOURCES += \ + main.cpp \ + artikel.cpp + +unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager +else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager +unix:INCLUDEPATH += $$PWD/../../src +unix:DEPENDPATH += $$PWD/../../src +CONFIG += c++14 +QMAKE_CXXFLAGS += -std=c++14 + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager + +win32:INCLUDEPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug +win32:DEPENDPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug + +INCLUDEPATH += $$PWD/../../src +DEPENDPATH += $$PWD/../../src + +unix { +QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self +} + +win32-g++ { + CONFIG += c++11 + QMAKE_CXXFLAGS += -std=c++11 -Wall +} + +CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/validators/Validators.pro b/samples/validators/Validators.pro deleted file mode 100644 index 05f513d..0000000 --- a/samples/validators/Validators.pro +++ /dev/null @@ -1,52 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-08-01T15:03:24 -# -#------------------------------------------------- - -QT += core -QT += sql - -QT -= gui - -#TARGET = EntityManager -CONFIG += console -CONFIG -= app_bundle - -TEMPLATE = app - -HEADERS += \ - address.h \ - person.h - -SOURCES += \ - main.cpp \ - address.cpp \ - person.cpp - -unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager -else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager -unix:INCLUDEPATH += $$PWD/../../src -unix:DEPENDPATH += $$PWD/../../src -CONFIG += c++14 -QMAKE_CXXFLAGS += -std=c++14 - -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager - -win32:INCLUDEPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug -win32:DEPENDPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug - -INCLUDEPATH += $$PWD/../../src -DEPENDPATH += $$PWD/../../src - -unix { -QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self -} - -win32-g++ { - CONFIG += c++11 - QMAKE_CXXFLAGS += -std=c++11 -Wall -} - -CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/samples/validators/validators.pro b/samples/validators/validators.pro new file mode 100644 index 0000000..05f513d --- /dev/null +++ b/samples/validators/validators.pro @@ -0,0 +1,52 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2013-08-01T15:03:24 +# +#------------------------------------------------- + +QT += core +QT += sql + +QT -= gui + +#TARGET = EntityManager +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + +HEADERS += \ + address.h \ + person.h + +SOURCES += \ + main.cpp \ + address.cpp \ + person.cpp + +unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug -lCuteEntityManager +else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/ -lCuteEntityManager +unix:INCLUDEPATH += $$PWD/../../src +unix:DEPENDPATH += $$PWD/../../src +CONFIG += c++14 +QMAKE_CXXFLAGS += -std=c++14 + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager + +win32:INCLUDEPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug +win32:DEPENDPATH += $$PWD/../../../build-EntityManager-Desktop-Debug/debug + +INCLUDEPATH += $$PWD/../../src +DEPENDPATH += $$PWD/../../src + +unix { +QMAKE_CXXFLAGS += -Wall -Wextra -Wmaybe-uninitialized -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code -O -Winit-self +} + +win32-g++ { + CONFIG += c++11 + QMAKE_CXXFLAGS += -std=c++11 -Wall +} + +CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/src/entityinspector.cpp b/src/entityinspector.cpp index 9bf4429..49708bd 100644 --- a/src/entityinspector.cpp +++ b/src/entityinspector.cpp @@ -80,7 +80,7 @@ Entity *EntityInspector::instantiateEntity(const QString name) { QString msg = ""; if (entity) { msg = name + " is instantiable."; - this->logger->logMsg(msg, MsgType::INFO); + this->logger->logMsg(msg, MsgType::DEBUG); } else { msg = name + " is NOT instantiable!"; this->logger->logMsg(msg, MsgType::CRITICAL); diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..37adfda --- /dev/null +++ b/src/src.pro @@ -0,0 +1,115 @@ +include (../EntityManager.pri) +QT += core +QT += sql +#if you need Image Validation you must compile with += gui +#QT += gui +QT -= gui + +TARGET = CuteEntityManager +TEMPLATE = lib +CONFIG += $$EM_LIBRARY_TYPE +VERSION = $$EM_VERSION + +HEADERS += \ +entity.h \ + entitymanager.h \ + database.h \ + enums/databasetype.h \ + schema.h \ + schema/sqlitequerybuilder.h \ + schema/sqliteschema.h \ + tableschema.h \ + schema/pgsqlschema.h \ + schema/mysqlschema.h \ + databasemigration.h \ + querybuilder.h \ + relation.h \ + entityinstancefactory.h \ + cache.h \ + entityhelper.h \ + logger.h \ + query.h \ + join.h \ + queryinterpreter.h \ + expression.h \ + orderby.h \ + validators/validator.h \ + validators/param.h \ + validators/errormsg.h \ + validators/defaultvalidator.h \ + validators/validatorfactory.h \ + validators/validatorrule.h \ + validators/requiredvalidator.h \ + validators/numbervalidator.h \ + validators/urlvalidator.h \ + validators/comparevalidator.h \ + validators/datevalidator.h \ + validators/emailvalidator.h \ + validators/existvalidator.h \ + validators/filevalidator.h \ + validators/imagevalidator.h \ + validators/uniquevalidator.h \ + validators/patternvalidator.h \ + validators/lengthvalidator.h \ + schema/mysqlquerybuilder.h \ + entityinspector.h + +SOURCES += \ +entity.cpp \ + entitymanager.cpp \ + database.cpp \ + schema.cpp \ + schema/sqliteschema.cpp \ + tableschema.cpp \ + schema/pgsqlschema.cpp \ + schema/mysqlschema.cpp \ + databasemigration.cpp \ + querybuilder.cpp \ + schema/sqlitequerybuilder.cpp \ + relation.cpp \ + entityinstancefactory.cpp \ + cache.cpp \ + entityhelper.cpp \ + logger.cpp \ + query.cpp \ + join.cpp \ + queryinterpreter.cpp \ + expression.cpp \ + orderby.cpp \ + validators/validator.cpp \ + validators/param.cpp \ + validators/errormsg.cpp \ + validators/defaultvalidator.cpp \ + validators/validatorfactory.cpp \ + validators/validatorrule.cpp \ + validators/requiredvalidator.cpp \ + validators/numbervalidator.cpp \ + validators/urlvalidator.cpp \ + validators/comparevalidator.cpp \ + validators/datevalidator.cpp \ + validators/emailvalidator.cpp \ + validators/existvalidator.cpp \ + validators/filevalidator.cpp \ + validators/imagevalidator.cpp \ + validators/uniquevalidator.cpp \ + validators/patternvalidator.cpp \ + validators/lengthvalidator.cpp \ + schema/mysqlquerybuilder.cpp \ + entityinspector.cpp + +!win32 { # looks bad. + HEADERS += \ + sqlitebackupprocessor.h + SOURCES += \ + sqlitebackupprocessor.cpp + LIBS += -lsqlite3 +} + +CONFIG += c++14 +QMAKE_CXXFLAGS += -Wall -Wextra -Wunsafe-loop-optimizations -pedantic -Wfloat-equal -Wundef -Wpointer-arith -Wcast-align -Wunreachable-code +#headers.path = $$PREFIX/include/cuteEntityManager +#headers.files = $$HEADERS +#target.path = $$PREFIX/$$LIBDIR +#INSTALLS += target + +CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT diff --git a/src/validators/uniquevalidator.cpp b/src/validators/uniquevalidator.cpp index 4ef19df..b8e8c8a 100644 --- a/src/validators/uniquevalidator.cpp +++ b/src/validators/uniquevalidator.cpp @@ -1,5 +1,5 @@ #include "uniquevalidator.h" -#include "src/entitymanager.h" +#include "entitymanager.h" using namespace CuteEntityManager; UniqueValidator::UniqueValidator() : Validator() { } diff --git a/tests/Tests.pri b/tests/Tests.pri deleted file mode 100644 index c0e4cac..0000000 --- a/tests/Tests.pri +++ /dev/null @@ -1,10 +0,0 @@ -include(../EntityManager.pri) - -QT += core -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += c++11 - -QT += testlib -CONFIG -= app_bundle -CONFIG += testcase diff --git a/tests/Tests.pro b/tests/Tests.pro deleted file mode 100644 index 571898d..0000000 --- a/tests/Tests.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = tables diff --git a/tests/models.cpp b/tests/models.cpp index d29008d..3b4f432 100644 --- a/tests/models.cpp +++ b/tests/models.cpp @@ -2,6 +2,7 @@ Person::Person(QObject *parent): Entity(parent) { } + Person::Person(QString firstName, QString familyName, Gender gender, QString customPictureFileName, QString namePrefix, QString nickName, QDate birthday, QObject *parent): Entity(parent) { @@ -108,14 +109,6 @@ void Person::setGroups(const QList > &value) { groups = value; } -void Person::addContact(Contact *contact) { - this->contacts.append(QSharedPointer(contact)); -} - -void Person::addAddress(Address *address) { - this->addresses.append(QSharedPointer
(address)); -} - QList > Person::getMaintainedGroups() const { return maintainedGroups; } @@ -145,12 +138,13 @@ void Group::setName(const QString &value) { } QSharedPointer Group::getLeader() const { - return mainTeacher; + return leader; } void Group::setLeader(const QSharedPointer &value) { - mainTeacher = value; + leader = value; } + QList > Group::getPersons() const { return persons; } diff --git a/tests/models.h b/tests/models.h index 3bc9055..99956a8 100644 --- a/tests/models.h +++ b/tests/models.h @@ -9,6 +9,7 @@ #include "../../entitymanager/src/entity.h" using namespace CuteEntityManager; +class Group; class Person: public Entity { Q_OBJECT Q_PROPERTY(QString firstName READ getFirstName WRITE setFirstName) @@ -20,12 +21,7 @@ class Person: public Entity { Q_PROPERTY(QDate birthday READ getBirthday WRITE setBirthday) Q_PROPERTY(Gender gender READ getGender WRITE setGender) Q_PROPERTY(QList> groups READ getGroups WRITE setGroups) - Q_PROPERTY(QList> maintainedGroups READ - getMaintainedGroups WRITE setMaintainedGroups) - Q_PROPERTY(QList> contacts READ getContacts WRITE - setContacts) - Q_PROPERTY(QList> addresses READ - getAddresses WRITE setAddresses) + Q_PROPERTY(QList> maintainedGroups READ getMaintainedGroups WRITE setMaintainedGroups) public: enum class Gender {MALE, FEMALE, UNKNOWNGENDER}; @@ -38,7 +34,8 @@ class Person: public Entity { QString customPictureFileName = QString(), QString namePrefix = QString(), QString nickName = QString(), QDate birthday = QDate(), QObject *parent = 0); - virtual const QHash getRelations() const override; + virtual const QHash getRelations() const + override; bool isPresent(QDateTime date = QDateTime::currentDateTime()); QString fullName(NameOrder nameOrder = NameOrder::FAMILY_FIRST_NAME_ORDER) @@ -65,22 +62,13 @@ class Person: public Entity { QString getCustomPictureFileName() const; void setCustomPictureFileName(const QString &value); - QList > getContacts() const; - void setContacts(const QList > &value); - - QList > getAddresses() const; - void setAddresses(const QList > &value); - QList > getGroups() const; void setGroups(const QList > &value); - void addContact(Contact *contact); - void addAddress(Address *address); - QList > getMaintainedGroups() const; void setMaintainedGroups(const QList > &value); - protected: +protected: QString firstName; QString familyName; QString namePrefix; @@ -88,11 +76,8 @@ class Person: public Entity { QDate birthday; Gender gender; QString customPictureFileName; - QList > contacts; - QList > addresses; QList > groups; QList > maintainedGroups; - }; class Person; diff --git a/tests/tables/.gitignore b/tests/tables/.gitignore deleted file mode 100644 index 5439c79..0000000 --- a/tests/tables/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - - diff --git a/tests/tables/tables.pro b/tests/tables/tables.pro index 44efaca..06f578a 100644 --- a/tests/tables/tables.pro +++ b/tests/tables/tables.pro @@ -1,12 +1,24 @@ -include(../Tests.pri) -TARGET = Tables +#------------------------------------------------- +# +# Project created by QtCreator 2015-10-11T20:35:07 +# +#------------------------------------------------- +include(../tests.pri) +QT += sql testlib +QT -= gui +TARGET = tst_tables +CONFIG += console +CONFIG -= app_bundle -SOURCES += \ +TEMPLATE = app + + +SOURCES += tst_tables.cpp \ ../models.cpp +DEFINES += SRCDIR=\\\"$$PWD/\\\" HEADERS += \ ../models.h - diff --git a/tests/tables/tst_tables.cpp b/tests/tables/tst_tables.cpp new file mode 100644 index 0000000..77b6275 --- /dev/null +++ b/tests/tables/tst_tables.cpp @@ -0,0 +1,54 @@ +#include +#include +#include "entitymanager.h" +#include "databasemigration.h" +#include "../models.h" +class Tables : public QObject { + Q_OBJECT + + public: + Tables(); + + private Q_SLOTS: + void initTestCase(); + void cleanupTestCase(); + void testStartup(); +// void init(); +// void cleanup(); + private: + CuteEntityManager::EntityManager *e; +}; + +Tables::Tables() { +} + +void Tables::initTestCase() { + CuteEntityManager::EntityInstanceFactory::registerClass(); + CuteEntityManager::EntityInstanceFactory::registerClass(); + this->e = new CuteEntityManager::EntityManager("QSQLITE", + ":memory:", "", "", "", "", true, "foreign_keys = ON"); +} + +void Tables::cleanupTestCase() { +// if (this->e) { +// delete this->e; +// this->e = nullptr; +// } +} + +void Tables::testStartup() { + QStringList inits = QStringList() << "Person" << "Group"; + QVERIFY2(this->e->startup("test0.1", inits), "Failure"); + auto tableNames = this->e->getSchema()->getTableNames(); + QVERIFY(tableNames.contains("person")); + QVERIFY(tableNames.contains("group")); + 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")); +} + +QTEST_APPLESS_MAIN(Tables) + +#include "tst_tables.moc" diff --git a/tests/tests.pri b/tests/tests.pri new file mode 100644 index 0000000..1f3d2ec --- /dev/null +++ b/tests/tests.pri @@ -0,0 +1,18 @@ +include(../EntityManager.pri) + +QT += core +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++14 + +QT += testlib +CONFIG -= app_bundle +CONFIG += testcase +INCLUDEPATH += $$PWD/../src +DEPENDPATH += $$PWD/../src + +unix:!macx:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug -lCuteEntityManager +else:unix:!macx:CONFIG(release, release|debug): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/ -lCuteEntityManager + +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Release/release/ -lCuteEntityManager +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug/debug/ -lCuteEntityManager diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..91accce --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,6 @@ +include(tests.pri) + +TEMPLATE = subdirs + +SUBDIRS += \ + tables