removed TABLE_PROPERTY form default class

+ had to subclass
+ removed unused code
This commit is contained in:
Filip Bucek 2019-11-14 13:33:02 +01:00
parent 29f7103ece
commit 8821dfc9b2
4 changed files with 11 additions and 10 deletions

View File

@ -78,12 +78,9 @@ namespace serversdk {
class DatabaseTable : public QObject class DatabaseTable : public QObject
{ {
Q_OBJECT Q_OBJECT
TABLE_PROPERTY(int, id, setId, 0);
TABLE_PROPERTY(QString, name, setName, QString());
public: public:
explicit DatabaseTable(QObject *parent = nullptr); explicit DatabaseTable(QObject *parent = nullptr);
/** /**
* @brief Creates JSON from QMetaObject data ( Q_PROPERTY ) -> TABLE_PROPERTY * @brief Creates JSON from QMetaObject data ( Q_PROPERTY ) -> TABLE_PROPERTY
* @return text json e.g. { "id": 00344 } * @return text json e.g. { "id": 00344 }

View File

@ -91,8 +91,12 @@ void PostgresqlTest::createTable_test()
auto list = Names::fromListVariantMap(listVariantMap); auto list = Names::fromListVariantMap(listVariantMap);
// ENSURE SAME // 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<Names>(first);
QCOMPARE(list.count(), 1); QCOMPARE(list.count(), 1);
QCOMPARE(list.first()->name(), QStringLiteral("Testname")); QCOMPARE(names_tab->name(), QStringLiteral("Testname"));
QCOMPARE(list.first()->jsonData(), names.jsonData()); QCOMPARE(list.first()->jsonData(), names.jsonData());
} }

View File

@ -90,8 +90,10 @@ void SqliteTest::createTable_test()
auto list = Names::fromListVariantMap(listVariantMap); auto list = Names::fromListVariantMap(listVariantMap);
// ENSURE SAME // ENSURE SAME
auto first = list.first();
auto names_tab = std::dynamic_pointer_cast<Names>(first);
QCOMPARE(list.count(), 1); QCOMPARE(list.count(), 1);
QCOMPARE(list.first()->name(), QStringLiteral("Testname")); QCOMPARE(names_tab->name(), QStringLiteral("Testname"));
QCOMPARE(list.first()->jsonData(), names.jsonData()); QCOMPARE(list.first()->jsonData(), names.jsonData());
} }

View File

@ -123,11 +123,9 @@ void SoapTest::public_soap_test()
// QVERIFY(fileWrite.open(QIODevice::WriteOnly)); // QVERIFY(fileWrite.open(QIODevice::WriteOnly));
// fileWrite.write(req->responseData()); // fileWrite.write(req->responseData());
// fileWrite.close(); // fileWrite.close();
QProcess process; // QProcess process;
process.start("hostname"); // process.start("hostname");
process.waitForFinished(-1); // will wait forever until finished // process.waitForFinished(-1); // will wait forever until finished
QString temp = process.readAllStandardOutput();
QCOMPARE(req->responseData(), xmlResponse); QCOMPARE(req->responseData(), xmlResponse);
} }