summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-03-11 14:30:36 +0100
committerAndré Hartmann <aha_1980@gmx.de>2017-03-13 09:04:42 +0000
commit940729bb76377cae8eab6650e21f38f4a98da5da (patch)
tree30d126c965e1c9468c3c3a88e33d25f8b9995abf /tests
parent8b9e978e55e581c6e4722c0874fa0b5eb10b734b (diff)
QCanBusDeviceInfo: cancel friendship to GenericBusPlugin
GenericBusPlugin is just used for internal testing. It does not need special handling, it can just behave like the other plugins. Change-Id: I55cb1133b51cb5f6ab3ca49484d3ba795867c2bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.cpp5
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.h2
-rw-r--r--tests/auto/plugins/genericcanbus/main.cpp6
3 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index acfa520..9f3d0f0 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -84,4 +84,9 @@ QString DummyBackend::interpretErrorFrame(const QCanBusFrame &/*errorFrame*/)
return QString();
}
+QList<QCanBusDeviceInfo> DummyBackend::interfaces()
+{
+ return {createDeviceInfo(QStringLiteral("can0"), true, true)};
+}
+
QT_END_NAMESPACE
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.h b/tests/auto/plugins/genericcanbus/dummybackend.h
index 3142181..e8d27f5 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.h
+++ b/tests/auto/plugins/genericcanbus/dummybackend.h
@@ -56,6 +56,8 @@ public:
QString interpretErrorFrame(const QCanBusFrame &) override;
+ static QList<QCanBusDeviceInfo> interfaces();
+
public Q_SLOTS:
void sendMessage();
diff --git a/tests/auto/plugins/genericcanbus/main.cpp b/tests/auto/plugins/genericcanbus/main.cpp
index 46b21ac..dc687aa 100644
--- a/tests/auto/plugins/genericcanbus/main.cpp
+++ b/tests/auto/plugins/genericcanbus/main.cpp
@@ -55,11 +55,7 @@ public:
{
Q_UNUSED(errorMessage);
- QCanBusDeviceInfoPrivate info;
- info.name = QStringLiteral("can0");
- info.hasFlexibleDataRate = true;
- info.isVirtual = true;
- return { QCanBusDeviceInfo(info) };
+ return DummyBackend::interfaces();
}
QCanBusDevice *createDevice(const QString &interfaceName, QString *errorMessage) const override