diff options
| author | Jannis Voelker <jannis.voelker@basyskom.com> | 2018-03-01 11:20:02 +0100 |
|---|---|---|
| committer | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2018-03-08 21:15:21 +0000 |
| commit | fd4adcd098cef84fb874cc0e290e9ab65504abed (patch) | |
| tree | 1e299e8249a797d19e27472109028bc2147931d5 | |
| parent | 74e3b47c43c50afd4ce1ab4af576f1e7623a5015 (diff) | |
Fix multipleClients testv5.11.0-beta2
The multipleClients test is currently only run for the first plugin.
This patch changes the test so it runs once for each plugin and
creates two new clients from the same plugin.
Change-Id: Icd3bb57d68bd697161e67f0d50122166d5ff0211
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | tests/auto/qopcuaclient/tst_client.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp index 6e58c2d..3f36d9f 100644 --- a/tests/auto/qopcuaclient/tst_client.cpp +++ b/tests/auto/qopcuaclient/tst_client.cpp @@ -211,6 +211,7 @@ private slots: defineDataMethod(nodeIdGeneration_data) void nodeIdGeneration(); + defineDataMethod(multipleClients_data) void multipleClients(); defineDataMethod(nodeClass_data) void nodeClass(); @@ -825,19 +826,19 @@ void Tst_QOpcUaClient::nodeIdGeneration() void Tst_QOpcUaClient::multipleClients() { - QScopedPointer<QOpcUaClient> a(m_opcUa.createClient(m_backends[0])); - a->connectToEndpoint(m_endpoint); - QTRY_VERIFY2(a->state() == QOpcUaClient::Connected, "Could not connect to server"); - QScopedPointer<QOpcUaNode> node(a->node(readWriteNode)); + QFETCH(QOpcUaClient *, opcuaClient); + opcuaClient->connectToEndpoint(m_endpoint); + QTRY_VERIFY2(opcuaClient->state() == QOpcUaClient::Connected, "Could not connect to server"); + QScopedPointer<QOpcUaNode> node(opcuaClient->node(readWriteNode)); READ_MANDATORY_VARIABLE_NODE(node); QCOMPARE(node->attribute(QOpcUa::NodeAttribute::Value).toDouble(), 42.0); - QScopedPointer<QOpcUaClient> b(m_opcUa.createClient(m_backends[0])); + QScopedPointer<QOpcUaClient> b(m_opcUa.createClient(opcuaClient->backend())); b->connectToEndpoint(m_endpoint); QTRY_VERIFY2(b->state() == QOpcUaClient::Connected, "Could not connect to server"); node.reset(b->node(readWriteNode)); READ_MANDATORY_VARIABLE_NODE(node); QCOMPARE(node->attribute(QOpcUa::NodeAttribute::Value).toDouble(), 42.0); - QScopedPointer<QOpcUaClient> d(m_opcUa.createClient(m_backends[0])); + QScopedPointer<QOpcUaClient> d(m_opcUa.createClient(opcuaClient->backend())); d->connectToEndpoint(m_endpoint); QTRY_VERIFY2(d->state() == QOpcUaClient::Connected, "Could not connect to server"); node.reset(d->node(readWriteNode)); @@ -845,8 +846,8 @@ void Tst_QOpcUaClient::multipleClients() QCOMPARE(node->attribute(QOpcUa::NodeAttribute::Value).toDouble(), 42.0); d->disconnectFromEndpoint(); QTRY_VERIFY2(d->state() == QOpcUaClient::Disconnected, "Could not disconnect from server"); - a->disconnectFromEndpoint(); - QTRY_VERIFY2(a->state() == QOpcUaClient::Disconnected, "Could not disconnect from server"); + opcuaClient->disconnectFromEndpoint(); + QTRY_VERIFY2(opcuaClient->state() == QOpcUaClient::Disconnected, "Could not disconnect from server"); b->disconnectFromEndpoint(); QTRY_VERIFY2(b->state() == QOpcUaClient::Disconnected, "Could not disconnect from server"); } |