forked from ondra/colnod-connector
found source of bug: getTokens were not finished leaving dangling QNetworkReply
This commit is contained in:
parent
2d77736648
commit
7300a8d108
@ -15,10 +15,9 @@ ColnodAPI::ColnodAPI(serversdk::RequestManager* reqMan, const bool &dryMode, QSt
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Downloads new data from Colnod -> emits downloadDataFinished signal
|
* @brief Downloads new data from Colnod -> emits downloadDataFinished signal
|
||||||
* @param time
|
* @param time - timestamp -> ms from 1970
|
||||||
*
|
*
|
||||||
* @return signal with nullptr when something went wrong
|
* @return emits signal with data when ok, or nullptr, when error
|
||||||
* @return signal with data when valid data returned
|
|
||||||
*/
|
*/
|
||||||
bool ColnodAPI::downloadData(const qint64 &time)
|
bool ColnodAPI::downloadData(const qint64 &time)
|
||||||
{
|
{
|
||||||
@ -34,14 +33,14 @@ bool ColnodAPI::downloadData(const qint64 &time)
|
|||||||
// Get login token
|
// Get login token
|
||||||
if (login->status() != 200) {
|
if (login->status() != 200) {
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
AuthToken token;
|
AuthToken token;
|
||||||
auto responseData = login->responseData();
|
auto responseData = login->responseData();
|
||||||
if (responseData.isEmpty()) {
|
if (responseData.isEmpty()) {
|
||||||
qCWarning(colnod) << "empty response data when logging in";
|
qCWarning(colnod) << "empty response data when logging in";
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
token.fromJson(responseData);
|
token.fromJson(responseData);
|
||||||
@ -49,7 +48,7 @@ bool ColnodAPI::downloadData(const qint64 &time)
|
|||||||
if (authToken.isEmpty()) {
|
if (authToken.isEmpty()) {
|
||||||
qCCritical(colnod) << "Token uuid is empty";
|
qCCritical(colnod) << "Token uuid is empty";
|
||||||
emit downloadDataFinished(nullptr);
|
emit downloadDataFinished(nullptr);
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -64,7 +63,9 @@ bool ColnodAPI::downloadData(const qint64 &time)
|
|||||||
|
|
||||||
auto checkData = [=]() {
|
auto checkData = [=]() {
|
||||||
qDebug() << "check data" << dataCount;
|
qDebug() << "check data" << dataCount;
|
||||||
// FIX: Problem with ASSERT: "dataCount < 5" -> datacount sometime -> 32677 ( bad memory allocation )
|
// VALIDATE: problem was in unitest getTokens
|
||||||
|
// -> no tests -> destroying QNetworkRequest when QNetworkReply was running
|
||||||
|
// FIXME: Problem with ASSERT: "dataCount < 5" -> datacount sometime -> 32677 ( bad memory allocation )
|
||||||
// Not possible to pinpoint memory problem.
|
// Not possible to pinpoint memory problem.
|
||||||
// Possible sources:
|
// Possible sources:
|
||||||
// 0) Bad code -> dataCount -> &dataCount -> ++ what it does. Increase dataCount or increment address?
|
// 0) Bad code -> dataCount -> &dataCount -> ++ what it does. Increase dataCount or increment address?
|
||||||
@ -126,6 +127,7 @@ bool ColnodAPI::downloadData(const qint64 &time)
|
|||||||
}
|
}
|
||||||
checkData();
|
checkData();
|
||||||
});
|
});
|
||||||
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -182,6 +184,11 @@ std::shared_ptr<serversdk::Request> ColnodAPI::requestLogin()
|
|||||||
return loginRequest;
|
return loginRequest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return sucess :
|
||||||
|
* @return fail :
|
||||||
|
* @return no data :
|
||||||
|
*/
|
||||||
std::shared_ptr<serversdk::Request> ColnodAPI::getTokensUpdated(const Timestamp &time)
|
std::shared_ptr<serversdk::Request> ColnodAPI::getTokensUpdated(const Timestamp &time)
|
||||||
{
|
{
|
||||||
auto request = composeRequest("/TokenManager/getTokensUpdated", time.jsonData());
|
auto request = composeRequest("/TokenManager/getTokensUpdated", time.jsonData());
|
||||||
@ -190,6 +197,11 @@ std::shared_ptr<serversdk::Request> ColnodAPI::getTokensUpdated(const Timestamp
|
|||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return sucess :
|
||||||
|
* @return fail :
|
||||||
|
* @return no data :
|
||||||
|
*/
|
||||||
std::shared_ptr<serversdk::Request> ColnodAPI::getTokensDeleted(const Timestamp &time)
|
std::shared_ptr<serversdk::Request> ColnodAPI::getTokensDeleted(const Timestamp &time)
|
||||||
{
|
{
|
||||||
auto request = composeRequest("/TokenManager/getTokensDeleted", time.jsonData());
|
auto request = composeRequest("/TokenManager/getTokensDeleted", time.jsonData());
|
||||||
@ -198,6 +210,11 @@ std::shared_ptr<serversdk::Request> ColnodAPI::getTokensDeleted(const Timestamp
|
|||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return sucess :
|
||||||
|
* @return fail :
|
||||||
|
* @return no data :
|
||||||
|
*/
|
||||||
std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsUpdated(const Timestamp &time)
|
std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsUpdated(const Timestamp &time)
|
||||||
{
|
{
|
||||||
auto request = composeRequest("/SubjectManager/getSubjectsUpdated", time.jsonData());
|
auto request = composeRequest("/SubjectManager/getSubjectsUpdated", time.jsonData());
|
||||||
@ -206,6 +223,11 @@ std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsUpdated(const Timestam
|
|||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return sucess :
|
||||||
|
* @return fail :
|
||||||
|
* @return no data :
|
||||||
|
*/
|
||||||
std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsDeleted(const Timestamp &time)
|
std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsDeleted(const Timestamp &time)
|
||||||
{
|
{
|
||||||
auto request = composeRequest("/SubjectManager/getSubjectsDeleted", time.jsonData());
|
auto request = composeRequest("/SubjectManager/getSubjectsDeleted", time.jsonData());
|
||||||
@ -214,6 +236,10 @@ std::shared_ptr<serversdk::Request> ColnodAPI::getSubjectsDeleted(const Timestam
|
|||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return sucess :
|
||||||
|
* @return fail :
|
||||||
|
*/
|
||||||
std::shared_ptr<serversdk::Request> ColnodAPI::setTokens(const QHash<QString, std::shared_ptr<Token>> &tokens)
|
std::shared_ptr<serversdk::Request> ColnodAPI::setTokens(const QHash<QString, std::shared_ptr<Token>> &tokens)
|
||||||
{
|
{
|
||||||
auto request = composeRequest("/TokenManager/setTokens", Token::tokensToColnodJson(tokens));
|
auto request = composeRequest("/TokenManager/setTokens", Token::tokensToColnodJson(tokens));
|
||||||
|
|||||||
@ -46,9 +46,6 @@ std::shared_ptr<Data> DatabaseAPI::downloadData()
|
|||||||
}
|
}
|
||||||
|
|
||||||
return composeData(updatedQuery, deletedQuery);
|
return composeData(updatedQuery, deletedQuery);
|
||||||
// TODO: why emiting signal??
|
|
||||||
// this can return Strucutre
|
|
||||||
//emit downloadDataFinished(composeData(updatedQuery, deletedQuery));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DatabaseAPI::processData(const std::shared_ptr<Data> &data)
|
bool DatabaseAPI::processData(const std::shared_ptr<Data> &data)
|
||||||
|
|||||||
@ -264,8 +264,6 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataUsindOld(const std::shared
|
|||||||
Q_ASSERT(colnodData);
|
Q_ASSERT(colnodData);
|
||||||
Q_ASSERT(databaseData);
|
Q_ASSERT(databaseData);
|
||||||
|
|
||||||
|
|
||||||
// TODO: why copy data?
|
|
||||||
std::shared_ptr<Data> cloneColnodDataToProcess = std::make_shared<Data>(*colnodData);
|
std::shared_ptr<Data> cloneColnodDataToProcess = std::make_shared<Data>(*colnodData);
|
||||||
std::shared_ptr<Data> cloneDatabaseDataToProcess = std::make_shared<Data>(*databaseData);
|
std::shared_ptr<Data> cloneDatabaseDataToProcess = std::make_shared<Data>(*databaseData);
|
||||||
|
|
||||||
|
|||||||
@ -18,12 +18,12 @@ public:
|
|||||||
qRegisterMetaType<std::shared_ptr<serversdk::Request>>("std::shared_ptr<Request>");
|
qRegisterMetaType<std::shared_ptr<serversdk::Request>>("std::shared_ptr<Request>");
|
||||||
}
|
}
|
||||||
|
|
||||||
private slots:
|
private :
|
||||||
|
Q_SLOT void getTokens();
|
||||||
|
Q_SLOT void download_test();
|
||||||
|
Q_SLOT void download_data_test_now();
|
||||||
|
Q_SLOT void download_data_fail_test();
|
||||||
void login();
|
void login();
|
||||||
void getTokens();
|
|
||||||
void download_test();
|
|
||||||
void download_data_test_now();
|
|
||||||
void download_data_fail_test();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString getLoginToken(ColnodAPI &colnod);
|
QString getLoginToken(ColnodAPI &colnod);
|
||||||
@ -34,26 +34,42 @@ void ColnodTest::login()
|
|||||||
serversdk::RequestManager reqMan;
|
serversdk::RequestManager reqMan;
|
||||||
ColnodAPI colnod(&reqMan);
|
ColnodAPI colnod(&reqMan);
|
||||||
auto login = colnod.requestLogin();
|
auto login = colnod.requestLogin();
|
||||||
|
QVERIFY(login);
|
||||||
|
QVERIFY(login->networkReply());
|
||||||
QSignalSpy spy(login.get(), &serversdk::Request::finished);
|
QSignalSpy spy(login.get(), &serversdk::Request::finished);
|
||||||
QCOMPARE(spy.count(), 0);
|
QCOMPARE(spy.count(), 0);
|
||||||
QVERIFY(spy.wait());
|
QVERIFY(spy.wait());
|
||||||
QCOMPARE(spy.count(), 1);
|
QCOMPARE(spy.count(), 1);
|
||||||
QVERIFY(login->responseData().contains("id"));
|
QVERIFY(login->responseData().contains("id"));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ColnodTest::getTokens()
|
void ColnodTest::getTokens()
|
||||||
{
|
{
|
||||||
|
// FIXME: finish this -> must be valid test testing something
|
||||||
|
// FIXME: Was not testing anything only causing bug
|
||||||
serversdk::RequestManager reqMan;
|
serversdk::RequestManager reqMan;
|
||||||
ColnodAPI colnod(&reqMan);
|
ColnodAPI colnod(&reqMan);
|
||||||
|
|
||||||
// get login token
|
// get login token
|
||||||
|
// FIXME: calling login request two times
|
||||||
auto login = colnod.requestLogin();
|
auto login = colnod.requestLogin();
|
||||||
QSignalSpy spy(login.get(), &serversdk::Request::finished);
|
QSignalSpy spy(login.get(), &serversdk::Request::finished);
|
||||||
spy.wait();
|
QVERIFY(spy.isValid());
|
||||||
QString token = getLoginToken(colnod);
|
QVERIFY(spy.wait());
|
||||||
|
//login->responseData().mid(7,36);
|
||||||
|
// NOTE: second calling of loging request
|
||||||
|
//QString token = getLoginToken(colnod);
|
||||||
Timestamp time;
|
Timestamp time;
|
||||||
time.setTimestamp(QDateTime::currentMSecsSinceEpoch());
|
time.setTimestamp(QDateTime::currentMSecsSinceEpoch());
|
||||||
colnod.getTokensUpdated(time);
|
auto request = colnod.getTokensUpdated(time);
|
||||||
|
|
||||||
|
// FIXING BUG: creating request not waiting for it immediatelly destroying request
|
||||||
|
// immediatelly reqMan goes out of scope destroying QNetworkRequestManager with QNetworkReply running.
|
||||||
|
QSignalSpy requestSpy(request.get(), &serversdk::Request::finished);
|
||||||
|
QVERIFY(requestSpy.wait()); // <-- have to wait here for request!!!!
|
||||||
|
// FIXME: check request and finish test!!
|
||||||
}
|
}
|
||||||
|
|
||||||
void ColnodTest::download_test()
|
void ColnodTest::download_test()
|
||||||
@ -95,6 +111,7 @@ void ColnodTest::download_data_test_now()
|
|||||||
QVERIFY(data->updatedTokens.isEmpty());
|
QVERIFY(data->updatedTokens.isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ColnodTest::download_data_fail_test()
|
void ColnodTest::download_data_fail_test()
|
||||||
{
|
{
|
||||||
serversdk::RequestManager reqMan;
|
serversdk::RequestManager reqMan;
|
||||||
@ -105,6 +122,7 @@ void ColnodTest::download_data_fail_test()
|
|||||||
|
|
||||||
QVERIFY(spy.wait());
|
QVERIFY(spy.wait());
|
||||||
|
|
||||||
|
// FIXME: problem with returning data
|
||||||
auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
|
auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
|
||||||
|
|
||||||
QVERIFY(!data);
|
QVERIFY(!data);
|
||||||
|
|||||||
@ -23,12 +23,6 @@ void DatabaseTest::open_database_test()
|
|||||||
serversdk::DatabaseManager dbManager;
|
serversdk::DatabaseManager dbManager;
|
||||||
DatabaseAPI db(&dbManager, false);
|
DatabaseAPI db(&dbManager, false);
|
||||||
QVERIFY(db.open());
|
QVERIFY(db.open());
|
||||||
|
|
||||||
// TODO: fix -> databaseAPI must be able to add credentials to check for wrong one or test wrong IP
|
|
||||||
//db.open(user, password, url, etc );
|
|
||||||
// then test with wrong credentials
|
|
||||||
// QVERIFY(!db.open(worng usernae));
|
|
||||||
// QVERIFY(!db.open(worng ip));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DatabaseTest::open_database_ip_fail_test()
|
void DatabaseTest::open_database_ip_fail_test()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user