Changing out testNG to JUnit5

system24seven · system24seven · commit 67ea0f9c3493 · 2025-01-01T19:42:47.000+11:00
Signed-off-by: system24seven &lt;david@system24seven.com&gt;
diff --git a/opc-ua-sdk/sdk-tests/pom.xml b/opc-ua-sdk/sdk-tests/pom.xml
@@ -29,13 +29,13 @@
     <dependencies>
         <dependency>
             <groupId>org.eclipse.milo</groupId>
-            <artifactId>sdk-client</artifactId>
+            <artifactId>milo-sdk-client</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.milo</groupId>
-            <artifactId>sdk-server</artifactId>
+            <artifactId>milo-sdk-server</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/AttributeIdTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/AttributeIdTest.java
@@ -10,12 +10,13 @@
 
 package org.eclipse.milo.opcua.stack.core;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 import java.util.ArrayList;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AttributeIdTest {
 
   @Test
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/ChunkDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/ChunkDecoderTest.java
@@ -17,9 +17,6 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 import org.junit.jupiter.api.Test;
 
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-import org.testng.annotations.Test;
-
 public class ChunkDecoderTest {
 
   @Test
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/BinaryDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/BinaryDecoderTest.java
@@ -10,10 +10,6 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
 import java.util.Arrays;
 import org.eclipse.milo.opcua.stack.core.NamespaceTable;
 import org.eclipse.milo.opcua.stack.core.NodeIds;
@@ -23,11 +19,18 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
 import org.eclipse.milo.opcua.stack.core.types.enumerated.ApplicationType;
 import org.eclipse.milo.opcua.stack.core.types.structured.Argument;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 
 public class BinaryDecoderTest extends BinarySerializationFixture {
 
-  @Test(description = "a null array, once encoded, should decode to a null array")
+  @Test
+  @DisplayName("a null array, once encoded, should decode to a null array")
   public void testDecodeNullArray() {
     Argument argument = new Argument("test", NodeIds.Int16, 1, null, LocalizedText.NULL_VALUE);
 
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/BinarySerializationFixture.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/BinarySerializationFixture.java
@@ -13,15 +13,15 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.eclipse.milo.opcua.stack.core.encoding.DefaultEncodingContext;
-import org.testng.annotations.BeforeMethod;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class BinarySerializationFixture {
 
   ByteBuf buffer;
   OpcUaBinaryEncoder writer;
   OpcUaBinaryDecoder reader;
 
-  @BeforeMethod
+  @BeforeEach
   public void setUp() {
     buffer = Unpooled.buffer();
 
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/DataValueSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/DataValueSerializationTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
 import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import org.eclipse.milo.opcua.stack.core.encoding.DefaultEncodingContext;
@@ -20,8 +20,9 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
 import org.eclipse.milo.opcua.stack.core.util.BufferUtil;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DataValueSerializationTest {
 
@@ -30,7 +31,8 @@ public class DataValueSerializationTest {
   private final OpcUaBinaryDecoder decoder =
       new OpcUaBinaryDecoder(DefaultEncodingContext.INSTANCE);
 
-  @Test(dataProvider = "getValues")
+  @ParameterizedTest
+  @MethodSource("getValues")
   public void testDataValueRoundTrip(DataValue value) {
     ByteBuf buffer = BufferUtil.pooledBuffer();
     encoder.setBuffer(buffer);
@@ -42,8 +44,7 @@ public void testDataValueRoundTrip(DataValue value) {
     assertEquals(decodedValue, value);
   }
 
-  @DataProvider
-  public Object[][] getValues() {
+  public static Object[][] getValues() {
     return new Object[][] {
       {
         new DataValue(
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/DiagnosticInfoSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/DiagnosticInfoSerializationTest.java
@@ -10,17 +10,16 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.milo.opcua.stack.core.types.builtin.DiagnosticInfo;
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DiagnosticInfoSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider(name = "DiagnosticInfoProvider")
-  public Object[][] getDiagnosticInfos() {
+  public static Object[][] getDiagnosticInfos() {
     return new Object[][] {
       {null},
       {new DiagnosticInfo(1, -1, -1, -1, null, null, null)},
@@ -43,7 +42,8 @@ public Object[][] getDiagnosticInfos() {
     };
   }
 
-  @Test(dataProvider = "DiagnosticInfoProvider")
+  @ParameterizedTest
+          @MethodSource("getDiagnosticInfos")
   public void testDiagnosticInfoRoundTrip(DiagnosticInfo diagnosticInfo) {
     writer.encodeDiagnosticInfo(diagnosticInfo);
     DiagnosticInfo decoded = reader.decodeDiagnosticInfo();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/ExpandedNodeIdSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/ExpandedNodeIdSerializationTest.java
@@ -12,19 +12,19 @@
 
 import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
 import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.UUID;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 import org.eclipse.milo.opcua.stack.core.util.Namespaces;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExpandedNodeIdSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider
-  public Object[][] getExpandedNodeIds() {
+  public static Object[][] getExpandedNodeIds() {
     return new Object[][] {
       {new ExpandedNodeId(ushort(0), null, uint(0))},
       {new ExpandedNodeId(ushort(0), null, "hello, world")},
@@ -41,9 +41,9 @@ public Object[][] getExpandedNodeIds() {
     };
   }
 
-  @Test(
-      dataProvider = "getExpandedNodeIds",
-      description = "ExpandedNodeId is round-trip serializable.")
+  @ParameterizedTest
+  @MethodSource("getExpandedNodeIds")
+  @DisplayName("ExpandedNodeId is round-trip serializable.")
   public void testExpandedNodeIdRoundTrip(ExpandedNodeId nodeId) throws Exception {
     writer.encodeExpandedNodeId(nodeId);
     ExpandedNodeId decoded = reader.decodeExpandedNodeId();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/ExtensionObjectSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/ExtensionObjectSerializationTest.java
@@ -10,28 +10,28 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExtensionObject;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.XmlElement;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExtensionObjectSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider
-  public Object[][] getExtensionObjects() {
+  public static Object[][] getExtensionObjects() {
     return new Object[][] {
       {new ExtensionObject(ByteString.of(new byte[] {1, 2, 3, 4}), new NodeId(1, 2))},
       {new ExtensionObject(XmlElement.of("<a>hello</a>"), new NodeId(1, 2))},
     };
   }
 
-  @Test(
-      dataProvider = "getExtensionObjects",
-      description = "ExtensionObject is round-trip serializable.")
+  @ParameterizedTest
+  @MethodSource("getExtensionObjects")
+  @DisplayName("ExtensionObject is round-trip serializable.")
   public void testExtensionObjectRoundTrip(ExtensionObject xo) throws Exception {
     writer.encodeExtensionObject(xo);
     ExtensionObject decoded = reader.decodeExtensionObject();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/GuidSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/GuidSerializationTest.java
@@ -10,16 +10,17 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.UUID;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 public class GuidSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider(name = "GuidProvider")
-  public Object[][] getGuids() {
+  public static Object[][] getGuids() {
     return new Object[][] {
       {UUID.fromString("C496578A-0DFE-4b8f-870A-745238C6AEAE")},
       {UUID.fromString("72962B91-FA75-4ae6-8D28-B404DC7DAF63")},
@@ -29,7 +30,9 @@ public Object[][] getGuids() {
     };
   }
 
-  @Test(dataProvider = "GuidProvider", description = "Guid is round-trip serializable.")
+  @ParameterizedTest
+  @MethodSource("getGuids")
+  @DisplayName("Guid is round-trip serializable.")
   public void testGuidRoundTrip(UUID uuid) throws Exception {
     writer.encodeGuid(uuid);
     UUID decoded = reader.decodeGuid();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/LocalizedTextSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/LocalizedTextSerializationTest.java
@@ -10,16 +10,16 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class LocalizedTextSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider
-  public Object[][] getLocalizedTexts() {
+  public static Object[][] getLocalizedTexts() {
     return new Object[][] {
       {new LocalizedText(null, null)},
       {new LocalizedText("locale", null)},
@@ -28,9 +28,9 @@ public Object[][] getLocalizedTexts() {
     };
   }
 
-  @Test(
-      dataProvider = "getLocalizedTexts",
-      description = "LocalizedText is round-trip serializable.")
+  @ParameterizedTest
+  @MethodSource("getLocalizedTexts")
+  @DisplayName("LocalizedText is round-trip serializable.")
   public void testLocalizedText(LocalizedText localizedText) throws Exception {
     writer.encodeLocalizedText(localizedText);
     LocalizedText decoded = reader.decodeLocalizedText();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/NodeIdSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/NodeIdSerializationTest.java
@@ -10,18 +10,18 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.UUID;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class NodeIdSerializationTest extends BinarySerializationFixture {
 
-  @DataProvider
-  public Object[][] getNodeIds() {
+  public static Object[][] getNodeIds() {
     return new Object[][] {
       {new NodeId(0, 0)},
       {new NodeId(0, 1)},
@@ -45,7 +45,9 @@ public Object[][] getNodeIds() {
     };
   }
 
-  @Test(dataProvider = "getNodeIds", description = "NodeId is round-trip serializable.")
+  @ParameterizedTest
+  @MethodSource("getNodeIds")
+  @DisplayName("NodeId is round-trip serializable.")
   public void testNodeIdRoundTrip(NodeId nodeId) throws Exception {
     writer.encodeNodeId(nodeId);
     NodeId decoded = reader.decodeNodeId();
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/OpcUaBinaryDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/OpcUaBinaryDecoderTest.java
@@ -10,13 +10,13 @@
 
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
-import static org.testng.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.eclipse.milo.opcua.stack.core.UaSerializationException;
 import org.eclipse.milo.opcua.stack.core.encoding.DefaultEncodingContext;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class OpcUaBinaryDecoderTest {
 
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/OpcUaBinaryEncoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/OpcUaBinaryEncoderTest.java
@@ -11,22 +11,22 @@
 package org.eclipse.milo.opcua.stack.core.encoding.binary;
 
 import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ubyte;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.eclipse.milo.opcua.stack.core.encoding.DefaultEncodingContext;
 import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
 import org.eclipse.milo.opcua.stack.core.types.structured.AccessLevelType;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class OpcUaBinaryEncoderTest {
 
   ByteBuf buffer;
   OpcUaBinaryEncoder writer;
 
-  @BeforeTest
+  @BeforeEach
   public void initializeTest() {
     buffer = Unpooled.buffer();
     writer = new OpcUaBinaryEncoder(DefaultEncodingContext.INSTANCE).setBuffer(buffer);
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/StringSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/StringSerializationTest.java
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/VariantSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/VariantSerializationTest.java
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/XmlElementSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/encoding/binary/XmlElementSerializationTest.java
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/CertificateUtilTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/CertificateUtilTest.java
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/NonceUtilTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/NonceUtilTest.java
diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/validation/CertificateValidationUtilTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/validation/CertificateValidationUtilTest.java
