Attempt to stabilize OPC UA chunk factory tests.

Related to #1764. Signed-off-by: Łukasz Dywicki <[email protected]>
apache · Oct 14, 2024 · 80b83ca · 80b83ca
1 parent 44a267c
commit 80b83ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactory.java b/.../drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactory.java
@@ -30,7 +30,8 @@
 
 public class ChunkFactory {
 
-    public static int SYMMETRIC_SECURITY_HEADER_SIZE = 4;
+    public static final int ASYMMETRIC_SECURITY_HEADER_SIZE = 59;
+    public static final int SYMMETRIC_SECURITY_HEADER_SIZE = 4;
 
     public Chunk create(boolean asymmetric, Conversation conversation) {
         return create(asymmetric,
@@ -48,7 +49,7 @@ public Chunk create(boolean asymmetric, boolean encrypted, boolean signed, Secur
 
         if (securityPolicy == SecurityPolicy.NONE) {
             return new Chunk(
-                asymmetric ? 59 : SYMMETRIC_SECURITY_HEADER_SIZE,
+                asymmetric ? ASYMMETRIC_SECURITY_HEADER_SIZE : SYMMETRIC_SECURITY_HEADER_SIZE,
                 1,
                 1,
                 securityPolicy.getSymmetricSignatureSize(),

diff --git a/...vers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactoryTest.java b/...vers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactoryTest.java
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.plc4x.java.opcua.TestCertificateGenerator;
 import org.apache.plc4x.java.opcua.readwrite.MessageSecurityMode;
 import org.apache.plc4x.java.opcua.readwrite.OpcuaProtocolLimits;
@@ -40,7 +41,7 @@
 @Disabled("Disabled flaky test. Tracking issue at https://github.com/apache/plc4x/issues/1764")
 class ChunkFactoryTest {
 
-    public static final Map<Integer, Entry<PrivateKey, X509Certificate>> CERTIFICATES = new HashMap<>();
+    public static final Map<Integer, Entry<PrivateKey, X509Certificate>> CERTIFICATES = new ConcurrentHashMap<>();
 
     private OpcuaProtocolLimits limits = new OpcuaProtocolLimits(
         8196,