Skip to content

Commit 80b83ca

Browse files
committed
Attempt to stabilize OPC UA chunk factory tests.
Related to #1764. Signed-off-by: Łukasz Dywicki <[email protected]>
1 parent 44a267c commit 80b83ca

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactory.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
public class ChunkFactory {
3232

33-
public static int SYMMETRIC_SECURITY_HEADER_SIZE = 4;
33+
public static final int ASYMMETRIC_SECURITY_HEADER_SIZE = 59;
34+
public static final int SYMMETRIC_SECURITY_HEADER_SIZE = 4;
3435

3536
public Chunk create(boolean asymmetric, Conversation conversation) {
3637
return create(asymmetric,
@@ -48,7 +49,7 @@ public Chunk create(boolean asymmetric, boolean encrypted, boolean signed, Secur
4849

4950
if (securityPolicy == SecurityPolicy.NONE) {
5051
return new Chunk(
51-
asymmetric ? 59 : SYMMETRIC_SECURITY_HEADER_SIZE,
52+
asymmetric ? ASYMMETRIC_SECURITY_HEADER_SIZE : SYMMETRIC_SECURITY_HEADER_SIZE,
5253
1,
5354
1,
5455
securityPolicy.getSymmetricSignatureSize(),

plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/chunk/ChunkFactoryTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.HashMap;
2727
import java.util.Map;
2828
import java.util.Map.Entry;
29+
import java.util.concurrent.ConcurrentHashMap;
2930
import org.apache.plc4x.java.opcua.TestCertificateGenerator;
3031
import org.apache.plc4x.java.opcua.readwrite.MessageSecurityMode;
3132
import org.apache.plc4x.java.opcua.readwrite.OpcuaProtocolLimits;
@@ -40,7 +41,7 @@
4041
@Disabled("Disabled flaky test. Tracking issue at https://github.com/apache/plc4x/issues/1764")
4142
class ChunkFactoryTest {
4243

43-
public static final Map<Integer, Entry<PrivateKey, X509Certificate>> CERTIFICATES = new HashMap<>();
44+
public static final Map<Integer, Entry<PrivateKey, X509Certificate>> CERTIFICATES = new ConcurrentHashMap<>();
4445

4546
private OpcuaProtocolLimits limits = new OpcuaProtocolLimits(
4647
8196,

0 commit comments

Comments
 (0)