Cleanup and synchronize the dummy plugins

We keep both available to test against the different versions
of QCanBusFactory. But they should be as similar as possible.

Change-Id: I94488bdddeecc405026b41a5ead15e1342839faa
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

5 files changed, 15 insertions, 26 deletions

diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index 4c3173a..83d2480 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -43,12 +43,16 @@
 QT_BEGIN_NAMESPACE
 
 DummyBackend::DummyBackend() :
-    sendTimer(new QTimer(this))
+    simulateReceivingTimer(new QTimer(this))
 {
-    sendTimer->setInterval(1000);
-    sendTimer->setSingleShot(false);
-    connect(sendTimer, &QTimer::timeout, this, &DummyBackend::sendMessage);
-    sendTimer->start();
+    connect(simulateReceivingTimer, &QTimer::timeout, [this]() {
+        const quint64 timeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
+        QCanBusFrame dummyFrame(12, "def");
+        dummyFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(timeStamp * 1000));
+
+        enqueueReceivedFrames({dummyFrame});
+    });
+    simulateReceivingTimer->start(1000);
 }
 
 bool DummyBackend::open()
@@ -62,20 +66,9 @@ void DummyBackend::close()
     setState(QCanBusDevice::UnconnectedState);
 }
 
-void DummyBackend::sendMessage()
-{
-    quint64 timeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
-    QCanBusFrame dummyFrame;
-    dummyFrame.setFrameId(12);
-    dummyFrame.setPayload(QByteArray("def"));
-    dummyFrame.setTimeStamp(QCanBusFrame::TimeStamp(timeStamp / 1000, (timeStamp % 1000) * 1000));
-
-    enqueueReceivedFrames(QVector<QCanBusFrame>() << dummyFrame);
-}
-
 bool DummyBackend::writeFrame(const QCanBusFrame &data)
 {
-    qDebug() << "DummyBackend::writeFrame: " << data.toString();
+    qDebug("DummyBackend::writeFrame: %ls", qUtf16Printable(data.toString()));
     return true;
 }
 
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h
index 22bbc80..d9727be 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.h
+++ b/tests/auto/plugins/genericcanbus/dummybackend.h
@@ -58,11 +58,8 @@ public:
 
     static QList<QCanBusDeviceInfo> interfaces();
 
-public Q_SLOTS:
-    void sendMessage();
-
 private:
-    QTimer *sendTimer;
+    QTimer *simulateReceivingTimer = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/plugins/genericcanbus/main.cpp b/tests/auto/plugins/genericcanbus/main.cpp
index 8e14fee..89103a4 100644
--- a/tests/auto/plugins/genericcanbus/main.cpp
+++ b/tests/auto/plugins/genericcanbus/main.cpp
@@ -38,7 +38,6 @@
 
 #include <QtSerialBus/qcanbus.h>
 #include <QtSerialBus/qcanbusfactory.h>
-#include "../../../../src/serialbus/qcanbusdeviceinfo_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
index 117aeec..4d7d9c0 100644
--- a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
+++ b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
@@ -43,16 +43,16 @@
 QT_BEGIN_NAMESPACE
 
 DummyBackendV1::DummyBackendV1() :
-    sendTimer(new QTimer(this))
+    simulateReceivingTimer(new QTimer(this))
 {
-    connect(sendTimer, &QTimer::timeout, [this]() {
+    connect(simulateReceivingTimer, &QTimer::timeout, [this]() {
         const quint64 timeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
         QCanBusFrame dummyFrame(11, "abc");
         dummyFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(timeStamp * 1000));
 
         enqueueReceivedFrames({dummyFrame});
     });
-    sendTimer->start(1000);
+    simulateReceivingTimer->start(1000);
 }
 
 bool DummyBackendV1::open()
diff --git a/tests/auto/plugins/genericcanbusv1/dummybackendv1.h b/tests/auto/plugins/genericcanbusv1/dummybackendv1.h
index 4c3fc64..6892b4f 100644
--- a/tests/auto/plugins/genericcanbusv1/dummybackendv1.h
+++ b/tests/auto/plugins/genericcanbusv1/dummybackendv1.h
@@ -57,7 +57,7 @@ public:
     QString interpretErrorFrame(const QCanBusFrame &) override;
 
 private:
-    QTimer *sendTimer;
+    QTimer *simulateReceivingTimer = nullptr;
 };
 
 QT_END_NAMESPACE