diff options
-rw-r--r-- | tests/auto/declarative/AbsoluteNodeTest.qml | 20 | ||||
-rw-r--r-- | tests/auto/declarative/AuthorizationTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/BatchReadWriteTest.qml | 4 | ||||
-rw-r--r-- | tests/auto/declarative/DataChangeFilterTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/DiscoveryTest.qml | 4 | ||||
-rw-r--r-- | tests/auto/declarative/MethodnodeTest.qml | 6 | ||||
-rw-r--r-- | tests/auto/declarative/MonitoringFilterTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/RelativenodeTest.qml | 12 | ||||
-rw-r--r-- | tests/auto/declarative/SecurityTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/SubscriptionsTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/tst_opcua.cpp | 7 | ||||
-rw-r--r-- | tests/auto/security/certs.qrc | 2 | ||||
-rw-r--r-- | tests/auto/security/pki/own/private/privateKeyWithPassword_secret.pem (renamed from tests/auto/security/pki/own/private/privateKeyWithPassword:secret.pem) | 0 | ||||
-rw-r--r-- | tests/auto/security/tst_security.cpp | 2 |
14 files changed, 34 insertions, 33 deletions
diff --git a/tests/auto/declarative/AbsoluteNodeTest.qml b/tests/auto/declarative/AbsoluteNodeTest.qml index c1f567d..6666f8b 100644 --- a/tests/auto/declarative/AbsoluteNodeTest.qml +++ b/tests/auto/declarative/AbsoluteNodeTest.qml @@ -83,7 +83,7 @@ Item { } CompletionLoggingTestCase { - name: "Create String Node Id" + name: parent.parent.testName + ": " + backendName + ": Create String Node Id" when: node1.readyToUse && shouldRun function test_nodeTest() { @@ -112,7 +112,7 @@ Item { } CompletionLoggingTestCase { - name: "Create GUID Node Id" + name: parent.parent.testName + ": " + backendName + ": Create GUID Node Id" when: node2.readyToUse && shouldRun function test_nodeTest() { @@ -131,7 +131,7 @@ Item { } CompletionLoggingTestCase { - name: "Create Opaque Node Id" + name: parent.parent.testName + ": " + backendName + ": Create Opaque Node Id" when: node3.readyToUse && shouldRun function test_nodeTest() { @@ -150,7 +150,7 @@ Item { } CompletionLoggingTestCase { - name: "Create Integer Node Id" + name: parent.parent.testName + ": " + backendName + ": Create Integer Node Id" when: node4.readyToUse && shouldRun function test_nodeTest() { @@ -169,7 +169,7 @@ Item { } CompletionLoggingTestCase { - name: "Write Value Node with Multiple Listeners" + name: parent.parent.testName + ": " + backendName + ": Write Value Node with Multiple Listeners" when: node5.readyToUse && node6.readyToUse && node7.readyToUse && shouldRun function test_nodeTest() { @@ -229,7 +229,7 @@ Item { } CompletionLoggingTestCase { - name: "Emitting signals on node changes" + name: parent.parent.testName + ": " + backendName + ": Emitting signals on node changes" when: node8.readyToUse && shouldRun function test_changeIdentifier() { @@ -307,7 +307,7 @@ Item { } CompletionLoggingTestCase { - name: "Node with namespace in Id" + name: parent.parent.testName + ": " + backendName + ": Node with namespace in Id" when: node9.readyToUse && shouldRun function test_nodeTest() { @@ -325,7 +325,7 @@ Item { } CompletionLoggingTestCase { - name: "Standard attributes on variable node" + name: parent.parent.testName + ": " + backendName + ": Standard attributes on variable node" when: node10.readyToUse && shouldRun SignalSpy { @@ -395,7 +395,7 @@ Item { } CompletionLoggingTestCase { - name: "Node timestamps" + name: parent.parent.testName + ": " + backendName + ": Node timestamps" when: node11.readyToUse && shouldRun SignalSpy { @@ -423,7 +423,7 @@ Item { } CompletionLoggingTestCase { - name: "Assign int value to double node" + name: parent.parent.testName + ": " + backendName + ": Assign int value to double node" when: node12.readyToUse && shouldRun SignalSpy { diff --git a/tests/auto/declarative/AuthorizationTest.qml b/tests/auto/declarative/AuthorizationTest.qml index c4d680d..5f652a5 100644 --- a/tests/auto/declarative/AuthorizationTest.qml +++ b/tests/auto/declarative/AuthorizationTest.qml @@ -51,7 +51,7 @@ Item { } CompletionLoggingTestCase { - name: "Username authentication" + name: parent.parent.testName + ": " + backendName + ": Username authentication" QtOpcUa.Connection { id: connection diff --git a/tests/auto/declarative/BatchReadWriteTest.qml b/tests/auto/declarative/BatchReadWriteTest.qml index 0591ce4..0f3cdde 100644 --- a/tests/auto/declarative/BatchReadWriteTest.qml +++ b/tests/auto/declarative/BatchReadWriteTest.qml @@ -83,7 +83,7 @@ Item { } CompletionLoggingTestCase { - name: "Reading multiple items" + name: parent.parent.testName + ": " + backendName + ": Reading multiple items" when: connection.connected && shouldRun SignalSpy { @@ -144,7 +144,7 @@ Item { } CompletionLoggingTestCase { - name: "Writing multiple items" + name: parent.parent.testName + ": " + backendName + ": Writing multiple items" when: connection.connected && shouldRun SignalSpy { diff --git a/tests/auto/declarative/DataChangeFilterTest.qml b/tests/auto/declarative/DataChangeFilterTest.qml index 8d0e8e8..a8a3fda 100644 --- a/tests/auto/declarative/DataChangeFilterTest.qml +++ b/tests/auto/declarative/DataChangeFilterTest.qml @@ -92,7 +92,7 @@ Item { } CompletionLoggingTestCase { - name: "Data Change Filter" + name: parent.parent.testName + ": " + backendName + ": Data Change Filter" when: node1.readyToUse && shouldRun function test_nodeTest() { diff --git a/tests/auto/declarative/DiscoveryTest.qml b/tests/auto/declarative/DiscoveryTest.qml index 361a135..e8a2596 100644 --- a/tests/auto/declarative/DiscoveryTest.qml +++ b/tests/auto/declarative/DiscoveryTest.qml @@ -58,7 +58,7 @@ Item { } CompletionLoggingTestCase { - name: "Fetch data from discovery server using default connection" + name: parent.parent.testName + ": " + backendName + ": Fetch data from discovery server using default connection" when: shouldRun QtOpcUa.Connection { @@ -170,7 +170,7 @@ Item { } CompletionLoggingTestCase { - name: "Fetch data from discovery server using specified connection" + name: parent.parent.testName + ": " + backendName + ": Fetch data from discovery server using specified connection" when: shouldRun QtOpcUa.Connection { diff --git a/tests/auto/declarative/MethodnodeTest.qml b/tests/auto/declarative/MethodnodeTest.qml index 918f85a..be483fd 100644 --- a/tests/auto/declarative/MethodnodeTest.qml +++ b/tests/auto/declarative/MethodnodeTest.qml @@ -83,7 +83,7 @@ Item { } CompletionLoggingTestCase { - name: "Standard attributes on method node" + name: parent.parent.testName + ": " + backendName + ": Standard attributes on method node" when: node1.readyToUse && shouldRun SignalSpy { @@ -150,7 +150,7 @@ Item { } CompletionLoggingTestCase { - name: "Use method arguments" + name: parent.parent.testName + ": " + backendName + ": Use method arguments" when: node2.readyToUse && shouldRun SignalSpy { @@ -200,7 +200,7 @@ Item { } CompletionLoggingTestCase { - name: "Multiple Output Arguments" + name: parent.parent.testName + ": " + backendName + ": Multiple Output Arguments" when: node3.readyToUse && shouldRun SignalSpy { diff --git a/tests/auto/declarative/MonitoringFilterTest.qml b/tests/auto/declarative/MonitoringFilterTest.qml index a591e8b..e7f16e1 100644 --- a/tests/auto/declarative/MonitoringFilterTest.qml +++ b/tests/auto/declarative/MonitoringFilterTest.qml @@ -93,7 +93,7 @@ Item { /* // In order to run this test you need to compile the example tutorial_server_event from open62541 master branch. CompletionLoggingTestCase { - name: "Event filter" + name: parent.parent.testName + ": " + backendName + ": Event filter" when: node3.readyToUse && shouldRun function test_nodeTest() { diff --git a/tests/auto/declarative/RelativenodeTest.qml b/tests/auto/declarative/RelativenodeTest.qml index 69ba3ed..0ca77b3 100644 --- a/tests/auto/declarative/RelativenodeTest.qml +++ b/tests/auto/declarative/RelativenodeTest.qml @@ -83,7 +83,7 @@ Item { } CompletionLoggingTestCase { - name: "RelativeNodePath" + name: parent.parent.testName + ": " + backendName + ": RelativeNodePath" when: node1.readyToUse && shouldRun function test_nodeRead() { @@ -108,7 +108,7 @@ Item { } CompletionLoggingTestCase { - name: "CascadedRelativeNodePath" + name: parent.parent.testName + ": " + backendName + ": CascadedRelativeNodePath" when: node2.readyToUse && shouldRun function test_nodeRead() { @@ -143,7 +143,7 @@ Item { } CompletionLoggingTestCase { - name: "Emitting signals on node changes" + name: parent.parent.testName + ": " + backendName + ": Emitting signals on node changes" when: node3.readyToUse && shouldRun function test_changeStartNode() { @@ -226,7 +226,7 @@ Item { } CompletionLoggingTestCase { - name: "Emitting signals on cascaded node changes" + name: parent.parent.testName + ": " + backendName + ": Emitting signals on cascaded node changes" when: node4.readyToUse && shouldRun function test_nodeRead() { @@ -328,7 +328,7 @@ Item { } CompletionLoggingTestCase { - name: "Relative Node Path with References" + name: parent.parent.testName + ": " + backendName + ": Relative Node Path with References" when: node5.readyToUse && shouldRun function test_nodeRead() { @@ -354,7 +354,7 @@ Item { } CompletionLoggingTestCase { - name: "Relative Node Path with NodeId reference" + name: parent.parent.testName + ": " + backendName + ": Relative Node Path with NodeId reference" when: node6.readyToUse && shouldRun function test_nodeRead() { diff --git a/tests/auto/declarative/SecurityTest.qml b/tests/auto/declarative/SecurityTest.qml index 2e63e17..ce2412c 100644 --- a/tests/auto/declarative/SecurityTest.qml +++ b/tests/auto/declarative/SecurityTest.qml @@ -51,7 +51,7 @@ Item { } CompletionLoggingTestCase { - name: "Check supported security features" + name: parent.parent.testName + ": " + backendName + ": Check supported security features" when: shouldRun QtOpcUa.Connection { diff --git a/tests/auto/declarative/SubscriptionsTest.qml b/tests/auto/declarative/SubscriptionsTest.qml index 97de353..8b088ed 100644 --- a/tests/auto/declarative/SubscriptionsTest.qml +++ b/tests/auto/declarative/SubscriptionsTest.qml @@ -87,7 +87,7 @@ Item { } CompletionLoggingTestCase { - name: "Create String Node Id" + name: parent.parent.testName + ": " + backendName + ": Create String Node Id" when: node1.readyToUse && shouldRun function test_nodeTest() { diff --git a/tests/auto/declarative/tst_opcua.cpp b/tests/auto/declarative/tst_opcua.cpp index 2fc387d..53816b4 100644 --- a/tests/auto/declarative/tst_opcua.cpp +++ b/tests/auto/declarative/tst_opcua.cpp @@ -63,6 +63,10 @@ public slots: const quint16 defaultPort = 43344; const QHostAddress defaultHost(QHostAddress::LocalHost); + const QString host = envOrDefault("OPCUA_HOST", defaultHost.toString()); + const QString port = envOrDefault("OPCUA_PORT", QString::number(defaultPort)); + m_opcuaDiscoveryUrl = QString::fromLatin1("opc.tcp://%1:%2").arg(host).arg(port); + if (qEnvironmentVariableIsEmpty("OPCUA_HOST") && qEnvironmentVariableIsEmpty("OPCUA_PORT")) { m_testServerPath = qApp->applicationDirPath() @@ -107,9 +111,6 @@ public slots: // Let the server come up QTest::qSleep(2000); } - const QString host = envOrDefault("OPCUA_HOST", defaultHost.toString()); - const QString port = envOrDefault("OPCUA_PORT", QString::number(defaultPort)); - m_opcuaDiscoveryUrl = QString::fromLatin1("opc.tcp://%1:%2").arg(host).arg(port); } void qmlEngineAvailable(QQmlEngine *engine) { bool value = false; diff --git a/tests/auto/security/certs.qrc b/tests/auto/security/certs.qrc index 2805c9a..2cc55f3 100644 --- a/tests/auto/security/certs.qrc +++ b/tests/auto/security/certs.qrc @@ -2,7 +2,7 @@ <qresource prefix="/"> <file>pki/own/certs/tst_security.der</file> <file>pki/own/private/privateKeyWithoutPassword.pem</file> - <file>pki/own/private/privateKeyWithPassword:secret.pem</file> + <file>pki/own/private/privateKeyWithPassword_secret.pem</file> <file>pki/trusted/certs/ca.der</file> <file>pki/trusted/certs/open62541-testserver.der</file> <file>pki/trusted/crl/ca.crl.pem</file> diff --git a/tests/auto/security/pki/own/private/privateKeyWithPassword:secret.pem b/tests/auto/security/pki/own/private/privateKeyWithPassword_secret.pem index ceaedfb..ceaedfb 100644 --- a/tests/auto/security/pki/own/private/privateKeyWithPassword:secret.pem +++ b/tests/auto/security/pki/own/private/privateKeyWithPassword_secret.pem diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp index 436f495..95bf22f 100644 --- a/tests/auto/security/tst_security.cpp +++ b/tests/auto/security/tst_security.cpp @@ -327,7 +327,7 @@ void Tst_QOpcUaSecurity::connectAndDisconnectSecureEncryptedKey() const QString pkidir = m_pkiData->path(); QOpcUaPkiConfiguration pkiConfig; pkiConfig.setClientCertificateFile(pkidir + "/own/certs/tst_security.der"); - pkiConfig.setPrivateKeyFile(pkidir + "/own/private/privateKeyWithPassword:secret.pem"); + pkiConfig.setPrivateKeyFile(pkidir + "/own/private/privateKeyWithPassword_secret.pem"); pkiConfig.setTrustListDirectory(pkidir + "/trusted/certs"); pkiConfig.setRevocationListDirectory(pkidir + "/trusted/crl"); pkiConfig.setIssuerListDirectory(pkidir + "/issuers/certs"); |