diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-27 13:33:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-29 09:26:57 +0100 |
| commit | e5816feca50e57f538c9353881cd39bc0aba4abf (patch) | |
| tree | e59fa9856ed2c79a4b63026863e921b990faa2c7 /tests | |
| parent | 2f58f9d59e18e600be1a4f03b233d1486b399e16 (diff) | |
| download | qtenginio-e5816feca50e57f538c9353881cd39bc0aba4abf.tar.gz | |
Start moving code away from ReplyBase
Change-Id: Ib164de80c2741261e587c095635f7bc9e61c18f5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/common/common.h | 2 | ||||
| -rw-r--r-- | tests/auto/enginioclient/tst_enginioclient.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/enginiomodel/tst_enginiomodel.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qmltests/tst_enginioclient.qml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/common/common.h b/tests/auto/common/common.h index d174373..11cc2a7 100644 --- a/tests/auto/common/common.h +++ b/tests/auto/common/common.h @@ -65,7 +65,7 @@ } \ QVERIFY(response->isFinished()); \ QVERIFY(!response->isError()); \ - QCOMPARE(response->errorType(), EnginioReply::NoError);\ + QCOMPARE(response->errorType(), Enginio::NoError);\ QCOMPARE(response->networkError(), QNetworkReply::NoError);\ QVERIFY(response->backendStatus() >= 200 && response->backendStatus() < 300); diff --git a/tests/auto/enginioclient/tst_enginioclient.cpp b/tests/auto/enginioclient/tst_enginioclient.cpp index 5acc660..a36a743 100644 --- a/tests/auto/enginioclient/tst_enginioclient.cpp +++ b/tests/auto/enginioclient/tst_enginioclient.cpp @@ -1206,7 +1206,7 @@ void tst_EnginioClient::backendFakeReply() QVERIFY(!data["errors"].toArray()[0].toObject()["message"].toString().isEmpty()); QVERIFY(!data["errors"].toArray()[0].toObject()["reason"].toString().isEmpty()); - QCOMPARE(reply->errorType(), EnginioReply::BackendError); + QCOMPARE(reply->errorType(), Enginio::BackendError); QVERIFY(reply->networkError() != QNetworkReply::NoError); QCOMPARE(reply->backendStatus(), 400); diff --git a/tests/auto/enginiomodel/tst_enginiomodel.cpp b/tests/auto/enginiomodel/tst_enginiomodel.cpp index 9400d00..9d1ed35 100644 --- a/tests/auto/enginiomodel/tst_enginiomodel.cpp +++ b/tests/auto/enginiomodel/tst_enginiomodel.cpp @@ -393,7 +393,7 @@ struct InvalidRemoveErrorChecker: public ReplyCounter { QVERIFY(reply->isFinished()); QVERIFY(reply->isError()); - QCOMPARE(reply->errorType(), EnginioReply::BackendError); + QCOMPARE(reply->errorType(), Enginio::BackendError); QVERIFY(reply->networkError() != QNetworkReply::NoError);\ QCOMPARE(reply->backendStatus(), 400); @@ -1347,7 +1347,7 @@ void tst_EnginioModel::deleteModelDurringRequests() for (int i = 2; i < replies.count(); ++i) { QVERIFY(replies[i]->isError()); - QCOMPARE(replies[i]->errorType(), EnginioReply::BackendError); + QCOMPARE(replies[i]->errorType(), Enginio::BackendError); QCOMPARE(replies[i]->backendStatus(), 400); QVERIFY(!replies[i]->errorString().isEmpty()); QVERIFY(!replies[i]->data().isEmpty()); diff --git a/tests/auto/qmltests/tst_enginioclient.qml b/tests/auto/qmltests/tst_enginioclient.qml index 30c8bc9..a461a6d 100644 --- a/tests/auto/qmltests/tst_enginioclient.qml +++ b/tests/auto/qmltests/tst_enginioclient.qml @@ -91,7 +91,7 @@ Item { property int errorCount: 0 onError: { - if (reply.errorType === EnginioReply.BackendError + if (reply.errorType === Enginio.BackendError && reply.data.errors[0].message.length > 0 && reply.data.errors[0].reason.length > 0 && reply.backendStatus === 400 |