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>

4 files changed, 21 insertions, 32 deletions

diff --git a/src/nfc/qnearfieldtagtype2.cpp b/src/nfc/qnearfieldtagtype2.cpp
index 41b228bf..91ed9cca 100644
--- a/src/nfc/qnearfieldtagtype2.cpp
+++ b/src/nfc/qnearfieldtagtype2.cpp
@@ -262,26 +262,6 @@ QNearFieldTarget::RequestId QNearFieldTagType2::selectSector(quint8 sector)
 /*!
     \reimp
 */
-bool QNearFieldTagType2::waitForRequestCompleted(const RequestId &id, int msecs)
-{
-    Q_D(QNearFieldTagType2);
-
-    QTime timer;
-    timer.start();
-    while (d->m_pendingSectorSelectCommands.contains(id)) {
-        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents, 1);
-
-        // detect passive ack
-        if (timer.elapsed() >= 10)
-            break;
-    }
-
-    return QNearFieldTarget::waitForRequestCompleted(id, msecs);
-}
-
-/*!
-    \reimp
-*/
 bool QNearFieldTagType2::handleResponse(const QNearFieldTarget::RequestId &id,
                                         const QByteArray &response)
 {
diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h
index e5476745..6b8c2315 100644
--- a/src/nfc/qnearfieldtagtype2.h
+++ b/src/nfc/qnearfieldtagtype2.h
@@ -71,8 +71,6 @@ public:
     virtual RequestId writeBlock(quint8 blockAddress, const QByteArray &data);
     virtual RequestId selectSector(quint8 sector);
 
-    bool waitForRequestCompleted(const RequestId &id, int msecs = 5000);
-
     void timerEvent(QTimerEvent *event);
 
 protected:
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index 89f76f99..f95d2ee1 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -49,6 +49,9 @@
 
 #include <QtCore/QDebug>
 
+#include <QTime>
+#include <QCoreApplication>
+
 QT_BEGIN_NAMESPACE_NFC
 
 /*!
@@ -396,11 +399,19 @@ QNearFieldTarget::RequestId QNearFieldTarget::sendCommands(const QList<QByteArra
 */
 bool QNearFieldTarget::waitForRequestCompleted(const RequestId &id, int msecs)
 {
-    Q_UNUSED(msecs);
-
     Q_D(QNearFieldTarget);
 
-    return d->m_decodedResponses.contains(id);
+    QTime timer;
+    timer.start();
+
+    do {
+        if (d->m_decodedResponses.contains(id))
+            return true;
+        else
+            QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents, 1);
+    } while (timer.elapsed() <= msecs);
+
+    return false;
 }
 
 /*!
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));
             }
         }
     }