Rename the generic CAN plugin

As this plugin is used for auto tests,
testcan is a better name. This also fixes
the inconsist naming between "dummy" and
"generic".

Change-Id: I2d9a70c240899b4ec6f80c78eeeaf004f05b1976
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 45614a4b3070d66afaed65849b706d8976e7e928)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

11 files changed, 41 insertions, 41 deletions

diff --git a/tests/auto/plugins/CMakeLists.txt b/tests/auto/plugins/CMakeLists.txt
index 2fedd20..6cc90ee 100644
--- a/tests/auto/plugins/CMakeLists.txt
+++ b/tests/auto/plugins/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(genericcanbus)
+add_subdirectory(testcanbus)
diff --git a/tests/auto/plugins/genericcanbus/plugin.json b/tests/auto/plugins/genericcanbus/plugin.json
deleted file mode 100644
index f257a9a..0000000
--- a/tests/auto/plugins/genericcanbus/plugin.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Key": "generic"
-}
diff --git a/tests/auto/plugins/genericcanbus/CMakeLists.txt b/tests/auto/plugins/testcanbus/CMakeLists.txt
index 65813e6..09ce756 100644
--- a/tests/auto/plugins/genericcanbus/CMakeLists.txt
+++ b/tests/auto/plugins/testcanbus/CMakeLists.txt
@@ -1,14 +1,14 @@
 #####################################################################
-## GenericBusPlugin Plugin:
+## TestCanBusPlugin Plugin:
 #####################################################################
 
-qt_internal_add_plugin(GenericBusPlugin
-    OUTPUT_NAME qtcanbustestgeneric
+qt_internal_add_plugin(TestCanBusPlugin
+    OUTPUT_NAME qttestcanbus
     TYPE canbus
     DEFAULT_IF FALSE
     STATIC
     SOURCES
-        dummybackend.cpp dummybackend.h
+        testcanbackend.cpp testcanbackend.h
         main.cpp
     PUBLIC_LIBRARIES
         Qt::Core
diff --git a/tests/auto/plugins/genericcanbus/main.cpp b/tests/auto/plugins/testcanbus/main.cpp
index 863dccf..0a322e9 100644
--- a/tests/auto/plugins/genericcanbus/main.cpp
+++ b/tests/auto/plugins/testcanbus/main.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "dummybackend.h"
+#include "testcanbackend.h"
 
 #include <QtSerialBus/qcanbus.h>
 #include <QtSerialBus/qcanbusfactory.h>
 
 QT_BEGIN_NAMESPACE
 
-class GenericBusPlugin : public QObject, public QCanBusFactory
+class TestCanBusPlugin : public QObject, public QCanBusFactory
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QCanBusFactory" FILE "plugin.json")
@@ -52,7 +52,7 @@ public:
     {
         Q_UNUSED(errorMessage);
 
-        return DummyBackend::interfaces();
+        return TestCanBackend::interfaces();
     }
 
     QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const override
@@ -63,7 +63,7 @@ public:
 
             return nullptr;
         }
-        auto device = new DummyBackend();
+        auto device = new TestCanBackend();
         return device;
     }
 };
diff --git a/tests/auto/plugins/testcanbus/plugin.json b/tests/auto/plugins/testcanbus/plugin.json
new file mode 100644
index 0000000..35604f4
--- /dev/null
+++ b/tests/auto/plugins/testcanbus/plugin.json
@@ -0,0 +1,3 @@
+{
+    "Key": "testcan"
+}
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/testcanbus/testcanbackend.cpp
index 32849a8..15c2493 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/testcanbus/testcanbackend.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "dummybackend.h"
+#include "testcanbackend.h"
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-DummyBackend::DummyBackend() :
+TestCanBackend::TestCanBackend() :
     simulateReceivingTimer(new QTimer(this))
 {
     connect(simulateReceivingTimer, &QTimer::timeout, [this]() {
@@ -54,33 +54,33 @@ DummyBackend::DummyBackend() :
     });
 }
 
-bool DummyBackend::open()
+bool TestCanBackend::open()
 {
     simulateReceivingTimer->start(1000);
     setState(QCanBusDevice::ConnectedState);
     return true;
 }
 
-void DummyBackend::close()
+void TestCanBackend::close()
 {
     simulateReceivingTimer->stop();
     setState(QCanBusDevice::UnconnectedState);
 }
 
-bool DummyBackend::writeFrame(const QCanBusFrame &data)
+bool TestCanBackend::writeFrame(const QCanBusFrame &data)
 {
     qDebug("DummyBackend::writeFrame: %ls", qUtf16Printable(data.toString()));
     return true;
 }
 
-QString DummyBackend::interpretErrorFrame(const QCanBusFrame &/*errorFrame*/)
+QString TestCanBackend::interpretErrorFrame(const QCanBusFrame &/*errorFrame*/)
 {
     return QString();
 }
 
-QList<QCanBusDeviceInfo> DummyBackend::interfaces()
+QList<QCanBusDeviceInfo> TestCanBackend::interfaces()
 {
-    return {createDeviceInfo(QStringLiteral("generic"), QStringLiteral("can0"), true, true)};
+    return {createDeviceInfo(QStringLiteral("testcan"), QStringLiteral("can0"), true, true)};
 }
 
 QT_END_NAMESPACE
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/testcanbus/testcanbackend.h
index d9727be..44d0daa 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.h
+++ b/tests/auto/plugins/testcanbus/testcanbackend.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef DUMMYBACKEND_H
-#define DUMMYBACKEND_H
+#ifndef TESTCANBACKEND_H
+#define TESTCANBACKEND_H
 
 #include <QtSerialBus/qcanbusdevice.h>
 
@@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE
 
 class QTimer;
 
-class DummyBackend : public QCanBusDevice
+class TestCanBackend : public QCanBusDevice
 {
     Q_OBJECT
 public:
-    explicit DummyBackend();
+    explicit TestCanBackend();
 
     bool open() override;
     void close() override;
@@ -64,4 +64,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // DUMMYBACKEND_H
+#endif // TESTCANBACKEND_H
diff --git a/tests/auto/qcanbus/CMakeLists.txt b/tests/auto/qcanbus/CMakeLists.txt
index c731c04..98990f2 100644
--- a/tests/auto/qcanbus/CMakeLists.txt
+++ b/tests/auto/qcanbus/CMakeLists.txt
@@ -11,6 +11,6 @@ qt_internal_add_test(tst_qcanbus
 )
 
 # should be
-# qt6_import_plugins(tst_qcanbus INCLUDE GenericBusPlugin)
+# qt6_import_plugins(tst_qcanbus INCLUDE TestCanBusPlugin)
 # but qt6_import_plugins does not work here
-target_link_libraries(tst_qcanbus PRIVATE GenericBusPlugin)
+target_link_libraries(tst_qcanbus PRIVATE TestCanBusPlugin)
diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp
index 3157999..8014ce9 100644
--- a/tests/auto/qcanbus/tst_qcanbus.cpp
+++ b/tests/auto/qcanbus/tst_qcanbus.cpp
@@ -83,14 +83,14 @@ void tst_QCanBus::plugins()
 {
     const QStringList pluginList = bus->plugins();
     QVERIFY(!pluginList.isEmpty());
-    QVERIFY(pluginList.contains("generic"));
+    QVERIFY(pluginList.contains("testcan"));
 }
 
 void tst_QCanBus::interfaces()
 {
-    const QList<QCanBusDeviceInfo> pluginList = bus->availableDevices("generic");
+    const QList<QCanBusDeviceInfo> pluginList = bus->availableDevices("testcan");
     QCOMPARE(pluginList.size(), 1);
-    QCOMPARE(pluginList.at(0).plugin(), QStringLiteral("generic"));
+    QCOMPARE(pluginList.at(0).plugin(), QStringLiteral("testcan"));
     QCOMPARE(pluginList.at(0).name(), QStringLiteral("can0"));
     QVERIFY(pluginList.at(0).isVirtual());
     QVERIFY(pluginList.at(0).hasFlexibleDataRate());
@@ -99,12 +99,12 @@ void tst_QCanBus::interfaces()
 void tst_QCanBus::createDevice()
 {
     QString error, error2;
-    QCanBusDevice *dummy = bus->createDevice("generic", "unused");
-    QCanBusDevice *dummy2 = bus->createDevice("generic", "unused");
-    QCanBusDevice *faulty = bus->createDevice("generic", "invalid", &error);
+    QCanBusDevice *testcan = bus->createDevice("testcan", "unused");
+    QCanBusDevice *testcan2 = bus->createDevice("testcan", "unused");
+    QCanBusDevice *faulty = bus->createDevice("testcan", "invalid", &error);
     QCanBusDevice *faulty2 = bus->createDevice("faulty", "faulty", &error2);
-    QVERIFY(dummy);
-    QVERIFY(dummy2);
+    QVERIFY(testcan);
+    QVERIFY(testcan2);
 
     QVERIFY(!faulty);
     QCOMPARE(error, tr("No such interface: 'invalid'"));
@@ -112,11 +112,11 @@ void tst_QCanBus::createDevice()
     QVERIFY(!faulty2);
     QCOMPARE(error2, tr("No such plugin: 'faulty'"));
 
-    delete dummy;
-    delete dummy2;
+    delete testcan;
+    delete testcan2;
 }
 
 QTEST_MAIN(tst_QCanBus)
-Q_IMPORT_PLUGIN(GenericBusPlugin)
+Q_IMPORT_PLUGIN(TestCanBusPlugin)
 
 #include "tst_qcanbus.moc"
diff --git a/tests/auto/qcanbusdevice/CMakeLists.txt b/tests/auto/qcanbusdevice/CMakeLists.txt
index 2881b0c..d13a393 100644
--- a/tests/auto/qcanbusdevice/CMakeLists.txt
+++ b/tests/auto/qcanbusdevice/CMakeLists.txt
@@ -11,6 +11,6 @@ qt_internal_add_test(tst_qcanbusdevice
 )
 
 # should be
-# qt6_import_plugins(tst_qcanbusdevice INCLUDE GenericBusPlugin)
+# qt6_import_plugins(tst_qcanbusdevice INCLUDE TestCanBusPlugin)
 # but qt6_import_plugins does not work here
-target_link_libraries(tst_qcanbusdevice PRIVATE GenericBusPlugin)
+target_link_libraries(tst_qcanbusdevice PRIVATE TestCanBusPlugin)
diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
index c2bd397..30ce0f6 100644
--- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
+++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
@@ -747,6 +747,6 @@ void tst_QCanBusDevice::tst_deviceInfo()
 }
 
 QTEST_MAIN(tst_QCanBusDevice)
-Q_IMPORT_PLUGIN(GenericBusPlugin)
+Q_IMPORT_PLUGIN(TestCanBusPlugin)
 
 #include "tst_qcanbusdevice.moc"