diff options
| -rw-r--r-- | src/nfc/qnearfieldtarget.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index e9a6fa11..f7612d36 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.cpp @@ -538,6 +538,7 @@ bool QNearFieldTarget::handleResponse(const QNearFieldTarget::RequestId &id, void QNearFieldTarget::reportError(QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id) { + setResponseForRequest(id, QVariant(), false); QMetaObject::invokeMethod(this, [this, error, id]() { Q_EMIT this->error(error, id); }, Qt::QueuedConnection); diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index fb7aa7ae..2d1f052e 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -174,8 +174,7 @@ void tst_QNearFieldTagType1::staticMemoryModel() quint8 byte = target->requestResponse(id).toUInt(); id = target->writeByte(i, 0x55); - QVERIFY(!target->waitForRequestCompleted(id,50)); - + QVERIFY(target->waitForRequestCompleted(id)); QVERIFY(!target->requestResponse(id).isValid()); id = target->readByte(i); @@ -224,8 +223,7 @@ void tst_QNearFieldTagType1::staticMemoryModel() quint8 byte = target->requestResponse(id).toUInt(); id = target->writeByte(i, 0x55); - QVERIFY(!target->waitForRequestCompleted(id,50)); - + QVERIFY(target->waitForRequestCompleted(id)); QVERIFY(!target->requestResponse(id).isValid()); id = target->readByte(i); @@ -272,7 +270,7 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() QCOMPARE(quint8(block.at(7)), quint8(0x00)); id = target->writeBlock(0x00, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id,50)); + QVERIFY(target->waitForRequestCompleted(id)); QVERIFY(!target->requestResponse(id).isValid()); QCOMPARE(target->uid(), block.left(7)); @@ -338,7 +336,7 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() QByteArray block = target->requestResponse(id).toByteArray(); id = target->writeBlock(i, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id,50)); + QVERIFY(target->waitForRequestCompleted(id)); QVERIFY(!target->requestResponse(id).isValid()); id = target->readBlock(i); @@ -350,14 +348,17 @@ void tst_QNearFieldTagType1::dynamicMemoryModel() for (int i = 0; i < 256; ++i) { QNearFieldTarget::RequestId id = target->readBlock(i); - QVERIFY(!target->waitForRequestCompleted(id,50)); + QVERIFY(target->waitForRequestCompleted(id)); + QVERIFY(!target->requestResponse(id).isValid()); id = target->writeBlock(i, QByteArray(8, quint8(0x55))); - QVERIFY(!target->waitForRequestCompleted(id,50)); + QVERIFY(target->waitForRequestCompleted(id)); + QVERIFY(!target->requestResponse(id).isValid()); } for (int i = 0; i < 16; ++i) { QNearFieldTarget::RequestId id = target->readSegment(i); - QVERIFY(!target->waitForRequestCompleted(id,50)); + QVERIFY(target->waitForRequestCompleted(id)); + QVERIFY(!target->requestResponse(id).isValid()); } } } |