diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-03-16 10:59:49 +0100 |
---|---|---|
committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-04-24 12:47:03 +0200 |
commit | 7a0db5d4984735587e1647d8b3ddb437d04945b3 (patch) | |
tree | aa02ccfee184341f4e740ed73a27388ed7a4d869 /tests | |
parent | 3799f043bb960bdfcf73e4bcdf257949d623fc64 (diff) | |
download | qtconnectivity-7a0db5d4984735587e1647d8b3ddb437d04945b3.tar.gz |
Remove the registration mechanism from QNearFieldManager
The removal is proposed by a comment in qNearfieldmanager.h.
[ChangeLog][QtNFC][QNearFieldManager] Removed functions
(un)registerNdefMessageHandler(...).
Task-number: QTBUG-81824
Change-Id: Icf9dc4746a437a775ac40bbe68814daabd1ec13f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index ada6d481..59fb9437 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -54,16 +54,6 @@ private slots: void targetDetected_data(); void targetDetected(); - - void unregisterNdefMessageHandler(); - - void registerNdefMessageHandler(); - - void registerNdefMessageHandler_type_data(); - void registerNdefMessageHandler_type(); - - void registerNdefMessageHandler_filter_data(); - void registerNdefMessageHandler_filter(); }; tst_QNearFieldManager::tst_QNearFieldManager() @@ -134,149 +124,6 @@ void tst_QNearFieldManager::targetDetected() manager.stopTargetDetection(); } -void tst_QNearFieldManager::unregisterNdefMessageHandler() -{ - QNearFieldManagerPrivateImpl *emulatorBackend = new QNearFieldManagerPrivateImpl; - QNearFieldManager manager(emulatorBackend, 0); - - QVERIFY(!manager.unregisterNdefMessageHandler(-1)); - QVERIFY(!manager.unregisterNdefMessageHandler(0)); -} - -class MessageListener : public QObject -{ - Q_OBJECT - -signals: - void matchedNdefMessage(const QNdefMessage &message, QNearFieldTarget *target); -}; - -void tst_QNearFieldManager::registerNdefMessageHandler() -{ - QNearFieldManagerPrivateImpl *emulatorBackend = new QNearFieldManagerPrivateImpl; - QNearFieldManager manager(emulatorBackend, 0); - - MessageListener listener; - QSignalSpy messageSpy(&listener, SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - int id = manager.registerNdefMessageHandler(&listener, - SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - QVERIFY(id != -1); - - QTRY_VERIFY(!messageSpy.isEmpty()); - - const QNdefMessage message = messageSpy.first().at(0).value<QNdefMessage>(); - QNearFieldTarget *target = messageSpy.first().at(1).value<QNearFieldTarget *>(); - - QVERIFY(target); - - QVERIFY(manager.unregisterNdefMessageHandler(id)); -} - -void tst_QNearFieldManager::registerNdefMessageHandler_type_data() -{ - QTest::addColumn<QNdefRecord::TypeNameFormat>("typeNameFormat"); - QTest::addColumn<QByteArray>("type"); - - QTest::newRow("Image") << QNdefRecord::Mime << QByteArray("image/png"); - QTest::newRow("URI") << QNdefRecord::NfcRtd << QByteArray("U"); - QTest::newRow("Text") << QNdefRecord::NfcRtd << QByteArray("T"); -} - -void tst_QNearFieldManager::registerNdefMessageHandler_type() -{ - QFETCH(QNdefRecord::TypeNameFormat, typeNameFormat); - QFETCH(QByteArray, type); - - QNearFieldManagerPrivateImpl *emulatorBackend = new QNearFieldManagerPrivateImpl; - QNearFieldManager manager(emulatorBackend, 0); - - MessageListener listener; - QSignalSpy messageSpy(&listener, SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - int id = manager.registerNdefMessageHandler(typeNameFormat, type, &listener, - SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - QVERIFY(id != -1); - - QTRY_VERIFY(!messageSpy.isEmpty()); - - const QNdefMessage message = messageSpy.first().at(0).value<QNdefMessage>(); - - bool hasRecord = false; - for (const QNdefRecord &record : message) { - if (record.typeNameFormat() == typeNameFormat && record.type() == type) { - hasRecord = true; - break; - } - } - - QVERIFY(hasRecord); - - QNearFieldTarget *target = messageSpy.first().at(1).value<QNearFieldTarget *>(); - - QVERIFY(target); -} - -void tst_QNearFieldManager::registerNdefMessageHandler_filter_data() -{ - QTest::addColumn<QNdefFilter>("filter"); - - QNdefFilter filter; - - QTest::newRow("Empty") << filter; - - filter.clear(); - filter.setOrderMatch(true); - filter.appendRecord(QNdefRecord::Mime, "image/png"); - filter.appendRecord<QNdefNfcTextRecord>(2, 10); - filter.appendRecord<QNdefNfcUriRecord>(1, 1); - QTest::newRow("Image + Multiple Text + URI") << filter; - - filter.clear(); - filter.setOrderMatch(true); - filter.appendRecord<QNdefNfcTextRecord>(1, 1); - filter.appendRecord<QNdefNfcUriRecord>(1, 1); - QTest::newRow("Text + URI") << filter; - - QNdefFilter::Record record; - - filter.clear(); - filter.setOrderMatch(false); - filter.appendRecord<QNdefNfcUriRecord>(1, 1); - record.typeNameFormat = QNdefRecord::NfcRtd; - record.type = "T"; - record.minimum = 1; - record.maximum = 1; - filter.appendRecord(record); - QTest::newRow("Unordered Text + URI") << filter; -} - -void tst_QNearFieldManager::registerNdefMessageHandler_filter() -{ - QFETCH(QNdefFilter, filter); - - QNearFieldManagerPrivateImpl *emulatorBackend = new QNearFieldManagerPrivateImpl; - QNearFieldManager manager(emulatorBackend, 0); - - MessageListener listener; - QSignalSpy messageSpy(&listener, SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - int id = manager.registerNdefMessageHandler(filter, &listener, - SIGNAL(matchedNdefMessage(QNdefMessage,QNearFieldTarget*))); - - QVERIFY(id != -1); - - QTRY_VERIFY(!messageSpy.isEmpty()); - - const QNdefMessage message = messageSpy.first().at(0).value<QNdefMessage>(); - - QNearFieldTarget *target = messageSpy.first().at(1).value<QNearFieldTarget *>(); - - QVERIFY(target); -} - QTEST_MAIN(tst_QNearFieldManager) // Unset the moc namespace which is not required for the following include. |