diff --git a/src/serversdk/databasetable.h b/src/serversdk/databasetable.h index dc0e899..ad65292 100644 --- a/src/serversdk/databasetable.h +++ b/src/serversdk/databasetable.h @@ -78,12 +78,9 @@ namespace serversdk { class DatabaseTable : public QObject { Q_OBJECT - TABLE_PROPERTY(int, id, setId, 0); - TABLE_PROPERTY(QString, name, setName, QString()); public: explicit DatabaseTable(QObject *parent = nullptr); - /** * @brief Creates JSON from QMetaObject data ( Q_PROPERTY ) -> TABLE_PROPERTY * @return text json e.g. { "id": 00344 } diff --git a/test/auto/database/tst_postgresql.cpp b/test/auto/database/tst_postgresql.cpp index 803627a..345a0c3 100644 --- a/test/auto/database/tst_postgresql.cpp +++ b/test/auto/database/tst_postgresql.cpp @@ -91,8 +91,12 @@ void PostgresqlTest::createTable_test() auto list = Names::fromListVariantMap(listVariantMap); // ENSURE SAME + auto first = list.first(); + // Problem is that fromListvariantMap returns shared_ptr of class DataTable + // Must subclass. + auto names_tab = std::dynamic_pointer_cast(first); QCOMPARE(list.count(), 1); - QCOMPARE(list.first()->name(), QStringLiteral("Testname")); + QCOMPARE(names_tab->name(), QStringLiteral("Testname")); QCOMPARE(list.first()->jsonData(), names.jsonData()); } diff --git a/test/auto/database/tst_sqlite.cpp b/test/auto/database/tst_sqlite.cpp index a120867..481e1f0 100644 --- a/test/auto/database/tst_sqlite.cpp +++ b/test/auto/database/tst_sqlite.cpp @@ -90,8 +90,10 @@ void SqliteTest::createTable_test() auto list = Names::fromListVariantMap(listVariantMap); // ENSURE SAME + auto first = list.first(); + auto names_tab = std::dynamic_pointer_cast(first); QCOMPARE(list.count(), 1); - QCOMPARE(list.first()->name(), QStringLiteral("Testname")); + QCOMPARE(names_tab->name(), QStringLiteral("Testname")); QCOMPARE(list.first()->jsonData(), names.jsonData()); } diff --git a/test/auto/request/tst_soaptest.cpp b/test/auto/request/tst_soaptest.cpp index a6d210d..c2d94a7 100644 --- a/test/auto/request/tst_soaptest.cpp +++ b/test/auto/request/tst_soaptest.cpp @@ -123,11 +123,9 @@ void SoapTest::public_soap_test() // QVERIFY(fileWrite.open(QIODevice::WriteOnly)); // fileWrite.write(req->responseData()); // fileWrite.close(); - QProcess process; - process.start("hostname"); - process.waitForFinished(-1); // will wait forever until finished - - QString temp = process.readAllStandardOutput(); +// QProcess process; +// process.start("hostname"); +// process.waitForFinished(-1); // will wait forever until finished QCOMPARE(req->responseData(), xmlResponse); }