You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/09 20:02:02 UTC
[camel] 11/19: [CAMEL-11807] Upgrade camel-jt400 to junit5
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 9ecda82cb4c8fc26f581d774c0254e1cd6ceb99d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jul 9 10:10:36 2020 +0200
[CAMEL-11807] Upgrade camel-jt400 to junit5
---
components/camel-jt400/pom.xml | 6 +++---
.../Jt400ComponentDefaultConnectionPoolTest.java | 17 ++++++++++-------
...00ComponentDefaultSecureConnectionPoolTest.java | 17 ++++++++++-------
.../camel/component/jt400/Jt400ComponentTest.java | 10 +++++++---
.../jt400/Jt400ConfigurationConnectionTest.java | 13 ++++++++-----
.../Jt400ConfigurationSecureConnectionTest.java | 13 ++++++++-----
.../component/jt400/Jt400ConfigurationTest.java | 9 ++++++---
.../jt400/Jt400DataQueueConsumerTest.java | 22 +++++++++++++---------
.../jt400/Jt400DataQueueProducerTest.java | 8 +++++---
.../camel/component/jt400/Jt400EndpointTest.java | 9 ++++++---
.../jt400/Jt400MultipleConsumersRouteTest.java | 4 ++--
.../component/jt400/Jt400PgmEndpointTest.java | 9 ++++++---
.../camel/component/jt400/Jt400PgmRouteTest.java | 8 ++++++--
.../camel/component/jt400/Jt400RouteTest.java | 4 ++--
.../component/jt400/Jt400SecureTestSupport.java | 10 +++++-----
.../component/jt400/Jt400SrvPgmEndpointTest.java | 9 ++++++---
.../camel/component/jt400/Jt400TestSupport.java | 10 +++++-----
17 files changed, 108 insertions(+), 70 deletions(-)
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index cbec712..5a13145 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -53,12 +53,12 @@
<!-- test dependencies -->
<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-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultConnectionPoolTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultConnectionPoolTest.java
index d3aa457..60b78ef 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultConnectionPoolTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultConnectionPoolTest.java
@@ -17,16 +17,19 @@
package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400ConnectionPool;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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.fail;
public class Jt400ComponentDefaultConnectionPoolTest extends Jt400TestSupport {
private Jt400Component component;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
component = new Jt400Component();
@@ -35,14 +38,14 @@ public class Jt400ComponentDefaultConnectionPoolTest extends Jt400TestSupport {
// Use an invalid object type so that endpoints are never created
// and actual connections are never requested
component.createEndpoint("jt400://user:password@host/qsys.lib/library.lib/program.xxx");
- Assert.fail("Should have thrown exception");
+ fail("Should have thrown exception");
} catch (Exception e) {
/* Expected */
}
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (component != null) {
component.stop();
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultSecureConnectionPoolTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultSecureConnectionPoolTest.java
index 29acf86..3a0d4a5 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultSecureConnectionPoolTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentDefaultSecureConnectionPoolTest.java
@@ -17,16 +17,19 @@
package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400ConnectionPool;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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.fail;
public class Jt400ComponentDefaultSecureConnectionPoolTest extends Jt400TestSupport {
private Jt400Component component;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
component = new Jt400Component();
@@ -35,14 +38,14 @@ public class Jt400ComponentDefaultSecureConnectionPoolTest extends Jt400TestSupp
// Use an invalid object type so that endpoints are never created
// and actual connections are never requested
component.createEndpoint("jt400://user:password@host/qsys.lib/library.lib/program.xxx?secured=true");
- Assert.fail("Should have thrown exception");
+ fail("Should have thrown exception");
} catch (Exception e) {
/* Expected */
}
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (component != null) {
component.stop();
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java
index d825c5f..84a7db6 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ComponentTest.java
@@ -17,8 +17,12 @@
package org.apache.camel.component.jt400;
import org.apache.camel.Endpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test case for {@link Jt400Component}
@@ -28,7 +32,7 @@ public class Jt400ComponentTest extends Jt400TestSupport {
private Jt400Component component;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationConnectionTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationConnectionTest.java
index ef85a9e..ae21c41 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationConnectionTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationConnectionTest.java
@@ -17,9 +17,12 @@
package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class Jt400ConfigurationConnectionTest extends Jt400TestSupport {
@@ -27,7 +30,7 @@ public class Jt400ConfigurationConnectionTest extends Jt400TestSupport {
private AS400 connection;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -37,7 +40,7 @@ public class Jt400ConfigurationConnectionTest extends Jt400TestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (connection != null) {
jt400Configuration.releaseConnection(connection);
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationSecureConnectionTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationSecureConnectionTest.java
index 989095b..f38945b 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationSecureConnectionTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationSecureConnectionTest.java
@@ -17,9 +17,12 @@
package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class Jt400ConfigurationSecureConnectionTest extends Jt400SecureTestSupport {
@@ -27,7 +30,7 @@ public class Jt400ConfigurationSecureConnectionTest extends Jt400SecureTestSuppo
private AS400 connection;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -38,7 +41,7 @@ public class Jt400ConfigurationSecureConnectionTest extends Jt400SecureTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (connection != null) {
jt400Configuration.releaseConnection(connection);
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationTest.java
index fbf4535..7339c32 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400ConfigurationTest.java
@@ -16,15 +16,18 @@
*/
package org.apache.camel.component.jt400;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class Jt400ConfigurationTest extends Jt400TestSupport {
private Jt400Configuration jt400Configuration;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
jt400Configuration = new Jt400Configuration("jt400://USER:password@host/QSYS.LIB/LIBRARY.LIB/QUEUE.DTAQ", getConnectionPool());
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerTest.java
index 71b41b1..99f1794 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueConsumerTest.java
@@ -18,13 +18,16 @@ package org.apache.camel.component.jt400;
import java.io.InputStream;
import java.util.Properties;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test case for {@link Jt400DataQueueConsumer}.
@@ -35,8 +38,8 @@ import org.junit.Test;
* <code>"org.apache.camel.component.jt400.emptydtaq.uri"</code>).
* </p>
*/
-@Ignore("Test manual")
-public class Jt400DataQueueConsumerTest extends Assert {
+@Disabled("Test manual")
+public class Jt400DataQueueConsumerTest {
/**
* The deviation of the actual timeout value that we permit in our timeout
@@ -66,7 +69,7 @@ public class Jt400DataQueueConsumerTest extends Assert {
*/
private boolean receiveFlag;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Load endpoint URI
InputStream is = getClass().getResourceAsStream("jt400test.properties");
@@ -88,7 +91,8 @@ public class Jt400DataQueueConsumerTest extends Assert {
/**
* Tests whether <code>receive(long)</code> honours the <code>timeout</code> parameter.
*/
- @Test(timeout = TIMEOUT_VALUE + TIMEOUT_TOLERANCE)
+ @Test
+ @Timeout(value = TIMEOUT_VALUE + TIMEOUT_TOLERANCE, unit = TimeUnit.MILLISECONDS)
public void testReceiveLong() {
consumer.receive(TIMEOUT_VALUE);
}
@@ -113,7 +117,7 @@ public class Jt400DataQueueConsumerTest extends Assert {
}
Thread.sleep(50L);
}
- assertTrue("Method receive() has returned from call.", false);
+ fail("Method receive() has returned from call.");
}
}
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueProducerTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueProducerTest.java
index 47a0553..dfe1c90 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueProducerTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueProducerTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.jt400;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class Jt400DataQueueProducerTest extends Jt400TestSupport {
@@ -26,7 +28,7 @@ public class Jt400DataQueueProducerTest extends Jt400TestSupport {
private Jt400DataQueueProducer producer;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
Jt400Endpoint endpoint = resolveMandatoryEndpoint(
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java
index e41b6dc4..0bfdf62 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400EndpointTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.jt400;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case for {@link Jt400Endpoint}
@@ -27,7 +30,7 @@ public class Jt400EndpointTest extends Jt400TestSupport {
private Jt400Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
endpoint = (Jt400Endpoint) resolveMandatoryEndpoint("jt400://user:password@host/qsys.lib/library.lib/queue.dtaq?ccsid=500&format=binary&guiAvailable=true&connectionPool=#mockPool");
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java
index 00d5e5e..5a4f917 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400MultipleConsumersRouteTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.jt400;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 case for routes that contain <code>jt400:</code> endpoints This test
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
index 3e18071..c018c76 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.jt400;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case for {@link Jt400Endpoint}
@@ -32,7 +35,7 @@ public class Jt400PgmEndpointTest extends Jt400TestSupport {
private Jt400Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
endpoint = (Jt400Endpoint) resolveMandatoryEndpoint("jt400://" + USER + ":" + PASSWORD
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java
index 1f98935..52c0bf3 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmRouteTest.java
@@ -21,8 +21,12 @@ import java.util.Arrays;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+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;
/**
* Test case for routes that contain <code>jt400:</code> endpoints This test
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java
index c7fb71b..c58d67d 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400RouteTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.jt400;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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 case for routes that contain <code>jt400:</code> endpoints This test
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java
index d6a30e6..79c90f3 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SecureTestSupport.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400ConnectionPool;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* Useful base class for JT400 secured component unit tests. It creates a mock
@@ -36,14 +36,14 @@ public abstract class Jt400SecureTestSupport extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
connectionPool = new MockAS400SecureConnectionPool();
super.setUp();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (connectionPool != null) {
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java
index fb0f143..6d82b86 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400SrvPgmEndpointTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.jt400;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test case for {@link Jt400Endpoint}
@@ -33,7 +36,7 @@ public class Jt400SrvPgmEndpointTest extends Jt400TestSupport {
private Jt400Endpoint endpoint;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
endpoint = (Jt400Endpoint) resolveMandatoryEndpoint("jt400://" + USER + ":" + PASSWORD
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java
index 640736f..8e6284d 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400TestSupport.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.jt400;
import com.ibm.as400.access.AS400ConnectionPool;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* Useful base class for JT400 component unit tests. It creates a mock
@@ -36,14 +36,14 @@ public abstract class Jt400TestSupport extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
connectionPool = new MockAS400ConnectionPool();
super.setUp();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (connectionPool != null) {