diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-25 17:13:34 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-05-27 14:27:35 +0200 |
| commit | 47d54961c7684f75b845dbd3c3ebc276a9d94de8 (patch) | |
| tree | d2465a1b835cc0d63d89067ebd6f8b509e369471 /tests | |
| parent | e7f77b79a3d4c238e1835fa29adb095ef9d47f19 (diff) | |
| download | qtconnectivity-47d54961c7684f75b845dbd3c3ebc276a9d94de8.tar.gz | |
QtNFC: remove QNearFieldTarget::ndefMessagesWritten signal
ndefMessagesWritten signal basically duplicates the requestCompleted
signal, but does not provide a request id parameter to track, which
messages were actually written. Given that, the signal is removed. One
should now use requestCompleted and check the request id instead.
[ChangeLog][QtNFC][QNearFieldTarget] Remove ndefMessagesWritten signal.
Use requestCompleted signal instead.
Task-number: QTBUG-93854
Change-Id: Ic7f97eabfa83879b0da0cf34310a2982621cf8de
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 504f42fc..42a62b7a 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -422,7 +422,6 @@ void tst_QNearFieldTagType1::ndefMessages() requestCompletedSpy.clear(); errorSpy.clear(); - QSignalSpy ndefMessageWriteSpy(target, SIGNAL(ndefMessagesWritten())); QNearFieldTarget::RequestId writeId = target->writeNdefMessages(messages); QVERIFY(writeId.isValid()); @@ -436,8 +435,6 @@ void tst_QNearFieldTagType1::ndefMessages() requestCompletedSpy.takeFirst().first().value<QNearFieldTarget::RequestId>(); } - QVERIFY(!ndefMessageWriteSpy.isEmpty()); - QVERIFY(target->hasNdefMessage()); ndefMessageReadSpy.clear(); diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index f4b7cd0b..4ea9bc42 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -311,10 +311,13 @@ void tst_QNearFieldTagType2::ndefMessages() messages.append(message); - QSignalSpy ndefMessageWriteSpy(target, SIGNAL(ndefMessagesWritten())); - target->writeNdefMessages(messages); + QSignalSpy requestCompleteSpy(target, &QNearFieldTagType2::requestCompleted); + id = target->writeNdefMessages(messages); - QTRY_VERIFY(!ndefMessageWriteSpy.isEmpty()); + QTRY_VERIFY(!requestCompleteSpy.isEmpty()); + const auto completedId = + requestCompleteSpy.takeFirst().first().value<QNearFieldTarget::RequestId>(); + QCOMPARE(completedId, id); QVERIFY(target->hasNdefMessage()); |