diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 14:15:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 14:15:59 +0100 |
| commit | 55bb5dab24b18b2aa8ad22a552323899ae415d8b (patch) | |
| tree | 182bd76b7f2bf76187ddd63aa841d6d7c0a567b7 /tests | |
| parent | 02b6c226df743724b64922d93f796abab8c8df51 (diff) | |
| parent | 5eb02ffef872456bd967d8300b6e2f2df3e7c7e5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If041fd380305b2fa40106998b036079a76b971d3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp index f6f3d50..389e013 100644 --- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp +++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp @@ -202,7 +202,7 @@ void tst_QCanBusDevice::conf() QVector<int> keys = device->configurationKeys(); QCOMPARE(keys.size(), 1); - QVERIFY(keys[0] == QCanBusDevice::ErrorFilterKey); + QVERIFY(keys.at(0) == QCanBusDevice::ErrorFilterKey); QCOMPARE(value.value<QCanBusFrame::FrameErrors>(), QCanBusFrame::LostArbitrationError | QCanBusFrame::BusError); @@ -261,9 +261,9 @@ void tst_QCanBusDevice::read() QVERIFY(device->connectDevice()); QTRY_VERIFY_WITH_TIMEOUT(device->state() == QCanBusDevice::ConnectedState, 5000); QCOMPARE(stateSpy.count(), 2); - QCOMPARE(stateSpy[0].at(0).value<QCanBusDevice::CanBusDeviceState>(), + QCOMPARE(stateSpy.at(0).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ConnectingState); - QCOMPARE(stateSpy[1].at(0).value<QCanBusDevice::CanBusDeviceState>(), + QCOMPARE(stateSpy.at(1).at(0).value<QCanBusDevice::CanBusDeviceState>(), QCanBusDevice::ConnectedState); device->triggerNewFrame(); |