diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-10-17 15:14:04 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-10-17 15:14:11 +0200 |
commit | 80aa0065775012f95201303d9c5ae3af8b63e1ae (patch) | |
tree | 0f4645ed3956e17c1662ed6c8ec7f8b0194ba37b /tests | |
parent | 8cb77f8b7c90bb2c339f920cd0ea6ba437991473 (diff) | |
parent | 4a6d4e8682384887d1b30b9c3107f47c57d7ee3f (diff) |
Merge remote-tracking branch 'gerrit/5.4' into btle
Change-Id: Id28ba006101e64d2b0acd294ffc84be50993cb9e
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp index ea3c471c..74a27591 100644 --- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp +++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp @@ -250,6 +250,8 @@ void tst_QBluetoothDeviceInfo::tst_construction() QBluetoothDeviceInfo deviceInfo; QVERIFY(!deviceInfo.isValid()); + QVERIFY(deviceInfo.coreConfigurations() + == QBluetoothDeviceInfo::UnknownCoreConfiguration); } { @@ -270,7 +272,7 @@ void tst_QBluetoothDeviceInfo::tst_construction() QCOMPARE(deviceInfo.serviceClasses(), serviceClasses); QCOMPARE(deviceInfo.majorDeviceClass(), majorDeviceClass); QCOMPARE(deviceInfo.minorDeviceClass(), minorDeviceClass); - QCOMPARE(deviceInfo.coreConfigurations(), QBluetoothDeviceInfo::BaseRateCoreConfiguration); + QCOMPARE(deviceInfo.coreConfigurations(), QBluetoothDeviceInfo::UnknownCoreConfiguration); deviceInfo.setCoreConfigurations(coreConfiguration); QCOMPARE(deviceInfo.coreConfigurations(), coreConfiguration); |