Skip to content

tests fixed #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 1 commit into from
Sep 14, 2022
Merged

tests fixed #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions App/App.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ HEADERS += \
Server/WebSocketServer.h \
Server/ServerConfigs.h \
Server/clsAPIObject.h \
Server/OpenAPIGenerator.h \
Server/OpenAPIGenerator.h

# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-#
SOURCES += \
Expand Down Expand Up @@ -52,4 +52,4 @@ LIBS += -lTargomanAPIInterface

DISTFILES += \
conf/test.conf \
conf/api.server.conf \
conf/api.server.conf
21 changes: 10 additions & 11 deletions Interfaces/DBM/QueryBuilders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,7 +2539,9 @@ ORMSelectQuery& ORMSelectQuery::addCol(const clsColSpecs& _colSpecs) {

//check duplicates
foreach (auto Col, this->Data->RequiredCols) {
if ((Col.name() == _colSpecs.name())
if ((Col.name().isEmpty() == false)
&& (_colSpecs.name().isEmpty() == false)
&& (Col.name() == _colSpecs.name())
&& (Col.renameAs() == _colSpecs.renameAs())
)
return *this;
Expand Down Expand Up @@ -2783,8 +2785,8 @@ QString ORMSelectQuery::buildQueryString(QVariantMap _args, bool _selectOne, boo
if (_reportCount) {
this->Data->PageIndex = 0;
this->Data->PageSize = 0;
} else if (_selectOne)
this->Data->PageSize = 1;
} /*else if (_selectOne)
this->Data->PageSize = 1;*/

QStringList QueryParts;

Expand Down Expand Up @@ -2872,14 +2874,11 @@ QString ORMSelectQuery::buildQueryString(QVariantMap _args, bool _selectOne, boo
if (_reportCount == false) {
if (this->WhereTraitData->PksByPath.isEmpty()) {
if ((this->Data->PageIndex > 0) || (this->Data->PageSize > 0)) {
QString sLimit;
// if (this->Data->PageIndex > 0) {
// if (this->Data->PageSize > 0)
sLimit = QString("%1,%2").arg(this->Data->PageIndex * this->Data->PageSize).arg(this->Data->PageSize);
// else
// sLimit = QString::number(this->Data->PageIndex);
// } else //limit > 0
// sLimit = QString("0,%1").arg(this->Data->PageSize);
QString sLimit = QString::number(this->Data->PageIndex * this->Data->PageSize) + ",";
if (_selectOne)
sLimit += "1";
else
sLimit += QString::number(this->Data->PageSize);

if (SQLPrettyLen) {
QueryParts.append(QString("LIMIT").rightJustified(SQLPrettyLen)
Expand Down
54 changes: 27 additions & 27 deletions Interfaces/Test/Test.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@

HEADERS += \
$$BASE_PROJECT_PATH/Interfaces/Test/testBase.hpp \
$$BASE_PROJECT_PATH/Interfaces/Test/testCommon.hpp \
$$BASE_PROJECT_PATH/Interfaces/Server/clsSimpleCrypt.h \
# $$BASE_PROJECT_PATH/Interfaces/AAA/PrivHelpers.h \
# $$BASE_PROJECT_PATH/Interfaces/AAA/Authentication.h \
# $$BASE_PROJECT_PATH/Interfaces/AAA/intfAccountingBasedModule.h \
$$BASE_PROJECT_PATH/Interfaces/Server/QJWT.h \
$$BASE_PROJECT_PATH/Interfaces/Server/ServerCommon.h \
$$BASE_PROJECT_PATH/Interfaces/Server/APICallBoom.h \
$$BASE_PROJECT_PATH/Interfaces/Helpers/RESTClientHelper.h \
$$BASE_PROJECT_PATH/Interfaces/Helpers/SecurityHelper.h \
$$BASE_PROJECT_PATH/Interfaces/Helpers/URLHelper.h \
$$BASE_PROJECT_PATH/Interfaces/Helpers/TokenHelper.h
$$BASE_PROJECT_PATH/Interfaces/Test/testCommon.hpp

# $$BASE_PROJECT_PATH/Interfaces/Server/clsSimpleCrypt.h \
# $$BASE_PROJECT_PATH/Interfaces/Server/QJWT.h \
# $$BASE_PROJECT_PATH/Interfaces/Server/ServerCommon.h \
# $$BASE_PROJECT_PATH/Interfaces/Server/APICallBoom.h \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/RESTClientHelper.h \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/SecurityHelper.h \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/URLHelper.h \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/TokenHelper.h

SOURCES += \
$$BASE_PROJECT_PATH/Interfaces/Server/clsSimpleCrypt.cpp \
# $$BASE_PROJECT_PATH/Interfaces/AAA/PrivHelpers.cpp \
# $$BASE_PROJECT_PATH/Interfaces/AAA/Authentication.cpp \
# $$BASE_PROJECT_PATH/Interfaces/AAA/intfAccountingBasedModule.cpp \
$$BASE_PROJECT_PATH/Interfaces/Server/QJWT.cpp \
$$BASE_PROJECT_PATH/Interfaces/Server/ServerCommon.cpp \
$$BASE_PROJECT_PATH/Interfaces/Server/APICallBoom.cpp \
$$BASE_PROJECT_PATH/Interfaces/Helpers/RESTClientHelper.cpp \
$$BASE_PROJECT_PATH/Interfaces/Helpers/SecurityHelper.cpp \
$$BASE_PROJECT_PATH/Interfaces/Helpers/URLHelper.cpp \
$$BASE_PROJECT_PATH/Interfaces/Helpers/TokenHelper.cpp \
$$BASE_PROJECT_PATH/Interfaces/Common/base.cpp \
$$BASE_PROJECT_PATH/Interfaces/Common/GenericTypes.cpp \
$$BASE_PROJECT_PATH/Interfaces/Common/intfAPIArgManipulator.cpp \
$$BASE_PROJECT_PATH/Interfaces/DBM/clsORMField.cpp \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp

# $$BASE_PROJECT_PATH/Interfaces/Server/clsSimpleCrypt.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Server/QJWT.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Server/ServerCommon.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Server/APICallBoom.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/RESTClientHelper.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/SecurityHelper.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/URLHelper.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Helpers/TokenHelper.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Common/base.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Common/GenericTypes.cpp \
# $$BASE_PROJECT_PATH/Interfaces/Common/intfAPIArgManipulator.cpp \
# $$BASE_PROJECT_PATH/Interfaces/DBM/clsORMField.cpp \

LIBS += -lcurl \
-lTargomanAPIInterface

DEFINES += UNITTEST_DB_HOST="127.0.0.1"
DEFINES += UNITTEST_DB_PORT=3306
Expand Down
3 changes: 0 additions & 3 deletions Modules/Account/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ HEADERS += \
testJWT.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
3 changes: 0 additions & 3 deletions Modules/Advert/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ HEADERS += \
testAdvertFixture.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
3 changes: 0 additions & 3 deletions Modules/Common/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ HEADERS += \
testCommon.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
3 changes: 0 additions & 3 deletions Modules/MT/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ HEADERS += \
testMT.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
2 changes: 0 additions & 2 deletions Modules/NGT/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
3 changes: 0 additions & 3 deletions Modules/TargomanMT/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ HEADERS += \
testTargomanMT.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
3 changes: 0 additions & 3 deletions Modules/Ticketing/functionalTest/functionalTest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ HEADERS += \
testTicketingFixture.hpp

SOURCES += \
$$BASE_PROJECT_PATH/3rdParty/QtCurl/libsrc/QtCUrl.cpp \
main.cpp \

LIBS += -lcurl

BASE_TEST_PATH = $$BASE_PROJECT_PATH/Interfaces/Test
INCLUDEPATH += $$BASE_TEST_PATH
include($$BASE_TEST_PATH/Test.pri)
Expand Down
2 changes: 1 addition & 1 deletion TargomanAPI.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ addSubdirs(Interfaces, Dependencies)
addSubdirs(App, Interfaces)
addSubdirs(ModuleHelpers, Interfaces)
addSubdirs(Modules, App)
#addSubdirs(unitTest, Modules)
addSubdirs(unitTest, Modules)

# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-#
OTHER_FILES += \
Expand Down
Loading