diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-04-07 12:14:23 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-04-20 08:42:37 +0300 |
| commit | a0adebf5a6e694a41dec45aa15014a4ea8de4038 (patch) | |
| tree | 0d0d8705e6cbf9fe5689e203ffc410de187f4ad2 /tests | |
| parent | 309c5a36dcf804dbdd69416f99d2280b1a0c51bf (diff) | |
Remove tst_qbluetoothlocaldevice Windows-only pairing status checks
Improved QBluetoothLocalDevice support for Windows was added in 6.3 and
the pre-existing Windows-specific checks are not needed (they fail).
Amends 43c01fbe3f2a74d83a10c3fec4d25fc9342f7544
Pick-to: 6.3
Change-Id: I2a26cde78934bf605eef88db5e5709f87d13916e
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp index 17deeb5d..8d872c70 100644 --- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp +++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp @@ -285,14 +285,8 @@ void tst_QBluetoothLocalDevice::tst_isValid() QVERIFY(!invalidLocalDevice.isValid()); QCOMPARE(invalidLocalDevice.address(), QBluetoothAddress()); QCOMPARE(invalidLocalDevice.name(), QString()); -#if !QT_CONFIG(winrt_bt) QCOMPARE(invalidLocalDevice.pairingStatus(QBluetoothAddress()), QBluetoothLocalDevice::Unpaired ); QCOMPARE(invalidLocalDevice.hostMode(), QBluetoothLocalDevice::HostPoweredOff); -#else - // When QTBUG-62294 is fixed, the pairingStatus part is consistent across platforms - QCOMPARE(invalidLocalDevice.pairingStatus(QBluetoothAddress()), QBluetoothLocalDevice::Paired); - QCOMPARE(invalidLocalDevice.hostMode(), QBluetoothLocalDevice::HostConnectable); -#endif } void tst_QBluetoothLocalDevice::tst_allDevices() @@ -420,16 +414,9 @@ void tst_QBluetoothLocalDevice::tst_pairingStatus_data() QTest::addColumn<QBluetoothAddress>("deviceAddress"); QTest::addColumn<QBluetoothLocalDevice::Pairing>("pairingExpected"); -#if !QT_CONFIG(winrt_bt) QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress("11:00:00:00:00:00") << QBluetoothLocalDevice::Unpaired; QTest::newRow("Invalid device") << QBluetoothAddress() << QBluetoothLocalDevice::Unpaired; -#else - // Remove special case when QTBUG-62294 is fixed - QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress("11:00:00:00:00:00") - << QBluetoothLocalDevice::Paired; - QTest::newRow("Invalid device") << QBluetoothAddress() << QBluetoothLocalDevice::Paired; -#endif //valid devices are already tested by tst_pairDevice() } |