diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-12 11:09:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 18:50:01 +0200 |
| commit | 4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (patch) | |
| tree | 8c8b453d4e28b41e15c6b480ba057934fd8dc529 /tests | |
| parent | 25222f75d0ff5da0b39c77250510bc0aab0daf73 (diff) | |
Changing the way nfc target detection works
On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use.
This patch removes the parameters used for target detection.
Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests')
4 files changed, 7 insertions, 9 deletions
diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 79a2a35a..f431ce6f 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -97,17 +97,15 @@ void tst_QNearFieldManager::initTestCase() void tst_QNearFieldManager::targetDetected_data() { - QTest::addColumn<QNearFieldTarget::Type>("type"); QTest::addColumn<bool>("deleteTarget"); - QTest::newRow("AnyTarget") << QNearFieldTarget::AnyTarget << false; - QTest::newRow("NfcTagType1") << QNearFieldTarget::NfcTagType1 << false; - QTest::newRow("Delete Target") << QNearFieldTarget::AnyTarget << true; + QTest::newRow("AnyTarget") << false; + QTest::newRow("NfcTagType1") << false; + QTest::newRow("Delete Target") << true; } void tst_QNearFieldManager::targetDetected() { - QFETCH(QNearFieldTarget::Type, type); QFETCH(bool, deleteTarget); QNearFieldManagerPrivateImpl *emulatorBackend = new QNearFieldManagerPrivateImpl; @@ -116,7 +114,7 @@ void tst_QNearFieldManager::targetDetected() QSignalSpy targetDetectedSpy(&manager, SIGNAL(targetDetected(QNearFieldTarget*))); QSignalSpy targetLostSpy(&manager, SIGNAL(targetLost(QNearFieldTarget*))); - manager.startTargetDetection(type); + manager.startTargetDetection(); QTRY_VERIFY(!targetDetectedSpy.isEmpty()); diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 7dbb37a8..bbe72e5a 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -104,7 +104,7 @@ void tst_QNearFieldTagType1::waitForMatchingTarget() { QSignalSpy targetDetectedSpy(manager, SIGNAL(targetDetected(QNearFieldTarget*))); - manager->startTargetDetection(QNearFieldTarget::NfcTagType1); + manager->startTargetDetection(); QTRY_VERIFY(!targetDetectedSpy.isEmpty()); diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index f57b1f23..87e6a41d 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -106,7 +106,7 @@ void tst_QNearFieldTagType2::waitForMatchingTarget() { QSignalSpy targetDetectedSpy(manager, SIGNAL(targetDetected(QNearFieldTarget*))); - manager->startTargetDetection(QNearFieldTarget::NfcTagType2); + manager->startTargetDetection(); QTRY_VERIFY(!targetDetectedSpy.isEmpty()); diff --git a/tests/nfctestserver/socketcontroller.cpp b/tests/nfctestserver/socketcontroller.cpp index e1b44297..e568d7d7 100644 --- a/tests/nfctestserver/socketcontroller.cpp +++ b/tests/nfctestserver/socketcontroller.cpp @@ -81,7 +81,7 @@ SocketController::SocketController(ConnectionType type, QObject *parent) this, SLOT(targetDetected(QNearFieldTarget*))); connect(m_manager, SIGNAL(targetLost(QNearFieldTarget*)), this, SLOT(targetLost(QNearFieldTarget*))); - m_manager->startTargetDetection(QNearFieldTarget::NfcForumDevice); + m_manager->startTargetDetection(); } break; default: |