fix(opcua): fix endpoint element mixup

apache · Aug 10, 2023 · c1232bc · c1232bc
1 parent 39ff22f
commit c1232bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/OpcuaDriverContext.java b/...j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/OpcuaDriverContext.java
@@ -151,7 +151,7 @@ public void setConfiguration(OpcuaConfiguration configuration) {
         transportEndpoint = matcher.group("transportEndpoint");
 
         String portAddition = port != null ? ":" + port : "";
-        endpoint = "opc." + code + "://" + code + portAddition + transportEndpoint;
+        endpoint = "opc." + code + "://" + host + portAddition + transportEndpoint;
 
 
         if (configuration.getSecurityPolicy() != null && !(configuration.getSecurityPolicy().equals("None"))) {

diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaDriverIT.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaDriverIT.java
@@ -23,7 +23,7 @@
 public class OpcuaDriverIT extends DriverTestsuiteRunner {
 
     public OpcuaDriverIT() {
-        super("/protocols/opcua/DriverTestsuite.xml", true);
+        super("/protocols/opcua/DriverTestsuite.xml", false);
     }
 
 }
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -172,8 +172,7 @@ Stream<DynamicNode> connectionWithDiscoveryParam() throws Exception {
         }
     }
 
-    // TODO: ignored due to strange behaviour when run together
-    //@Nested
+    @Nested
     class readWrite {
 
         @Test

diff --git a/protocols/opcua/src/test/resources/protocols/opcua/DriverTestsuite.xml b/protocols/opcua/src/test/resources/protocols/opcua/DriverTestsuite.xml
@@ -48,7 +48,7 @@
             <endpoint>
               <PascalString>
                 <sLength dataType="int" bitLength="32">15</sLength>
-                <stringValue dataType="string" bitLength="120" encoding="UTF-8">opc.test://test</stringValue>
+                <stringValue dataType="string" bitLength="120" encoding="UTF-8">opc.test://hurz</stringValue>
               </PascalString>
             </endpoint>
           </OpcuaHelloRequest>