diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-07-06 06:37:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-10 09:03:46 +0200 |
| commit | 4fca8de918b4ae7b8b745f60847e28f948089445 (patch) | |
| tree | 73bdc3791e04a87af33f87644ea1bbc281957969 /tests | |
| parent | db2fc63155e8c821f5c6c751a33974cab9cb4ed3 (diff) | |
Fixing QNearFieldTarget::waitForRequestCompleted
The current implementation is not waiting at all.
Adjust the waiting time for the tagtype1 unit test
to avoid 30min runtime.
Change-Id: Ied9cff72456b964af9224362f47113a7e2c792ae
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index f0de309b..52c19912 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -187,7 +187,7 @@ void tst_QNearFieldTagType1::staticMemoryModel() quint8 byte = target->requestResponse(id).toUInt(); id = target->writeByte(i, 0x55); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); QVERIFY(!target->requestResponse(id).isValid()); @@ -237,7 +237,7 @@ void tst_QNearFieldTagType1::staticMemoryModel() quint8 byte = target->requestResponse(id).toUInt(); id = target->writeByte(i, 0x55); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); QVERIFY(!target->requestResponse(id).isValid()); @@ -285,7 +285,7 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() QCOMPARE(quint8(block.at(7)), quint8(0x00)); id = target->writeBlock(0x00, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); QVERIFY(!target->requestResponse(id).isValid()); QCOMPARE(target->uid(), block.left(7)); @@ -351,7 +351,7 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() QByteArray block = target->requestResponse(id).toByteArray(); id = target->writeBlock(i, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); QVERIFY(!target->requestResponse(id).isValid()); id = target->readBlock(i); @@ -363,14 +363,14 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() for (int i = 0; i < 256; ++i) { QNearFieldTarget::RequestId id = target->readBlock(i); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); id = target->writeBlock(i, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); } for (int i = 0; i < 16; ++i) { QNearFieldTarget::RequestId id = target->readSegment(i); - QVERIFY(!target->waitForRequestCompleted(id)); + QVERIFY(!target->waitForRequestCompleted(id,50)); } } } |