This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ec39b8f4feb859e4793be8c2993839a08013f11
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 14:35:48 2020 +0200
[CAMEL-11807] Upgrade camel-milo to junit5
---
components/camel-milo/pom.xml | 6 +++---
.../camel/component/milo/AbstractMiloServerTest.java | 11 ++++++++---
.../milo/MonitorItemMultiConnectionsCertTest.java | 2 +-
.../milo/MonitorItemMultiConnectionsTest.java | 2 +-
.../apache/camel/component/milo/MonitorItemTest.java | 2 +-
.../apache/camel/component/milo/WriteClientTest.java | 2 +-
.../camel/component/milo/call/CallClientTest.java | 13 +++++++------
.../camel/component/milo/client/NodeIdTest.java | 10 +++++++---
.../camel/component/milo/converter/ConverterTest.java | 19 +++++++++++--------
.../camel/component/milo/server/ServerLocalTest.java | 8 ++++----
.../milo/server/ServerSetCertificateManagerTest.java | 2 +-
.../milo/server/ServerSetSecurityPoliciesTest.java | 4 ++--
12 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index f92d347..71fd896 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -65,12 +65,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
index c2c6989..748b46a 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
@@ -24,10 +24,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
-import org.junit.Assume;
+
+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.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public abstract class AbstractMiloServerTest extends CamelTestSupport {
@@ -35,7 +40,7 @@ public abstract class AbstractMiloServerTest extends
CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
- Assume.assumeTrue("Requires java 9+", isJavaVersionSatisfied(9));
+ assumeTrue(isJavaVersionSatisfied(9), "Requires java 9+");
super.doPreSetup();
this.serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
index 4b65dfb..50a6da7 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
index 116cf98..7e7470e 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing monitoring items over multiple connections
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
index 3b3ba6d..f7ef43a 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing the monitor functionality for item
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
index 9a0942c..7e0c41d 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.server.MiloServerComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.milo.NodeIds.nodeValue;
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
index db70850..574bfd3 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
@@ -40,12 +40,13 @@ 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.UserTokenPolicy;
import org.eclipse.milo.opcua.stack.server.EndpointConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.milo.NodeIds.nodeValue;
import static
org.eclipse.milo.opcua.sdk.server.api.config.OpcUaServerConfig.USER_TOKEN_POLICY_ANONYMOUS;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit tests for calling from the client side
@@ -81,7 +82,7 @@ public class CallClientTest extends AbstractMiloServerTest {
return false;
}
- @Before
+ @BeforeEach
public void start() throws Exception {
final OpcUaServerConfigBuilder cfg = OpcUaServerConfig.builder();
@@ -162,8 +163,8 @@ public class CallClientTest extends AbstractMiloServerTest {
doCall(this.producer1, "bar");
// assert
- Assert.assertNotNull(this.callMethod);
- Assert.assertArrayEquals(new Object[] {"out-foo", "out-bar"},
this.callMethod.getCalls().toArray());
+ assertNotNull(this.callMethod);
+ assertArrayEquals(new Object[] {"out-foo", "out-bar"},
this.callMethod.getCalls().toArray());
}
private static void doCall(final ProducerTemplate producerTemplate, final
Object input) {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
index 2fe15a8..aeeb55b 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
@@ -21,12 +21,15 @@ import java.io.Serializable;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.milo.AbstractMiloServerTest;
import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static com.google.common.net.UrlEscapers.urlFormParameterEscaper;
import static
org.apache.camel.component.milo.server.MiloServerComponent.DEFAULT_NAMESPACE_URI;
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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Testing different ways to specify node IDs
@@ -62,10 +65,11 @@ public class NodeIdTest extends AbstractMiloServerTest {
testUri("milo-client://user:password@localhost:12345?node=RAW(nsu=http://foo.bar;s=foo/bar)",
"http://foo.bar";, "foo/bar");
}
- @Test(expected = ResolveEndpointFailedException.class)
+ @Test
public void testMixed() {
// This must fail since "node" is incomplete
-
testUri("milo-client:tcp://foo:bar@localhost:@@port@@?node=foo&namespaceUri=" +
DEFAULT_NAMESPACE_URI, null, null);
+ assertThrows(ResolveEndpointFailedException.class,
+ () ->
testUri("milo-client:tcp://foo:bar@localhost:@@port@@?node=foo&namespaceUri=" +
DEFAULT_NAMESPACE_URI, null, null));
}
private void testUri(final String uri, final Serializable namespace, final
Serializable partialNodeId) {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
index 7c692c9..03cdbf2 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
@@ -16,27 +16,30 @@
*/
package org.apache.camel.component.milo.converter;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConverterTest extends CamelTestSupport {
@Test
public void testDataValueToVariant() {
final Variant value = testConvertDataValue("Foo", Variant.class);
- Assert.assertNotNull(value);
- Assert.assertEquals("Foo", value.getValue());
+ assertNotNull(value);
+ assertEquals("Foo", value.getValue());
}
@Test
public void testVariantToDataValue() {
final DataValue value = testConvert(new Variant("Foo"),
DataValue.class);
- Assert.assertNotNull(value);
- Assert.assertEquals("Foo", value.getValue().getValue());
- Assert.assertTrue(value.getStatusCode().isGood());
+ assertNotNull(value);
+ assertEquals("Foo", value.getValue().getValue());
+ assertTrue(value.getStatusCode().isGood());
}
private <T> T testConvert(final Object value, final Class<T> clazz) {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
index 7fce094..42738d3 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for milo server component without using an actual connection
@@ -41,7 +41,7 @@ public class ServerLocalTest extends CamelTestSupport {
@EndpointInject(MOCK_TEST)
protected MockEndpoint testEndpoint;
- @Before
+ @BeforeEach
public void pickFreePort() throws IOException {
final MiloServerComponent component =
context().getComponent("milo-server", MiloServerComponent.class);
component.setPort(AvailablePortFinder.getNextAvailable());
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
index cea606d..7a31039 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
@@ -21,7 +21,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.camel.component.milo.AbstractMiloServerTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
index d73f3fa..ccb550d 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.milo.server;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Test setting security policies
