From 8db1853a41da47926f0585ed620cdfda7ce53fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 19 Apr 2024 15:36:17 +0200 Subject: [PATCH] Migrate from TestNG to JUnit5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - all compilation issues fixed - remains few failing tests Signed-off-by: Aurélien Pupier --- opc-ua-sdk/dictionary-reader/pom.xml | 3 +- opc-ua-sdk/integration-tests/pom.xml | 2 - opc-ua-sdk/pom.xml | 1 - opc-ua-sdk/sdk-server/pom.xml | 10 ++- .../milo/opcua/sdk/core/AccessLevelTest.java | 6 +- .../sdk/core/CefactEngineeringUnitsTest.java | 8 +-- .../milo/opcua/sdk/core/NumericRangeTest.java | 41 ++++++------ .../milo/opcua/sdk/core/ReferenceTest.java | 6 +- .../sdk/server/LifecycleManagerTest.java | 6 +- .../api/config/OpcUaServerConfigTest.java | 7 ++- .../conversions/AbstractConversionTest.java | 10 +-- .../conversions/BooleanConversionsTest.java | 6 +- .../conversions/ByteConversionsTest.java | 14 ++--- .../ByteStringConversionsTest.java | 7 ++- .../conversions/DateTimeConversionsTest.java | 8 +-- .../ExpandedNodeIdConversionsTest.java | 14 ++--- .../conversions/GuidConversionsTest.java | 6 +- .../conversions/ImplicitConversionsTest.java | 8 +-- .../LocalizedTextConversionsTest.java | 8 +-- .../conversions/NodeIdConversionsTest.java | 10 +-- .../QualifiedNameConversionsTest.java | 10 +-- .../server/events/operators/EqualsTest.java | 14 ++--- .../server/events/operators/IsNullTest.java | 13 ++-- .../opcua/sdk/server/nodes/UaNodeTest.java | 14 ++--- .../delegates/AttributeDelegateChainTest.java | 6 +- .../InstanceDeclarationHierarchyTest.java | 6 +- .../nodes/factories/NodeFactoryTest.java | 12 ++-- .../filters/AttributeFilterChainTest.java | 8 +-- .../sdk/server/util/HostnameUtilTest.java | 6 +- opc-ua-sdk/sdk-tests/pom.xml | 5 +- .../api/identity/AnonymousProviderTest.java | 14 ++--- .../client/config/OpcUaClientConfigTest.java | 13 ++-- .../sdk/client/session/SessionFsmTest.java | 8 +-- .../ClientHandleSequenceTest.java | 14 +++-- opc-ua-stack/bsd-parser-gson/pom.xml | 5 +- .../binaryschema/gson/JsonBsdParserTest.java | 9 +-- opc-ua-stack/bsd-parser/pom.xml | 5 +- .../opcua/binaryschema/BsdParserTest.java | 20 +++--- .../binaryschema/GenericBsdParserTest.java | 2 +- opc-ua-stack/pom.xml | 2 +- opc-ua-stack/stack-core/pom.xml | 10 ++- .../milo/opcua/stack/SequenceHeaderTest.java | 15 +++-- .../opcua/stack/SerializationFixture2.java | 4 +- .../stack/SymmetricSecurityHeaderTest.java | 15 +++-- .../opcua/stack/core/AttributeIdTest.java | 9 +-- .../stack/core/channel/ChunkDecoderTest.java | 10 +-- .../channel/messages/HelloMessageTest.java | 11 ++-- .../DefaultCertificateManagerTest.java | 12 ++-- .../security/DefaultTrustListManagerTest.java | 8 +-- .../OpcUaBinaryStreamDecoderTest.java | 9 +-- .../OpcUaXmlStreamDecoderTest.java | 6 +- .../binary/BinaryDecoderTest.java | 17 ++--- .../binary/BinarySerializationFixture.java | 4 +- .../binary/DataValueSerializationTest.java | 17 ++--- .../DiagnosticInfoSerializationTest.java | 14 ++--- .../ExpandedNodeIdSerializationTest.java | 14 +++-- .../ExtensionObjectSerializationTest.java | 16 ++--- .../binary/GuidSerializationTest.java | 16 ++--- .../LocalizedTextSerializationTest.java | 16 ++--- .../binary/NodeIdSerializationTest.java | 16 ++--- .../binary/OpcUaBinaryStreamEncoderTest.java | 13 ++-- .../binary/StringSerializationTest.java | 12 ++-- .../binary/VariantSerializationTest.java | 41 ++++++------ .../binary/XmlElementSerializationTest.java | 16 ++--- .../core/types/builtin/ByteStringTest.java | 6 +- .../core/types/builtin/DateTimeTest.java | 6 +- .../types/builtin/ExpandedNodeIdTest.java | 18 +++--- .../stack/core/types/builtin/NodeIdTest.java | 21 ++++--- .../core/types/builtin/QualifiedNameTest.java | 7 ++- .../stack/core/types/builtin/VariantTest.java | 12 ++-- .../ApplicationDescriptionTest.java | 5 +- .../opcua/stack/core/util/ArrayUtilTest.java | 39 +++++++----- .../stack/core/util/CertificateUtilTest.java | 6 +- .../stack/core/util/EndpointUtilTest.java | 6 +- .../stack/core/util/ExecutionQueueTest.java | 8 +-- .../milo/opcua/stack/core/util/LazyTest.java | 8 +-- .../opcua/stack/core/util/NonceUtilTest.java | 12 ++-- .../CertificateValidationUtilTest.java | 45 +++++++------- opc-ua-stack/stack-tests/pom.xml | 10 ++- .../opcua/stack/ChunkSerializationTest.java | 31 +++++----- .../stack/ClientCertificateValidatorIT.java | 6 +- .../milo/opcua/stack/ClientServerTest.java | 62 +++++++++++-------- .../milo/opcua/stack/SecurityFixture.java | 4 +- .../opcua/stack/StackIntegrationTest.java | 16 ++--- .../config/UaStackClientConfigTest.java | 8 +-- .../server/EndpointConfigurationTest.java | 23 +++---- pom.xml | 12 ++++ 87 files changed, 570 insertions(+), 489 deletions(-) diff --git a/opc-ua-sdk/dictionary-reader/pom.xml b/opc-ua-sdk/dictionary-reader/pom.xml index 90610d5c9c..420259f634 100644 --- a/opc-ua-sdk/dictionary-reader/pom.xml +++ b/opc-ua-sdk/dictionary-reader/pom.xml @@ -34,8 +34,7 @@ org.junit.jupiter - junit-jupiter-engine - 5.5.2 + junit-jupiter test diff --git a/opc-ua-sdk/integration-tests/pom.xml b/opc-ua-sdk/integration-tests/pom.xml index b5a1b65715..3cfcaf7e49 100644 --- a/opc-ua-sdk/integration-tests/pom.xml +++ b/opc-ua-sdk/integration-tests/pom.xml @@ -43,13 +43,11 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 test org.junit.jupiter junit-jupiter-engine - 5.6.2 test diff --git a/opc-ua-sdk/pom.xml b/opc-ua-sdk/pom.xml index fa4d152d47..4aa736489f 100644 --- a/opc-ua-sdk/pom.xml +++ b/opc-ua-sdk/pom.xml @@ -14,7 +14,6 @@ 22.0.0 1.7.32 - 6.11 2.25.1 diff --git a/opc-ua-sdk/sdk-server/pom.xml b/opc-ua-sdk/sdk-server/pom.xml index a4f89628d7..6ac24eb743 100644 --- a/opc-ua-sdk/sdk-server/pom.xml +++ b/opc-ua-sdk/sdk-server/pom.xml @@ -47,9 +47,13 @@ - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-params test diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/AccessLevelTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/AccessLevelTest.java index 61d33ce189..868a1d5d66 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/AccessLevelTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/AccessLevelTest.java @@ -10,10 +10,10 @@ package org.eclipse.milo.opcua.sdk.core; -import org.testng.annotations.Test; - 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 org.junit.jupiter.api.Test; public class AccessLevelTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/CefactEngineeringUnitsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/CefactEngineeringUnitsTest.java index 512e8e952c..3d3cf88492 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/CefactEngineeringUnitsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/CefactEngineeringUnitsTest.java @@ -10,11 +10,11 @@ package org.eclipse.milo.opcua.sdk.core; -import org.eclipse.milo.opcua.stack.core.types.structured.EUInformation; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import org.eclipse.milo.opcua.stack.core.types.structured.EUInformation; +import org.junit.jupiter.api.Test; public class CefactEngineeringUnitsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/NumericRangeTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/NumericRangeTest.java index 40e2dbc210..8241f74682 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/NumericRangeTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/NumericRangeTest.java @@ -10,20 +10,24 @@ package org.eclipse.milo.opcua.sdk.core; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Arrays; import org.eclipse.milo.opcua.stack.core.UaException; import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class NumericRangeTest { - @Test(dataProvider = "getArray1dRanges") + @ParameterizedTest + @MethodSource("getArray1dRanges") public void testArray1d(String range, int[] expected) throws UaException { NumericRange nr = NumericRange.parse(range); Variant value = new Variant(array1d); @@ -34,7 +38,8 @@ public void testArray1d(String range, int[] expected) throws UaException { assertTrue(Arrays.equals(expected, (int[]) result)); } - @Test(dataProvider = "getArray2dRanges") + @ParameterizedTest + @MethodSource("getArray2dRanges") public void testArray2d(String range, int[][] expected) throws UaException { NumericRange nr = NumericRange.parse(range); Variant value = new Variant(array2d); @@ -45,7 +50,8 @@ public void testArray2d(String range, int[][] expected) throws UaException { assertTrue(Arrays.deepEquals(expected, (int[][]) result)); } - @Test(dataProvider = "getArray3dRanges") + @ParameterizedTest + @MethodSource("getArray3dRanges") public void testArray3d(String range, int[][][] expected) throws UaException { NumericRange nr = NumericRange.parse(range); Variant value = new Variant(array3d); @@ -65,7 +71,7 @@ public void testArrayBeyondEnd() throws UaException { Object result = NumericRange.readFromValueAtRange(value, nr); assertTrue(result instanceof int[]); - assertEquals(result, array); + assertArrayEquals((int[]) result, array); } @Test @@ -163,9 +169,10 @@ public void testByteStringBeyondEnd() throws UaException { assertEquals(result, byteString); } - @Test(dataProvider = "getInvalidRanges", expectedExceptions = UaException.class) + @ParameterizedTest + @MethodSource("getInvalidRanges") public void testInvalidRange(String indexRange) throws UaException { - NumericRange.parse(indexRange); + assertThrows(UaException.class, () -> NumericRange.parse(indexRange)); } @@ -208,8 +215,7 @@ public void testWriteByteString() throws UaException { assertEquals(updated, new ByteString(new byte[]{0, 2, 4, 3})); } - @DataProvider - private static Object[][] getInvalidRanges() { + public static Object[][] getInvalidRanges() { return new Object[][]{ {"0:0"}, {"1:1"}, @@ -223,8 +229,7 @@ private static Object[][] getInvalidRanges() { private static final int[] array1d = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - @DataProvider - private static Object[][] getArray1dRanges() { + public static Object[][] getArray1dRanges() { return new Object[][]{ {"0:3", new int[]{0, 1, 2, 3}}, {"4:9", new int[]{4, 5, 6, 7, 8, 9}}, @@ -246,8 +251,7 @@ private static Object[][] getArray1dRanges() { {12, 13, 14, 15} }; - @DataProvider - private static Object[][] getArray2dRanges() { + public static Object[][] getArray2dRanges() { return new Object[][]{ {"0:1,0:1", new int[][]{{0, 1}, {4, 5}}}, {"1:2,1:3", new int[][]{{5, 6, 7}, {9, 10, 11}}}, @@ -263,8 +267,7 @@ private static Object[][] getArray2dRanges() { {{20, 21}, {22, 23}, {24, 25}, {26, 27}} }; - @DataProvider - private static Object[][] getArray3dRanges() { + public static Object[][] getArray3dRanges() { return new Object[][]{ {"0:1,0:1,0:1", new int[][][]{ {{0, 1}, {2, 3}}, diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/ReferenceTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/ReferenceTest.java index 0422bb065e..14c318ddbf 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/ReferenceTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/core/ReferenceTest.java @@ -10,13 +10,13 @@ package org.eclipse.milo.opcua.sdk.core; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.UUID; import org.eclipse.milo.opcua.stack.core.Identifiers; import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class ReferenceTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/LifecycleManagerTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/LifecycleManagerTest.java index e73a8cc074..c093b3ff65 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/LifecycleManagerTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/LifecycleManagerTest.java @@ -10,11 +10,11 @@ package org.eclipse.milo.opcua.sdk.server; -import java.util.concurrent.atomic.AtomicInteger; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.testng.annotations.Test; +import java.util.concurrent.atomic.AtomicInteger; -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class LifecycleManagerTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/api/config/OpcUaServerConfigTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/api/config/OpcUaServerConfigTest.java index cb1272706f..481b097c52 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/api/config/OpcUaServerConfigTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/api/config/OpcUaServerConfigTest.java @@ -10,20 +10,21 @@ package org.eclipse.milo.opcua.sdk.server.api.config; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.IOException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import com.google.common.io.Files; import org.eclipse.milo.opcua.sdk.server.identity.AnonymousIdentityValidator; import org.eclipse.milo.opcua.stack.core.security.DefaultCertificateManager; import org.eclipse.milo.opcua.stack.core.security.DefaultTrustListManager; import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime; import org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo; import org.eclipse.milo.opcua.stack.server.security.DefaultServerCertificateValidator; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; +import com.google.common.io.Files; public class OpcUaServerConfigTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/AbstractConversionTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/AbstractConversionTest.java index 6249d81a7b..c954cc252d 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/AbstractConversionTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/AbstractConversionTest.java @@ -10,14 +10,14 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; + import org.eclipse.milo.opcua.stack.core.BuiltinDataType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.fail; +import org.junit.jupiter.api.Test; abstract class AbstractConversionTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/BooleanConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/BooleanConversionsTest.java index 126dd1b1ee..e1a4b2aae1 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/BooleanConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/BooleanConversionsTest.java @@ -10,8 +10,6 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.BooleanConversions.booleanToByte; import static org.eclipse.milo.opcua.sdk.server.events.conversions.BooleanConversions.booleanToDouble; import static org.eclipse.milo.opcua.sdk.server.events.conversions.BooleanConversions.booleanToFloat; @@ -27,7 +25,9 @@ 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.ulong; 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 org.junit.jupiter.api.Test; public class BooleanConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteConversionsTest.java index 38dd18d436..e96fa83799 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteConversionsTest.java @@ -10,10 +10,6 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.BuiltinDataType; -import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UByte; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.ByteConversions.byteToBoolean; import static org.eclipse.milo.opcua.sdk.server.events.conversions.ByteConversions.byteToDouble; import static org.eclipse.milo.opcua.sdk.server.events.conversions.ByteConversions.byteToFloat; @@ -30,9 +26,13 @@ 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.ulong; import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.eclipse.milo.opcua.stack.core.BuiltinDataType; +import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UByte; +import org.junit.jupiter.api.Test; public class ByteConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteStringConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteStringConversionsTest.java index c90011127e..e6c5b7c415 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteStringConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ByteStringConversionsTest.java @@ -10,14 +10,15 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.nio.ByteBuffer; import java.util.UUID; -import io.netty.buffer.ByteBufUtil; import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; +import io.netty.buffer.ByteBufUtil; public class ByteStringConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/DateTimeConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/DateTimeConversionsTest.java index 7a175e9997..5ea591fcb3 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/DateTimeConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/DateTimeConversionsTest.java @@ -10,14 +10,14 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.Calendar; import org.eclipse.milo.opcua.stack.core.BuiltinDataType; import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import org.junit.jupiter.api.Test; public class DateTimeConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ExpandedNodeIdConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ExpandedNodeIdConversionsTest.java index 29a666dc9d..6c3cff8085 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ExpandedNodeIdConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ExpandedNodeIdConversionsTest.java @@ -10,17 +10,17 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; -import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; -import org.eclipse.milo.opcua.stack.core.util.Namespaces; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.ExpandedNodeIdConversions.expandedNodeIdToNodeId; import static org.eclipse.milo.opcua.sdk.server.events.conversions.ExpandedNodeIdConversions.expandedNodeIdToString; 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.testng.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; +import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; +import org.eclipse.milo.opcua.stack.core.util.Namespaces; +import org.junit.jupiter.api.Test; public class ExpandedNodeIdConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/GuidConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/GuidConversionsTest.java index 2c8ff97635..f4c237b68b 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/GuidConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/GuidConversionsTest.java @@ -10,13 +10,13 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.nio.ByteBuffer; import java.util.UUID; import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class GuidConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ImplicitConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ImplicitConversionsTest.java index f4a62afb7a..667ee0e5e2 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ImplicitConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/ImplicitConversionsTest.java @@ -10,12 +10,12 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.BuiltinDataType; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.ImplicitConversions.convert; 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 org.eclipse.milo.opcua.stack.core.BuiltinDataType; +import org.junit.jupiter.api.Test; public class ImplicitConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/LocalizedTextConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/LocalizedTextConversionsTest.java index 07990b8a58..dc7c3368d9 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/LocalizedTextConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/LocalizedTextConversionsTest.java @@ -10,11 +10,11 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.LocalizedTextConversions.localizedTextToString; -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.junit.jupiter.api.Test; public class LocalizedTextConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/NodeIdConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/NodeIdConversionsTest.java index ef535e1783..33f9437153 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/NodeIdConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/NodeIdConversionsTest.java @@ -10,13 +10,13 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; -import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.NodeIdConversions.nodeIdToExpandedNodeId; import static org.eclipse.milo.opcua.sdk.server.events.conversions.NodeIdConversions.nodeIdToString; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; +import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; +import org.junit.jupiter.api.Test; public class NodeIdConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/QualifiedNameConversionsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/QualifiedNameConversionsTest.java index 90acb69b60..c6233431af 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/QualifiedNameConversionsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/conversions/QualifiedNameConversionsTest.java @@ -10,13 +10,13 @@ package org.eclipse.milo.opcua.sdk.server.events.conversions; -import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; -import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.sdk.server.events.conversions.QualifiedNameConversions.qualifiedNameToLocalizedText; import static org.eclipse.milo.opcua.sdk.server.events.conversions.QualifiedNameConversions.qualifiedNameToString; -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.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; +import org.junit.jupiter.api.Test; public class QualifiedNameConversionsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/EqualsTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/EqualsTest.java index 5e2bd34e1b..e697a22306 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/EqualsTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/EqualsTest.java @@ -10,18 +10,18 @@ package org.eclipse.milo.opcua.sdk.server.events.operators; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.eclipse.milo.opcua.sdk.server.events.OperatorContext; import org.eclipse.milo.opcua.sdk.server.model.nodes.objects.BaseEventTypeNode; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; import org.eclipse.milo.opcua.stack.core.types.structured.FilterOperand; import org.eclipse.milo.opcua.stack.core.types.structured.LiteralOperand; -import org.testng.annotations.Test; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class EqualsTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/IsNullTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/IsNullTest.java index ea690fdebb..6d72ccb8df 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/IsNullTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/events/operators/IsNullTest.java @@ -10,18 +10,19 @@ package org.eclipse.milo.opcua.sdk.server.events.operators; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.eclipse.milo.opcua.sdk.server.events.OperatorContext; import org.eclipse.milo.opcua.sdk.server.model.nodes.objects.BaseEventTypeNode; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; import org.eclipse.milo.opcua.stack.core.types.structured.FilterOperand; import org.eclipse.milo.opcua.stack.core.types.structured.LiteralOperand; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; public class IsNullTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/UaNodeTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/UaNodeTest.java index 3f05d9f0db..fb730af277 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/UaNodeTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/UaNodeTest.java @@ -10,6 +10,10 @@ package org.eclipse.milo.opcua.sdk.server.nodes; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.eclipse.milo.opcua.sdk.core.Reference; import org.eclipse.milo.opcua.sdk.server.ObjectTypeManager; import org.eclipse.milo.opcua.sdk.server.OpcUaServer; @@ -28,19 +32,15 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; public class UaNodeTest { private OpcUaServer server; - @BeforeTest + @BeforeEach public void setup() throws Exception { server = Mockito.mock(OpcUaServer.class); diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/delegates/AttributeDelegateChainTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/delegates/AttributeDelegateChainTest.java index cfae1ed7da..b97065b61c 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/delegates/AttributeDelegateChainTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/delegates/AttributeDelegateChainTest.java @@ -10,6 +10,8 @@ package org.eclipse.milo.opcua.sdk.server.nodes.delegates; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; @@ -30,9 +32,7 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class AttributeDelegateChainTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/InstanceDeclarationHierarchyTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/InstanceDeclarationHierarchyTest.java index b8e7ec5eec..ac4dfe0980 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/InstanceDeclarationHierarchyTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/InstanceDeclarationHierarchyTest.java @@ -10,6 +10,8 @@ package org.eclipse.milo.opcua.sdk.server.nodes.factories; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.List; import java.util.Optional; @@ -25,11 +27,9 @@ import org.eclipse.milo.opcua.stack.core.NamespaceTable; import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertNotNull; public class InstanceDeclarationHierarchyTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/NodeFactoryTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/NodeFactoryTest.java index e553b07bb2..fbe388e01e 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/NodeFactoryTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/factories/NodeFactoryTest.java @@ -10,6 +10,9 @@ package org.eclipse.milo.opcua.sdk.server.nodes.factories; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; @@ -37,13 +40,10 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; import org.jetbrains.annotations.Nullable; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; public class NodeFactoryTest { @@ -51,7 +51,7 @@ public class NodeFactoryTest { private UaNodeManager nodeManager; private NodeFactory nodeFactory; - @BeforeTest + @BeforeEach public void setup() throws Exception { server = Mockito.mock(OpcUaServer.class); diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/filters/AttributeFilterChainTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/filters/AttributeFilterChainTest.java index 4b1f70fd61..08da46555f 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/filters/AttributeFilterChainTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/nodes/filters/AttributeFilterChainTest.java @@ -10,6 +10,9 @@ package org.eclipse.milo.opcua.sdk.server.nodes.filters; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicBoolean; import org.eclipse.milo.opcua.sdk.core.AccessLevel; @@ -27,10 +30,7 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName; import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class AttributeFilterChainTest { diff --git a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/util/HostnameUtilTest.java b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/util/HostnameUtilTest.java index 504199c829..2afd896562 100644 --- a/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/util/HostnameUtilTest.java +++ b/opc-ua-sdk/sdk-server/src/test/java/org/eclipse/milo/opcua/sdk/server/util/HostnameUtilTest.java @@ -10,11 +10,11 @@ package org.eclipse.milo.opcua.sdk.server.util; -import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.testng.annotations.Test; +import java.util.Set; -import static org.testng.Assert.assertNotEquals; +import org.junit.jupiter.api.Test; public class HostnameUtilTest { diff --git a/opc-ua-sdk/sdk-tests/pom.xml b/opc-ua-sdk/sdk-tests/pom.xml index 35ca415ff6..197ebb0d05 100644 --- a/opc-ua-sdk/sdk-tests/pom.xml +++ b/opc-ua-sdk/sdk-tests/pom.xml @@ -34,9 +34,8 @@ test - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter test diff --git a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/api/identity/AnonymousProviderTest.java b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/api/identity/AnonymousProviderTest.java index 17a7b400be..af98ae2c8f 100644 --- a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/api/identity/AnonymousProviderTest.java +++ b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/api/identity/AnonymousProviderTest.java @@ -10,17 +10,17 @@ package org.eclipse.milo.opcua.sdk.client.api.identity; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString; import org.eclipse.milo.opcua.stack.core.types.enumerated.UserTokenType; import org.eclipse.milo.opcua.stack.core.types.structured.AnonymousIdentityToken; import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription; import org.eclipse.milo.opcua.stack.core.types.structured.UserTokenPolicy; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class AnonymousProviderTest { @@ -105,7 +105,7 @@ public void testGetIdentityToken_NoMatch_Throws() { AnonymousProvider p = new AnonymousProvider(); - assertThrows(() -> p.getIdentityToken(endpoint, ByteString.NULL_VALUE)); + assertThrows(Exception.class, () -> p.getIdentityToken(endpoint, ByteString.NULL_VALUE)); } } diff --git a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/config/OpcUaClientConfigTest.java b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/config/OpcUaClientConfigTest.java index 36fdb67a1d..e6ae963ae9 100644 --- a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/config/OpcUaClientConfigTest.java +++ b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/config/OpcUaClientConfigTest.java @@ -10,17 +10,18 @@ package org.eclipse.milo.opcua.sdk.client.config; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig; import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider; import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; import org.eclipse.milo.opcua.stack.core.types.enumerated.UserTokenType; import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription; import org.eclipse.milo.opcua.stack.core.types.structured.UserTokenPolicy; -import org.testng.annotations.Test; - -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; +import org.junit.jupiter.api.Test; public class OpcUaClientConfigTest { @@ -107,7 +108,7 @@ public void testCopyAndModify() { assertEquals(copy.getKeepAliveFailuresAllowed(), uint(2)); assertEquals(copy.getKeepAliveInterval(), uint(10000)); assertEquals(copy.getKeepAliveTimeout(), uint(15000)); - assertEquals(copy.getSessionLocaleIds(), new String[]{"en", "es"}); + assertArrayEquals(copy.getSessionLocaleIds(), new String[]{"en", "es"}); assertEquals(copy.getSubscriptionWatchdogMultiplier(), 3.0); } diff --git a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmTest.java b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmTest.java index 54b3052b12..59b7b7f0a0 100644 --- a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmTest.java +++ b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmTest.java @@ -10,6 +10,9 @@ package org.eclipse.milo.opcua.sdk.client.session; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.eclipse.milo.opcua.sdk.client.OpcUaClient; import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig; import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; @@ -17,10 +20,7 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode; import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription; -import org.testng.annotations.Test; - -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; -import static org.testng.Assert.assertNotNull; +import org.junit.jupiter.api.Test; public class SessionFsmTest { diff --git a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/subscriptions/ClientHandleSequenceTest.java b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/subscriptions/ClientHandleSequenceTest.java index 12c35f82cf..bbbbaa81a3 100644 --- a/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/subscriptions/ClientHandleSequenceTest.java +++ b/opc-ua-sdk/sdk-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/subscriptions/ClientHandleSequenceTest.java @@ -10,13 +10,14 @@ package org.eclipse.milo.opcua.sdk.client.subscriptions; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaSubscription.ClientHandleSequence; import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; -import org.testng.annotations.Test; - -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ClientHandleSequenceTest { @@ -38,7 +39,8 @@ public void testInUsePredicate() { } // Slow; enable to test manually. - @Test(enabled = false) + @Test + @Disabled public void testThrowsIfAllUsed() { ClientHandleSequence sequence = new ClientHandleSequence(h -> true); diff --git a/opc-ua-stack/bsd-parser-gson/pom.xml b/opc-ua-stack/bsd-parser-gson/pom.xml index 15fd5d9fd0..0c22e6b066 100644 --- a/opc-ua-stack/bsd-parser-gson/pom.xml +++ b/opc-ua-stack/bsd-parser-gson/pom.xml @@ -28,9 +28,8 @@ - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter test diff --git a/opc-ua-stack/bsd-parser-gson/src/test/java/org/eclipse/milo/opcua/binaryschema/gson/JsonBsdParserTest.java b/opc-ua-stack/bsd-parser-gson/src/test/java/org/eclipse/milo/opcua/binaryschema/gson/JsonBsdParserTest.java index 68441f3974..79641db380 100644 --- a/opc-ua-stack/bsd-parser-gson/src/test/java/org/eclipse/milo/opcua/binaryschema/gson/JsonBsdParserTest.java +++ b/opc-ua-stack/bsd-parser-gson/src/test/java/org/eclipse/milo/opcua/binaryschema/gson/JsonBsdParserTest.java @@ -10,14 +10,15 @@ package org.eclipse.milo.opcua.binaryschema.gson; +import org.eclipse.milo.opcua.binaryschema.BsdParserTest; +import org.eclipse.milo.opcua.binaryschema.parser.BsdParser; +import org.eclipse.milo.opcua.stack.core.serialization.codecs.OpcUaBinaryDataTypeCodec; +import org.junit.jupiter.api.Test; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; -import org.eclipse.milo.opcua.binaryschema.BsdParserTest; -import org.eclipse.milo.opcua.binaryschema.parser.BsdParser; -import org.eclipse.milo.opcua.stack.core.serialization.codecs.OpcUaBinaryDataTypeCodec; -import org.testng.annotations.Test; public class JsonBsdParserTest extends BsdParserTest { diff --git a/opc-ua-stack/bsd-parser/pom.xml b/opc-ua-stack/bsd-parser/pom.xml index 97c57c2439..d2fd564fe4 100644 --- a/opc-ua-stack/bsd-parser/pom.xml +++ b/opc-ua-stack/bsd-parser/pom.xml @@ -41,9 +41,8 @@ - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter test diff --git a/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/BsdParserTest.java b/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/BsdParserTest.java index 229f4ad9ee..ebbac33e98 100644 --- a/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/BsdParserTest.java +++ b/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/BsdParserTest.java @@ -10,11 +10,9 @@ package org.eclipse.milo.opcua.binaryschema; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.Table; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; -import io.netty.buffer.Unpooled; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.eclipse.milo.opcua.binaryschema.parser.BsdParser; import org.eclipse.milo.opcua.binaryschema.parser.DictionaryDescription; import org.eclipse.milo.opcua.stack.core.NamespaceTable; @@ -28,10 +26,14 @@ import org.eclipse.milo.opcua.stack.core.types.OpcUaBinaryDataTypeDictionary; import org.eclipse.milo.opcua.stack.core.types.OpcUaDataTypeManager; import org.eclipse.milo.opcua.stack.core.util.Namespaces; -import org.testng.annotations.BeforeSuite; +import org.junit.jupiter.api.BeforeEach; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.Unpooled; public abstract class BsdParserTest { @@ -105,7 +107,7 @@ public BsdParserTest() { */ protected abstract BsdParser createBsdParser(); - @BeforeSuite + @BeforeEach public void parseTypeDictionary() throws Exception { BsdParser parser = createBsdParser(); diff --git a/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/GenericBsdParserTest.java b/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/GenericBsdParserTest.java index 125c158866..18cb167b6b 100644 --- a/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/GenericBsdParserTest.java +++ b/opc-ua-stack/bsd-parser/src/test/java/org/eclipse/milo/opcua/binaryschema/GenericBsdParserTest.java @@ -13,7 +13,7 @@ import org.eclipse.milo.opcua.binaryschema.parser.BsdParser; import org.eclipse.milo.opcua.stack.core.serialization.codecs.OpcUaBinaryDataTypeCodec; import org.eclipse.milo.opcua.stack.core.types.structured.Range; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; public class GenericBsdParserTest extends BsdParserTest { diff --git a/opc-ua-stack/pom.xml b/opc-ua-stack/pom.xml index 14eac55de4..3381914fe8 100644 --- a/opc-ua-stack/pom.xml +++ b/opc-ua-stack/pom.xml @@ -28,7 +28,7 @@ 22.0.0 4.1.108.Final 1.7.32 - 6.9.10 + 5.10.2 diff --git a/opc-ua-stack/stack-core/pom.xml b/opc-ua-stack/stack-core/pom.xml index 9afc65b780..fa8c021973 100644 --- a/opc-ua-stack/stack-core/pom.xml +++ b/opc-ua-stack/stack-core/pom.xml @@ -102,9 +102,13 @@ - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-params test diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SequenceHeaderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SequenceHeaderTest.java index a1158eb70b..bdb1109a29 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SequenceHeaderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SequenceHeaderTest.java @@ -10,15 +10,16 @@ package org.eclipse.milo.opcua.stack; -import com.google.common.primitives.UnsignedInteger; import org.eclipse.milo.opcua.stack.core.channel.headers.SequenceHeader; -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; + +import com.google.common.primitives.UnsignedInteger; public class SequenceHeaderTest extends SerializationFixture2 { - @DataProvider(name = "parameters") - public Object[][] getParameters() { + public static Object[][] getParameters() { return new Object[][]{ {0, 0}, {Integer.MAX_VALUE - 1, Integer.MAX_VALUE - 1}, @@ -28,7 +29,9 @@ public Object[][] getParameters() { }; } - @Test(dataProvider = "parameters", description = "SequenceHeader is serializable.") + @ParameterizedTest + @MethodSource("getParameters") + @DisplayName("SequenceHeader is serializable.") public void testSerialization(long sequenceNumber, long requestId) { SequenceHeader header = new SequenceHeader(sequenceNumber, requestId); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SerializationFixture2.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SerializationFixture2.java index f817466d72..2cead5c390 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SerializationFixture2.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SerializationFixture2.java @@ -10,14 +10,14 @@ package org.eclipse.milo.opcua.stack; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.function.BiFunction; import java.util.function.Function; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import static org.testng.Assert.assertEquals; - public class SerializationFixture2 { protected void assertSerializable(T encoded, diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SymmetricSecurityHeaderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SymmetricSecurityHeaderTest.java index 66968f5371..810d8aac1c 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SymmetricSecurityHeaderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/SymmetricSecurityHeaderTest.java @@ -10,15 +10,16 @@ package org.eclipse.milo.opcua.stack; -import com.google.common.primitives.UnsignedInteger; import org.eclipse.milo.opcua.stack.core.channel.headers.SymmetricSecurityHeader; -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; + +import com.google.common.primitives.UnsignedInteger; public class SymmetricSecurityHeaderTest extends SerializationFixture2 { - @DataProvider(name = "parameters") - public Object[][] getParameters() { + public static Object[][] getParameters() { return new Object[][]{ {0}, {Integer.MAX_VALUE - 1}, @@ -28,7 +29,9 @@ public Object[][] getParameters() { }; } - @Test(dataProvider = "parameters", description = "SymmetricSecurityHeader is serializable.") + @ParameterizedTest + @MethodSource("getParameters") + @DisplayName("SymmetricSecurityHeader is serializable.") public void testSerialization(long value) { SymmetricSecurityHeader header = new SymmetricSecurityHeader(value); 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 index 2bbc3960ff..517c65eb5d 100644 --- 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,13 +10,14 @@ 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.List; -import com.google.common.collect.Lists; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; +import com.google.common.collect.Lists; public class AttributeIdTest { 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 index d7fc05cab6..b04f15a347 100644 --- 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 @@ -10,12 +10,12 @@ package org.eclipse.milo.opcua.stack.core.channel; -import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.stack.core.channel.ChunkDecoder.LegacySequenceNumberValidator.validateSequenceNumber; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; +import org.junit.jupiter.api.Test; public class ChunkDecoderTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/messages/HelloMessageTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/messages/HelloMessageTest.java index e7b14169f9..d6e674d939 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/messages/HelloMessageTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/channel/messages/HelloMessageTest.java @@ -10,13 +10,14 @@ package org.eclipse.milo.opcua.stack.core.channel.messages; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.eclipse.milo.opcua.stack.core.UaException; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertThrows; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; public class HelloMessageTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultCertificateManagerTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultCertificateManagerTest.java index 7d6fafb3f0..709905cad3 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultCertificateManagerTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultCertificateManagerTest.java @@ -10,23 +10,23 @@ package org.eclipse.milo.opcua.stack.core.security; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.security.KeyPair; import java.security.cert.X509Certificate; -import org.testng.annotations.Test; - -import static org.testng.Assert.expectThrows; +import org.junit.jupiter.api.Test; public class DefaultCertificateManagerTest { @Test public void testNullPrivateKeyOrCertificateFails() { - expectThrows( - Exception.class, + assertThrows( + Exception.class, () -> new DefaultCertificateManager((KeyPair) null, (X509Certificate) null) ); - expectThrows( + assertThrows( Exception.class, () -> new DefaultCertificateManager().add(null, (X509Certificate) null) ); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultTrustListManagerTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultTrustListManagerTest.java index 46b55bbb9b..d11e4cab35 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultTrustListManagerTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/security/DefaultTrustListManagerTest.java @@ -10,16 +10,16 @@ package org.eclipse.milo.opcua.stack.core.security; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.io.File; import java.io.IOException; import java.nio.file.Files; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; public class DefaultTrustListManagerTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaBinaryStreamDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaBinaryStreamDecoderTest.java index 00780512b6..45901c7287 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaBinaryStreamDecoderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaBinaryStreamDecoderTest.java @@ -10,12 +10,13 @@ package org.eclipse.milo.opcua.stack.core.serialization; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.eclipse.milo.opcua.stack.core.UaSerializationException; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertThrows; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; public class OpcUaBinaryStreamDecoderTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaXmlStreamDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaXmlStreamDecoderTest.java index 6a472181a3..2eb3c37a79 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaXmlStreamDecoderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/OpcUaXmlStreamDecoderTest.java @@ -10,11 +10,11 @@ package org.eclipse.milo.opcua.stack.core.serialization; -import java.io.StringReader; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.testng.annotations.Test; +import java.io.StringReader; -import static org.testng.Assert.assertNotNull; +import org.junit.jupiter.api.Test; public class OpcUaXmlStreamDecoderTest { @Test diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinaryDecoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinaryDecoderTest.java index 3a8901ae75..eedfa68974 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinaryDecoderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinaryDecoderTest.java @@ -10,6 +10,11 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.eclipse.milo.opcua.stack.core.Identifiers; import org.eclipse.milo.opcua.stack.core.NamespaceTable; import org.eclipse.milo.opcua.stack.core.serialization.TestSerializationContext; @@ -19,15 +24,13 @@ 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 static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; 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", @@ -71,7 +74,7 @@ public void testEnumArray() { writer.writeEnumArray(null, array); ApplicationType[] decoded = (ApplicationType[]) reader.readEnumArray(null, ApplicationType.class); - assertEquals(decoded, array); + assertArrayEquals(decoded, array); } } diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinarySerializationFixture.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinarySerializationFixture.java index 0446f863da..2db2e4a218 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinarySerializationFixture.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/BinarySerializationFixture.java @@ -15,7 +15,7 @@ import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamDecoder; import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamEncoder; import org.eclipse.milo.opcua.stack.core.serialization.TestSerializationContext; -import org.testng.annotations.BeforeMethod; +import org.junit.jupiter.api.BeforeEach; public abstract class BinarySerializationFixture { @@ -23,7 +23,7 @@ public abstract class BinarySerializationFixture { OpcUaBinaryStreamEncoder writer; OpcUaBinaryStreamDecoder 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/serialization/binary/DataValueSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DataValueSerializationTest.java index bb915895d2..dd33c0dd70 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DataValueSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DataValueSerializationTest.java @@ -10,7 +10,9 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import io.netty.buffer.ByteBuf; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamDecoder; import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamEncoder; import org.eclipse.milo.opcua.stack.core.serialization.TestSerializationContext; @@ -19,18 +21,18 @@ 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.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort; -import static org.testng.Assert.assertEquals; +import io.netty.buffer.ByteBuf; public class DataValueSerializationTest { private final OpcUaBinaryStreamEncoder encoder = new OpcUaBinaryStreamEncoder(new TestSerializationContext()); private final OpcUaBinaryStreamDecoder decoder = new OpcUaBinaryStreamDecoder(new TestSerializationContext()); - @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/serialization/binary/DiagnosticInfoSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DiagnosticInfoSerializationTest.java index 62242bc52d..11abc6453e 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DiagnosticInfoSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/DiagnosticInfoSerializationTest.java @@ -10,17 +10,16 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; +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 static org.testng.Assert.assertEquals; +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)}, @@ -34,7 +33,8 @@ public Object[][] getDiagnosticInfos() { }; } - @Test(dataProvider = "DiagnosticInfoProvider") + @ParameterizedTest + @MethodSource("getDiagnosticInfos") public void testDiagnosticInfoRoundTrip(DiagnosticInfo diagnosticInfo) { writer.writeDiagnosticInfo(diagnosticInfo); DiagnosticInfo decoded = reader.readDiagnosticInfo(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExpandedNodeIdSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExpandedNodeIdSerializationTest.java index c1b34e1afd..45b86fed77 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExpandedNodeIdSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExpandedNodeIdSerializationTest.java @@ -15,17 +15,17 @@ 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; 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; 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")}, @@ -42,7 +42,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.writeExpandedNodeId(nodeId); ExpandedNodeId decoded = reader.readExpandedNodeId(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExtensionObjectSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExtensionObjectSerializationTest.java index 92c5c9b142..059f31e4f7 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExtensionObjectSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/ExtensionObjectSerializationTest.java @@ -10,26 +10,28 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; +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 static org.testng.Assert.assertEquals; +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("hello"), 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.writeExtensionObject(xo); ExtensionObject decoded = reader.readExtensionObject(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/GuidSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/GuidSerializationTest.java index 52909d88e2..77f63b8226 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/GuidSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/GuidSerializationTest.java @@ -10,17 +10,17 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import java.util.UUID; -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; 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")}, @@ -30,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.writeGuid(uuid); UUID decoded = reader.readGuid(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/LocalizedTextSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/LocalizedTextSerializationTest.java index 3ecc7b626c..4c668bc892 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/LocalizedTextSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/LocalizedTextSerializationTest.java @@ -10,16 +10,16 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.testng.Assert.assertEquals; +import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; +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,7 +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.writeLocalizedText(localizedText); LocalizedText decoded = reader.readLocalizedText(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/NodeIdSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/NodeIdSerializationTest.java index e5ea145114..450f47c5cf 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/NodeIdSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/NodeIdSerializationTest.java @@ -10,19 +10,19 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; +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 static org.testng.Assert.assertEquals; +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)}, @@ -46,7 +46,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.writeNodeId(nodeId); NodeId decoded = reader.readNodeId(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/OpcUaBinaryStreamEncoderTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/OpcUaBinaryStreamEncoderTest.java index da7b21ea7a..205996b383 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/OpcUaBinaryStreamEncoderTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/OpcUaBinaryStreamEncoderTest.java @@ -10,21 +10,22 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamEncoder; import org.eclipse.milo.opcua.stack.core.serialization.TestSerializationContext; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; public class OpcUaBinaryStreamEncoderTest { ByteBuf buffer; OpcUaBinaryStreamEncoder writer; - @BeforeTest + @BeforeAll public void initializeTest() { buffer = Unpooled.buffer(); writer = new OpcUaBinaryStreamEncoder(new TestSerializationContext()).setBuffer(buffer); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/StringSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/StringSerializationTest.java index b30347f229..9a03523947 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/StringSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/StringSerializationTest.java @@ -10,15 +10,14 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class StringSerializationTest extends BinarySerializationFixture { - @DataProvider(name = "StringProvider") - public Object[][] getStrings() { + public static Object[][] getStrings() { return new Object[][]{ {null}, {""}, @@ -27,7 +26,8 @@ public Object[][] getStrings() { }; } - @Test(dataProvider = "StringProvider") + @ParameterizedTest + @MethodSource("getStrings") public void testStringRoundTrip(String value) { writer.writeString(value); String decoded = reader.readString(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/VariantSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/VariantSerializationTest.java index c72c906e95..cdfc8557dd 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/VariantSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/VariantSerializationTest.java @@ -10,8 +10,11 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.eclipse.milo.opcua.stack.core.BuiltinDataType; import org.eclipse.milo.opcua.stack.core.serialization.OpcUaBinaryStreamDecoder; import org.eclipse.milo.opcua.stack.core.serialization.TestSerializationContext; @@ -19,19 +22,17 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.Variant; import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; import org.eclipse.milo.opcua.stack.core.types.structured.ServiceCounterDataType; -import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; public class VariantSerializationTest extends BinarySerializationFixture { - @DataProvider(name = "VariantProvider") - public Object[][] getVariants() { + public static Object[][] getVariants() { return new Object[][]{ {new Variant(null)}, {new Variant("hello, world")}, @@ -46,7 +47,8 @@ public Object[][] getVariants() { }; } - @Test(dataProvider = "VariantProvider") + @ParameterizedTest + @MethodSource("getVariants") public void testVariantRoundTrip(Variant variant) { writer.writeVariant(variant); Variant decoded = reader.readVariant(); @@ -68,12 +70,11 @@ public void testVariant_UaStructure() { ExtensionObject extensionObject = (ExtensionObject) decoded.getValue(); ServiceCounterDataType sc2 = (ServiceCounterDataType) extensionObject.decode(new TestSerializationContext()); - Assert.assertEquals(sc1.getTotalCount(), sc2.getTotalCount()); - Assert.assertEquals(sc1.getErrorCount(), sc2.getErrorCount()); + assertEquals(sc1.getTotalCount(), sc2.getTotalCount()); + assertEquals(sc1.getErrorCount(), sc2.getErrorCount()); } - @DataProvider(name = "PrimitiveArrayVariantProvider") - public Object[][] getPrimitiveArrayVariants() { + public static Object[][] getPrimitiveArrayVariants() { return new Object[][]{ {new Variant(new int[]{0, 1, 2, 3}), new Variant(new Integer[]{0, 1, 2, 3})}, @@ -89,8 +90,9 @@ public Object[][] getPrimitiveArrayVariants() { }; } - @Test(dataProvider = "PrimitiveArrayVariantProvider", - description = "Test that after primitive array types given to variants come out as expected after encoding/decoding.") + @ParameterizedTest + @MethodSource("getPrimitiveArrayVariants") + @DisplayName("Test that after primitive array types given to variants come out as expected after encoding/decoding.") public void testPrimitiveArrayVariantRoundTrip(Variant variant, Variant expected) { writer.writeVariant(variant); Variant decoded = reader.readVariant(); @@ -98,7 +100,8 @@ public void testPrimitiveArrayVariantRoundTrip(Variant variant, Variant expected assertEquals(decoded, expected); } - @Test(description = "Test that a Variant containing a null array encoded with a negative array size to indicate a null value decodes properly.") + @Test + @DisplayName("Test that a Variant containing a null array encoded with a negative array size to indicate a null value decodes properly.") public void testNullArrayEncodedWithNegativeArraySize() { ByteBuf buffer = Unpooled.buffer(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/XmlElementSerializationTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/XmlElementSerializationTest.java index 2e3cafa1ec..39082752c9 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/XmlElementSerializationTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/serialization/binary/XmlElementSerializationTest.java @@ -10,23 +10,25 @@ package org.eclipse.milo.opcua.stack.core.serialization.binary; -import org.eclipse.milo.opcua.stack.core.types.builtin.XmlElement; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.testng.Assert.assertEquals; +import org.eclipse.milo.opcua.stack.core.types.builtin.XmlElement; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class XmlElementSerializationTest extends BinarySerializationFixture { - @DataProvider(name = "XmlElementProvider") - public Object[][] getXmlElements() { + public static Object[][] getXmlElements() { return new Object[][]{ {new XmlElement(null)}, {new XmlElement("hello, world")}, }; } - @Test(dataProvider = "XmlElementProvider", description = "XmlElement is round-trip serializable.") + @ParameterizedTest + @MethodSource("getXmlElements") + @DisplayName("XmlElement is round-trip serializable.") public void testXmlElementRoundTrip(XmlElement element) throws Exception { writer.writeXmlElement(element); XmlElement decoded = reader.readXmlElement(); diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ByteStringTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ByteStringTest.java index d7029a5ea8..5ec141b7c4 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ByteStringTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ByteStringTest.java @@ -10,10 +10,10 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; +import org.junit.jupiter.api.Test; public class ByteStringTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/DateTimeTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/DateTimeTest.java index 795ad90d1f..a745bcad39 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/DateTimeTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/DateTimeTest.java @@ -13,15 +13,15 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.time.Instant; import java.time.LocalDateTime; import java.time.Month; import java.time.ZoneId; import java.time.ZonedDateTime; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class DateTimeTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ExpandedNodeIdTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ExpandedNodeIdTest.java index d9171f4ee8..d70dfad549 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ExpandedNodeIdTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/ExpandedNodeIdTest.java @@ -10,19 +10,19 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; +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.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.UUID; import org.eclipse.milo.opcua.stack.core.NamespaceTable; import org.eclipse.milo.opcua.stack.core.util.Namespaces; -import org.testng.annotations.Test; - -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.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class ExpandedNodeIdTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/NodeIdTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/NodeIdTest.java index a4004484e6..f19b71de72 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/NodeIdTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/NodeIdTest.java @@ -10,8 +10,18 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; +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.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Random; import java.util.UUID; + import javax.xml.bind.DatatypeConverter; import org.eclipse.milo.opcua.stack.core.NamespaceTable; @@ -20,16 +30,7 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort; import org.eclipse.milo.opcua.stack.core.util.Namespaces; -import org.testng.annotations.Test; - -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.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class NodeIdTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/QualifiedNameTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/QualifiedNameTest.java index 43da238749..a4cac5f800 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/QualifiedNameTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/QualifiedNameTest.java @@ -10,8 +10,9 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; -import org.testng.Assert; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; public class QualifiedNameTest { @@ -27,7 +28,7 @@ public void testToStringAndBack2() { private void assertSymmetry(String string) { String reString = QualifiedName.parse(string).toParseableString(); - Assert.assertEquals(reString, string); + assertEquals(reString, string); } } diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/VariantTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/VariantTest.java index 5229f3fd5a..25cce87cd8 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/VariantTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/builtin/VariantTest.java @@ -10,7 +10,9 @@ package org.eclipse.milo.opcua.stack.core.types.builtin; -import org.testng.annotations.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; public class VariantTest { @@ -24,14 +26,14 @@ public void variantCanContainVariantArray() { new Variant(new Variant[]{new Variant(0), new Variant(1), new Variant(2)}); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test public void variantCannotContainVariant() { - new Variant(new Variant(null)); + assertThrows(IllegalArgumentException.class, () -> new Variant(new Variant(null))); } - @Test(expectedExceptions = IllegalArgumentException.class) + @Test public void variantCannotContainDiagnosticInfo() { - new Variant(DiagnosticInfo.NULL_VALUE); + assertThrows(IllegalArgumentException.class, () -> new Variant(DiagnosticInfo.NULL_VALUE)); } } diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescriptionTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescriptionTest.java index 566e8b517e..2d3d2171a9 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescriptionTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescriptionTest.java @@ -10,11 +10,12 @@ package org.eclipse.milo.opcua.stack.core.types.structured; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText; import org.eclipse.milo.opcua.stack.core.types.enumerated.ApplicationType; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; public class ApplicationDescriptionTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ArrayUtilTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ArrayUtilTest.java index 1eed69a82b..f24156cd21 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ArrayUtilTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ArrayUtilTest.java @@ -10,17 +10,17 @@ package org.eclipse.milo.opcua.stack.core.util; -import java.lang.reflect.Array; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import java.lang.reflect.Array; -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class ArrayUtilTest { - @DataProvider(name = "arrays") - public Object[][] getArrays() { + public static Object[][] getArrays() { return new Object[][]{ {new Integer[]{0, 1, 2, 3, 4, 5, 6, 7}}, {new int[]{0, 1, 2, 3, 4, 5, 6, 7}}, @@ -29,15 +29,20 @@ public Object[][] getArrays() { }; } - @Test(dataProvider = "arrays") + @ParameterizedTest + @MethodSource("getArrays") public void testRoundTrip(Object array) throws Exception { Object flattened = ArrayUtil.flatten(array); Object unflattened = ArrayUtil.unflatten(flattened, ArrayUtil.getDimensions(array)); - - assertEquals(unflattened, array); + if (array instanceof Object[]) { + assertArrayEquals((Object[]) unflattened, (Object[]) array); + } else if (array instanceof int[]){ + assertArrayEquals((int[]) unflattened, (int[]) array); + } } - @Test(dataProvider = "arrays") + @ParameterizedTest + @MethodSource("getArrays") public void testFlatten(Object array) throws Exception { Object flattened = ArrayUtil.flatten(array); @@ -46,8 +51,7 @@ public void testFlatten(Object array) throws Exception { } } - @DataProvider(name = "dimensions") - public Object[][] getDimensions() { + public static Object[][] getDimensions() { return new Object[][]{ {new int[0], new int[]{0}}, {new int[1], new int[]{1}}, @@ -58,13 +62,13 @@ public Object[][] getDimensions() { }; } - @Test(dataProvider = "dimensions") + @ParameterizedTest + @MethodSource("getDimensions") public void testGetDimensions(Object array, int[] dimensions) throws Exception { - assertEquals(ArrayUtil.getDimensions(array), dimensions); + assertArrayEquals(ArrayUtil.getDimensions(array), dimensions); } - @DataProvider(name = "typedArrays") - public Object[][] getTypedArrays() { + public static Object[][] getTypedArrays() { return new Object[][]{ {new int[1], int.class}, {new int[2][2], int.class}, @@ -78,7 +82,8 @@ public Object[][] getTypedArrays() { }; } - @Test(dataProvider = "typedArrays") + @ParameterizedTest + @MethodSource("getTypedArrays") public void testGetType(Object array, Class type) throws Exception { assertEquals(ArrayUtil.getType(array), type); } 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 index 4b31b248ef..7a20cf3e6d 100644 --- 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 @@ -15,11 +15,11 @@ import java.util.List; import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; import static com.google.common.collect.Lists.newArrayList; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class CertificateUtilTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/EndpointUtilTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/EndpointUtilTest.java index 7def65528c..6d94330e0f 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/EndpointUtilTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/EndpointUtilTest.java @@ -10,10 +10,10 @@ package org.eclipse.milo.opcua.stack.core.util; -import org.testng.annotations.Test; - import static org.eclipse.milo.opcua.stack.core.util.EndpointUtil.updateUrl; -import static org.testng.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; public class EndpointUtilTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ExecutionQueueTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ExecutionQueueTest.java index cf33e04fd0..1ec939a8a4 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ExecutionQueueTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/ExecutionQueueTest.java @@ -10,16 +10,16 @@ package org.eclipse.milo.opcua.stack.core.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; +import org.junit.jupiter.api.Test; public class ExecutionQueueTest { diff --git a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/LazyTest.java b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/LazyTest.java index cce416ba22..a621f1e04e 100644 --- a/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/LazyTest.java +++ b/opc-ua-stack/stack-core/src/test/java/org/eclipse/milo/opcua/stack/core/util/LazyTest.java @@ -10,13 +10,13 @@ package org.eclipse.milo.opcua.stack.core.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import org.junit.jupiter.api.Test; public class LazyTest { 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 index af31c09027..bb8328ba01 100644 --- 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 @@ -10,14 +10,14 @@ package org.eclipse.milo.opcua.stack.core.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.eclipse.milo.opcua.stack.core.UaException; import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.assertTrue; +import org.junit.jupiter.api.Test; public class NonceUtilTest { @@ -52,7 +52,7 @@ public void testNonceGeneration() throws UaException { public void testShortNonceThrows() { ByteString nonce = NonceUtil.generateNonce(NonceUtil.MINIMUM_NONCE_LENGTH - 1); - assertThrows(() -> NonceUtil.validateNonce(nonce)); + assertThrows(Exception.class, () -> NonceUtil.validateNonce(nonce)); } @Test 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 index 60fa026c0b..848d74943d 100644 --- 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 @@ -10,6 +10,18 @@ package org.eclipse.milo.opcua.stack.core.util.validation; +import static com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Sets.newHashSet; +import static java.util.Collections.emptySet; +import static org.eclipse.milo.opcua.stack.core.util.validation.CertificateValidationUtil.buildTrustedCertPath; +import static org.eclipse.milo.opcua.stack.core.util.validation.CertificateValidationUtil.validateTrustedCertPath; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.InputStream; import java.security.KeyStore; import java.security.KeyStoreException; @@ -33,19 +45,8 @@ import org.eclipse.milo.opcua.stack.core.StatusCodes; import org.eclipse.milo.opcua.stack.core.UaException; import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.Test; - -import static com.google.common.collect.Lists.newArrayList; -import static com.google.common.collect.Sets.newHashSet; -import static java.util.Collections.emptySet; -import static org.eclipse.milo.opcua.stack.core.util.validation.CertificateValidationUtil.buildTrustedCertPath; -import static org.eclipse.milo.opcua.stack.core.util.validation.CertificateValidationUtil.validateTrustedCertPath; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.expectThrows; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class CertificateValidationUtilTest { @@ -66,7 +67,7 @@ public class CertificateValidationUtilTest { private X509Certificate leafIntermediateSigned; private X509Certificate uriWithSpaces; - @BeforeSuite + @BeforeAll public void loadKeyStore() throws Exception { keyStore = KeyStore.getInstance("PKCS12"); @@ -99,7 +100,7 @@ public void testBuildTrustedCertPath_LeafSelfSigned() throws Exception { public void testBuildTrustedCertPath_LeafSelfSigned_NotTrusted() { List certificateChain = newArrayList(leafSelfSigned); - expectThrows( + assertThrows( UaException.class, () -> buildTrustedCertPath( certificateChain, @@ -196,7 +197,7 @@ public void testBuildAndValidate_LeafIntermediateSigned_Revoked() { { List certificateChain = newArrayList(leafIntermediateSigned); - UaException e = expectThrows(UaException.class, () -> { + UaException e = assertThrows(UaException.class, () -> { HashSet x509CRLS = newHashSet( generateCrl( caIntermediate, @@ -239,7 +240,7 @@ public void testBuildAndValidate_LeafIntermediateSigned_Revoked() { { List certificateChain = newArrayList(leafIntermediateSigned); - UaException e = expectThrows(UaException.class, () -> { + UaException e = assertThrows(UaException.class, () -> { HashSet x509CRLS = newHashSet( generateCrl( caRoot, @@ -277,7 +278,7 @@ public void testBuildAndValidate_LeafIntermediateSigned_Revoked() { @Test public void testBuildTrustedCertPath_NoTrusted_NoIssuers() { - expectThrows(UaException.class, () -> + assertThrows(UaException.class, () -> buildTrustedCertPath( newArrayList(leafSelfSigned), emptySet(), @@ -285,7 +286,7 @@ public void testBuildTrustedCertPath_NoTrusted_NoIssuers() { ) ); - expectThrows(UaException.class, () -> + assertThrows(UaException.class, () -> buildTrustedCertPath( newArrayList(leafIntermediateSigned), emptySet(), @@ -293,7 +294,7 @@ public void testBuildTrustedCertPath_NoTrusted_NoIssuers() { ) ); - expectThrows(UaException.class, () -> + assertThrows(UaException.class, () -> buildTrustedCertPath( newArrayList(leafIntermediateSigned, caIntermediate), emptySet(), @@ -301,7 +302,7 @@ public void testBuildTrustedCertPath_NoTrusted_NoIssuers() { ) ); - expectThrows(UaException.class, () -> + assertThrows(UaException.class, () -> buildTrustedCertPath( newArrayList(leafIntermediateSigned, caIntermediate, caRoot), emptySet(), @@ -361,7 +362,7 @@ public void testBuildAndValidate_IssuerRevoked() { { List certificateChain = newArrayList(leafIntermediateSigned); - UaException e = expectThrows(UaException.class, () -> { + UaException e = assertThrows(UaException.class, () -> { HashSet x509CRLS = newHashSet( generateCrl( caRoot, diff --git a/opc-ua-stack/stack-tests/pom.xml b/opc-ua-stack/stack-tests/pom.xml index 34fd57761c..5ecc3298a7 100644 --- a/opc-ua-stack/stack-tests/pom.xml +++ b/opc-ua-stack/stack-tests/pom.xml @@ -28,9 +28,13 @@ test - org.testng - testng - ${testng.version} + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-params test diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ChunkSerializationTest.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ChunkSerializationTest.java index 6c6f19edef..3fbee01e25 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ChunkSerializationTest.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ChunkSerializationTest.java @@ -10,12 +10,15 @@ package org.eclipse.milo.opcua.stack; +import static org.eclipse.milo.opcua.stack.core.channel.EncodingLimits.DEFAULT_MAX_CHUNK_SIZE; +import static org.eclipse.milo.opcua.stack.core.channel.EncodingLimits.DEFAULT_MAX_MESSAGE_SIZE; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.security.Security; import java.util.ArrayList; import java.util.List; -import io.netty.buffer.ByteBuf; -import io.netty.util.ReferenceCountUtil; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.eclipse.milo.opcua.stack.client.transport.uasc.ClientSecureChannel; import org.eclipse.milo.opcua.stack.core.channel.ChannelParameters; @@ -31,15 +34,15 @@ import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode; import org.eclipse.milo.opcua.stack.core.util.BufferUtil; import org.eclipse.milo.opcua.stack.core.util.LongSequence; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; -import static org.eclipse.milo.opcua.stack.core.channel.EncodingLimits.DEFAULT_MAX_CHUNK_SIZE; -import static org.eclipse.milo.opcua.stack.core.channel.EncodingLimits.DEFAULT_MAX_MESSAGE_SIZE; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; +import io.netty.buffer.ByteBuf; +import io.netty.util.ReferenceCountUtil; + public class ChunkSerializationTest extends SecureChannelFixture { @@ -95,8 +98,7 @@ public class ChunkSerializationTest extends SecureChannelFixture { ); - @DataProvider - public Object[][] getAsymmetricSecurityParameters() { + public static Object[][] getAsymmetricSecurityParameters() { return new Object[][]{ {SecurityPolicy.None, MessageSecurityMode.None, 128}, {SecurityPolicy.Basic128Rsa15, MessageSecurityMode.Sign, 128}, @@ -251,7 +253,8 @@ public void testSymmetric4096() throws Exception { } - @Test(dataProvider = "getAsymmetricSecurityParameters") + @ParameterizedTest + @MethodSource("getAsymmetricSecurityParameters") public void testAsymmetricMessage(SecurityPolicy securityPolicy, MessageSecurityMode messageSecurity, int messageSize) throws Exception { @@ -324,8 +327,7 @@ public void testAsymmetricMessage(SecurityPolicy securityPolicy, } } - @DataProvider - public Object[][] getSymmetricSecurityParameters() { + public static Object[][] getSymmetricSecurityParameters() { return new Object[][]{ {SecurityPolicy.None, MessageSecurityMode.None}, {SecurityPolicy.Basic128Rsa15, MessageSecurityMode.Sign}, @@ -341,7 +343,8 @@ public Object[][] getSymmetricSecurityParameters() { }; } - @Test(dataProvider = "getSymmetricSecurityParameters") + @ParameterizedTest + @MethodSource("getSymmetricSecurityParameters") public void testSymmetricMessage(SecurityPolicy securityPolicy, MessageSecurityMode messageSecurity) throws Exception { diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientCertificateValidatorIT.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientCertificateValidatorIT.java index 07cf0ee315..3fcb21ce59 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientCertificateValidatorIT.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientCertificateValidatorIT.java @@ -10,6 +10,8 @@ package org.eclipse.milo.opcua.stack; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.security.cert.X509Certificate; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -20,11 +22,9 @@ import org.eclipse.milo.opcua.stack.core.UaException; import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.Test; - -import static org.testng.Assert.assertTrue; public class ClientCertificateValidatorIT extends StackIntegrationTest { diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientServerTest.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientServerTest.java index 104b0c3aa2..a14ac9191a 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientServerTest.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/ClientServerTest.java @@ -10,6 +10,17 @@ package org.eclipse.milo.opcua.stack; +import static com.google.common.collect.Lists.newArrayList; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ubyte; +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.ulong; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort; +import static org.eclipse.milo.opcua.stack.core.util.ConversionUtil.a; +import static org.eclipse.milo.opcua.stack.core.util.ConversionUtil.l; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import java.security.Security; import java.security.cert.X509Certificate; import java.util.Collections; @@ -19,7 +30,6 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import com.beust.jcommander.internal.Lists; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.eclipse.milo.opcua.stack.client.DiscoveryClient; import org.eclipse.milo.opcua.stack.client.UaStackClient; @@ -57,23 +67,15 @@ import org.eclipse.milo.opcua.stack.server.EndpointConfiguration; import org.eclipse.milo.opcua.stack.server.UaStackServer; import org.eclipse.milo.opcua.stack.server.UaStackServerConfig; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; -import static com.google.common.collect.Lists.newArrayList; -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ubyte; -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.ulong; -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ushort; -import static org.eclipse.milo.opcua.stack.core.util.ConversionUtil.a; -import static org.eclipse.milo.opcua.stack.core.util.ConversionUtil.l; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.fail; +import com.google.common.collect.Lists; public class ClientServerTest extends SecurityFixture { @@ -85,8 +87,7 @@ public class ClientServerTest extends SecurityFixture { private static final UInteger DEFAULT_TIMEOUT_HINT = uint(60000); - @DataProvider - public Object[][] getVariants() { + public static Object[][] getVariants() { return new Object[][]{ {new Variant(true)}, {new Variant((byte) 1)}, @@ -122,7 +123,7 @@ public Object[][] getVariants() { private UaStackServer server; - @BeforeSuite + @BeforeEach public void setUpClientServer() throws Exception { super.setUp(); @@ -143,7 +144,7 @@ public void setUpClientServer() throws Exception { .toArray(new EndpointDescription[0]); } - @AfterSuite + @AfterEach public void tearDownClientServer() throws Exception { server.shutdown().get(); } @@ -170,7 +171,8 @@ private void setReadRequestHandler(Variant variant) { }); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_NoSecurity(Variant input) throws Exception { EndpointDescription endpoint = endpoints[0]; @@ -182,7 +184,8 @@ public void testClientServerRoundTrip_TestStack_NoSecurity(Variant input) throws connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic128Rsa15_Sign(Variant input) throws Exception { EndpointDescription endpoint = endpoints[1]; @@ -194,7 +197,8 @@ public void testClientServerRoundTrip_TestStack_Basic128Rsa15_Sign(Variant input connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic256_Sign(Variant input) throws Exception { EndpointDescription endpoint = endpoints[2]; @@ -206,7 +210,8 @@ public void testClientServerRoundTrip_TestStack_Basic256_Sign(Variant input) thr connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic256Sha256_Sign(Variant input) throws Exception { EndpointDescription endpoint = endpoints[3]; @@ -218,7 +223,8 @@ public void testClientServerRoundTrip_TestStack_Basic256Sha256_Sign(Variant inpu connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic128Rsa15_SignAndEncrypt(Variant input) throws Exception { EndpointDescription endpoint = endpoints[4]; @@ -230,7 +236,8 @@ public void testClientServerRoundTrip_TestStack_Basic128Rsa15_SignAndEncrypt(Var connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic256_SignAndEncrypt(Variant input) throws Exception { EndpointDescription endpoint = endpoints[5]; @@ -242,7 +249,8 @@ public void testClientServerRoundTrip_TestStack_Basic256_SignAndEncrypt(Variant connectAndTest(input, client); } - @Test(dataProvider = "getVariants") + @ParameterizedTest + @MethodSource("getVariants") public void testClientServerRoundTrip_TestStack_Basic256Sha256_SignAndEncrypt(Variant input) throws Exception { EndpointDescription endpoint = endpoints[6]; @@ -339,7 +347,7 @@ public void testClientDisconnect() throws Exception { client.disconnect().get(); - assertThrows(() -> client.sendRequest(request).get()); + assertThrows(Exception.class, () -> client.sendRequest(request).get()); } @Test diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/SecurityFixture.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/SecurityFixture.java index e5527e833d..3dd5fec997 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/SecurityFixture.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/SecurityFixture.java @@ -19,7 +19,7 @@ import org.eclipse.milo.opcua.stack.core.security.CertificateManager; import org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator; -import org.testng.annotations.BeforeSuite; +import org.junit.jupiter.api.BeforeEach; public abstract class SecurityFixture { @@ -48,7 +48,7 @@ public abstract class SecurityFixture { protected volatile CertificateManager serverCertificateManager; protected volatile ServerCertificateValidator serverCertificateValidator; - @BeforeSuite + @BeforeEach public void setUp() throws Exception { KeyStore keyStore = KeyStore.getInstance("PKCS12"); diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/StackIntegrationTest.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/StackIntegrationTest.java index dcbe424f49..5eab098e23 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/StackIntegrationTest.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/StackIntegrationTest.java @@ -10,6 +10,9 @@ package org.eclipse.milo.opcua.stack; +import static com.google.common.collect.Lists.newArrayList; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; + import java.security.KeyPair; import java.security.Security; import java.security.cert.X509Certificate; @@ -35,14 +38,11 @@ import org.eclipse.milo.opcua.stack.server.UaStackServer; import org.eclipse.milo.opcua.stack.server.UaStackServerConfig; import org.eclipse.milo.opcua.stack.server.UaStackServerConfigBuilder; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.Test; - -import static com.google.common.collect.Lists.newArrayList; -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; public abstract class StackIntegrationTest extends SecurityFixture { @@ -66,7 +66,7 @@ public abstract class StackIntegrationTest extends SecurityFixture { protected UaStackClient stackClient; protected UaStackServer stackServer; - @BeforeSuite + @BeforeEach public void setUpClientServer() throws Exception { super.setUp(); @@ -173,7 +173,7 @@ public void setUpClientServer() throws Exception { stackClient.connect().get(); } - @AfterSuite + @AfterEach public void tearDownClientServer() throws Exception { stackClient.disconnect().get(); stackServer.shutdown().get(); diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/client/config/UaStackClientConfigTest.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/client/config/UaStackClientConfigTest.java index 9760aa9849..d4d68b6687 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/client/config/UaStackClientConfigTest.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/client/config/UaStackClientConfigTest.java @@ -10,6 +10,9 @@ package org.eclipse.milo.opcua.stack.client.config; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.security.cert.X509Certificate; import java.util.List; import java.util.Optional; @@ -22,10 +25,7 @@ import org.eclipse.milo.opcua.stack.core.types.enumerated.UserTokenType; import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription; import org.eclipse.milo.opcua.stack.core.types.structured.UserTokenPolicy; -import org.testng.annotations.Test; - -import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; -import static org.testng.Assert.assertEquals; +import org.junit.jupiter.api.Test; public class UaStackClientConfigTest extends SecurityFixture { diff --git a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/server/EndpointConfigurationTest.java b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/server/EndpointConfigurationTest.java index 8b56c7b248..4af592abbf 100644 --- a/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/server/EndpointConfigurationTest.java +++ b/opc-ua-stack/stack-tests/src/test/java/org/eclipse/milo/opcua/stack/server/EndpointConfigurationTest.java @@ -10,21 +10,22 @@ package org.eclipse.milo.opcua.stack.server; -import com.google.common.collect.ImmutableList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy; import org.eclipse.milo.opcua.stack.core.transport.TransportProfile; import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode; import org.eclipse.milo.opcua.stack.core.types.structured.UserTokenPolicy; -import org.testng.annotations.Test; +import org.junit.jupiter.api.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.expectThrows; +import com.google.common.collect.ImmutableList; public class EndpointConfigurationTest { @Test public void securityMismatchThrows() { - expectThrows( + assertThrows( IllegalArgumentException.class, () -> // mismatch between securityPolicy and securityMode @@ -34,7 +35,7 @@ public void securityMismatchThrows() { .build() ); - expectThrows( + assertThrows( IllegalArgumentException.class, () -> // mismatch between securityPolicy and securityMode @@ -47,7 +48,7 @@ public void securityMismatchThrows() { @Test public void missingCertificateThrows() { - expectThrows( + assertThrows( IllegalStateException.class, () -> // missing certificate @@ -60,7 +61,7 @@ public void missingCertificateThrows() { @Test public void unsupportedTransportThrows() { - expectThrows( + assertThrows( IllegalArgumentException.class, () -> EndpointConfiguration.newBuilder() @@ -68,7 +69,7 @@ public void unsupportedTransportThrows() { .build() ); - expectThrows( + assertThrows( IllegalArgumentException.class, () -> EndpointConfiguration.newBuilder() @@ -76,7 +77,7 @@ public void unsupportedTransportThrows() { .build() ); - expectThrows( + assertThrows( IllegalArgumentException.class, () -> EndpointConfiguration.newBuilder() @@ -84,7 +85,7 @@ public void unsupportedTransportThrows() { .build() ); - expectThrows( + assertThrows( IllegalArgumentException.class, () -> EndpointConfiguration.newBuilder() diff --git a/pom.xml b/pom.xml index c0eb3f050f..aa324b9293 100644 --- a/pom.xml +++ b/pom.xml @@ -399,6 +399,18 @@ + + + + + org.junit + junit-bom + 5.10.2 + pom + import + + +