diff options
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: |