From 174ede92eefe414712445c519b98b880088ddf1c Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Tue, 12 Nov 2019 14:13:39 +0100 Subject: [PATCH] fixing unittests ( using guiless app ) --- src/serversdk/databaseutils.cpp | 5 ++++ src/serversdk/databaseutils.h | 2 ++ test/auto/database/tst_databaseutils.cpp | 1 - test/auto/database/tst_sqlite.cpp | 6 ++--- test/auto/request/tst_requestmanager.cpp | 29 +++--------------------- 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/serversdk/databaseutils.cpp b/src/serversdk/databaseutils.cpp index 979d87a..fe66019 100644 --- a/src/serversdk/databaseutils.cpp +++ b/src/serversdk/databaseutils.cpp @@ -140,6 +140,11 @@ QSqlQuery DatabaseUtils::insertIntoTable(const DatabaseTable *table, const QStri return res; } +void DatabaseUtils::udpateFromSqlQuery(DatabaseTable *table, QSqlQuery query) const +{ + qCDebug(sdkdb) << "not implemented"; +} + QString DatabaseUtils::sqlType() const { return mSqlType; diff --git a/src/serversdk/databaseutils.h b/src/serversdk/databaseutils.h index 852e488..70e40b4 100644 --- a/src/serversdk/databaseutils.h +++ b/src/serversdk/databaseutils.h @@ -22,6 +22,8 @@ public: QSqlQuery createTable(const DatabaseTable *table, const QString table_name) const; QSqlQuery insertIntoTable(const DatabaseTable *table, const QString table_name) const; + void udpateFromSqlQuery(DatabaseTable *table, QSqlQuery query) const; + QString sqlType() const; void setSqlType(const QString &sqlType); diff --git a/test/auto/database/tst_databaseutils.cpp b/test/auto/database/tst_databaseutils.cpp index ca5a4ba..8d2618a 100644 --- a/test/auto/database/tst_databaseutils.cpp +++ b/test/auto/database/tst_databaseutils.cpp @@ -10,7 +10,6 @@ class BookTable : public serversdk::DatabaseTable { Q_OBJECT - Q_CLASSINFO("default_table", "books") TABLE_PROPERTY(QUuid, id, set_id, QUuid()); TABLE_PROPERTY(QString, description, set_description, ""); TABLE_PROPERTY(QDateTime, last_update, set_last_update, QDateTime::fromSecsSinceEpoch(0)); diff --git a/test/auto/database/tst_sqlite.cpp b/test/auto/database/tst_sqlite.cpp index f676f32..fc85399 100644 --- a/test/auto/database/tst_sqlite.cpp +++ b/test/auto/database/tst_sqlite.cpp @@ -91,11 +91,11 @@ void SqliteTest::createTable_test() QSqlQuery insertQuery = utils.insertIntoTable(names.get(), "names"); //Q_ASSERT(insertQuery.isValid()); - - // Select from table QSqlQuery selectSQL("SELECT * FROM names"); -// Q_ASSERT(db.executeQuery(selectSQL)); + + // TODO: finish -> have to use sqlPlain + // Q_ASSERT(db.executeQselectSQL)); while (selectSQL.next()) { QString value = selectSQL.value(1).toString(); qDebug() << "value is" << value; diff --git a/test/auto/request/tst_requestmanager.cpp b/test/auto/request/tst_requestmanager.cpp index ab568ff..2d18716 100644 --- a/test/auto/request/tst_requestmanager.cpp +++ b/test/auto/request/tst_requestmanager.cpp @@ -54,37 +54,14 @@ void RequestManagerTest::colnodAuthorization_test() Token token; + QVERIFY(token.id().isNull()); // must be null token.fromJson(data); - - qDebug() << "token is" << token.id(); - - - - - - - - qDebug() << "repsonse data:" << loginRequest->responseData(); - - - - - - if (loginRequest->networkReply()->error()) { - qDebug() << "error for reply:" << loginRequest->networkReply()->errorString(); - if (!loginRequest->responseData().isEmpty() && !loginRequest->responseData().contains("error")){ - auto jsonDoc = QJsonDocument::fromJson(loginRequest->responseData()); - QString token = jsonDoc.object()["id"].toString(); - } - else { - qDebug() << "Login failed."; - } - } + QVERIFY(!token.id().isNull()); // mut not be null ( authentication token ) } } -QTEST_MAIN(serversdk::RequestManagerTest) +QTEST_GUILESS_MAIN(serversdk::RequestManagerTest) #include "tst_requestmanager.moc"