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 febefe7630c1db9400922ca1550372faa118e21a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 25 17:45:00 2020 +0200
[CAMEL-11807] Upgrade camel-hdfs to junit5
---
components/camel-hazelcast/pom.xml | 8 +-
...HazelcastAtomicnumberProducerForSpringTest.java | 13 ++-
.../HazelcastAtomicnumberProducerTest.java | 19 ++--
.../hazelcast/HazelcastCamelSpringTestSupport.java | 6 +-
.../hazelcast/HazelcastCamelTestSupport.java | 8 +-
...stComponentInstanceReferenceNameSpringTest.java | 4 +-
...elcastComponentInstanceReferenceSpringTest.java | 4 +-
.../hazelcast/HazelcastConfigurationTest.java | 115 +++++++++++----------
.../hazelcast/HazelcastErrorMessagesTest.java | 5 +-
.../hazelcast/HazelcastInstanceConsumerTest.java | 4 +-
.../hazelcast/HazelcastListConsumerTest.java | 9 +-
.../hazelcast/HazelcastListProducerTest.java | 18 ++--
.../hazelcast/HazelcastMapConsumerTest.java | 4 +-
.../HazelcastMapProducerForSpringTest.java | 9 +-
.../hazelcast/HazelcastMapProducerTest.java | 22 ++--
.../hazelcast/HazelcastMultimapConsumerTest.java | 4 +-
.../HazelcastMultimapProducerForSpringTest.java | 8 +-
.../hazelcast/HazelcastMultimapProducerTest.java | 19 ++--
.../hazelcast/HazelcastQueueConsumerPollTest.java | 4 +-
.../hazelcast/HazelcastQueueConsumerTest.java | 4 +-
.../hazelcast/HazelcastQueueProducerTest.java | 18 ++--
.../HazelcastReliableTopicConsumerTest.java | 4 +-
.../HazelcastReliableTopicProducerTest.java | 17 +--
.../HazelcastReplicatedmapConsumerTest.java | 4 +-
...azelcastReplicatedmapProducerForSpringTest.java | 8 +-
.../HazelcastReplicatedmapProducerTest.java | 19 ++--
.../HazelcastRingbufferProducerForSpringTest.java | 3 +-
.../hazelcast/HazelcastRingbufferProducerTest.java | 3 +-
.../HazelcastSedaConcurrentConsumersTest.java | 4 +-
.../hazelcast/HazelcastSedaConfigurationTest.java | 50 +++++----
.../component/hazelcast/HazelcastSedaFIFOTest.java | 4 +-
.../hazelcast/HazelcastSedaInOnlyTest.java | 4 +-
.../hazelcast/HazelcastSedaInOutTest.java | 4 +-
...tSedaRecoverableConsumerNewTransactionTest.java | 5 +-
...zelcastSedaRecoverableConsumerRollbackTest.java | 6 +-
.../HazelcastSedaRecoverableConsumerTest.java | 6 +-
.../hazelcast/HazelcastSedaSpringSupportTest.java | 4 +-
.../HazelcastSedaTransferExchangeTest.java | 12 ++-
.../hazelcast/HazelcastSetConsumerTest.java | 9 +-
.../hazelcast/HazelcastSetProducerTest.java | 17 +--
.../hazelcast/HazelcastTopicConsumerTest.java | 4 +-
.../hazelcast/HazelcastTopicProducerTest.java | 17 +--
...lcastAggregationRepositoryCamelTestSupport.java | 10 +-
...lcastAggregationRepositoryConstructorsTest.java | 22 ++--
...zelcastAggregationRepositoryOperationsTest.java | 29 +++---
...AggregationRepositoryRecoverableRoutesTest.java | 2 +-
.../HazelcastAggregationRepositoryRoutesTest.java | 2 +-
.../HazelcastIdempotentRepositoryTest.java | 18 ++--
components/camel-hdfs/pom.xml | 13 ++-
.../camel/component/hdfs/FromFileToHdfsTest.java | 40 +++----
.../component/hdfs/HaConfigurationBuilderTest.java | 4 +-
.../camel/component/hdfs/HdfsConsumerTest.java | 8 +-
.../camel/component/hdfs/HdfsInputStreamTest.java | 8 +-
.../camel/component/hdfs/HdfsOutputStreamTest.java | 8 +-
.../component/hdfs/HdfsProducerConsumerTest.java | 24 ++---
.../component/hdfs/HdfsProducerSplitTest.java | 30 ++----
.../camel/component/hdfs/HdfsProducerTest.java | 65 ++----------
.../camel/component/hdfs/HdfsTestSupport.java | 34 +++---
.../component/hdfs/integration/HdfsAppendTest.java | 18 ++--
.../integration/HdfsConsumerIntegrationTest.java | 81 ++-------------
.../HdfsProducerConsumerIntegrationTest.java | 13 +--
.../hdfs/kerberos/KerberosAuthenticationTest.java | 8 +-
.../kerberos/KerberosConfigurationBuilderTest.java | 6 +-
63 files changed, 476 insertions(+), 476 deletions(-)
diff --git a/components/camel-hazelcast/pom.xml
b/components/camel-hazelcast/pom.xml
index f2f7af5..4f75aeb 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -60,18 +60,18 @@
<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>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
index 661d379..fb031ad 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerForSpringTest.java
@@ -22,13 +22,18 @@ import java.util.Map;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.cp.CPSubsystem;
import com.hazelcast.cp.IAtomicLong;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastAtomicnumberProducerForSpringTest extends
HazelcastCamelSpringTestSupport {
@@ -50,7 +55,7 @@ public class HazelcastAtomicnumberProducerForSpringTest
extends HazelcastCamelSp
verify(cpSubsystem, atLeastOnce()).getAtomicLong("foo");
}
- @After
+ @AfterEach
public void verifyAtomicNumberMock() {
verifyNoMoreInteractions(atomicNumber);
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
index f902949..cc86ece 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastAtomicnumberProducerTest.java
@@ -24,11 +24,17 @@ import com.hazelcast.cp.CPSubsystem;
import com.hazelcast.cp.IAtomicLong;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastAtomicnumberProducerTest extends
HazelcastCamelTestSupport {
@@ -50,14 +56,15 @@ public class HazelcastAtomicnumberProducerTest extends
HazelcastCamelTestSupport
verify(cpSubsystem, atLeastOnce()).getAtomicLong("foo");
}
- @After
+ @AfterEach
public void verifyAtomicNumberMock() {
verifyNoMoreInteractions(atomicNumber);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperationName() {
- template.sendBody("direct:setInvalid", 4711);
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:setInvalid", 4711));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java
index 701c8be..b44098e 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelSpringTestSupport.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.After;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -47,7 +47,7 @@ public abstract class HazelcastCamelSpringTestSupport extends
CamelSpringTestSup
}
- @After
+ @AfterEach
public final void verifyHazelcastInstanceMock() {
verifyHazelcastInstance(hazelcastInstance);
verifyNoMoreInteractions(hazelcastInstance);
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
index 92fb0b6..cb5b67c 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
public class HazelcastCamelTestSupport extends CamelTestSupport {
@@ -47,7 +47,7 @@ public class HazelcastCamelTestSupport extends
CamelTestSupport {
}
- @After
+ @AfterEach
public final void verifyHazelcastInstanceMock() {
verifyHazelcastInstance(hazelcastInstance);
verifyNoMoreInteractions(hazelcastInstance);
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceNameSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceNameSpringTest.java
index 66da51c..b54b7e1 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceNameSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceNameSpringTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.component.hazelcast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class HazelcastComponentInstanceReferenceNameSpringTest extends
HazelcastCamelSpringTestSupport {
private static final String TEST_VALUE = "TestValue";
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceSpringTest.java
index cceaf70..dcedcd7 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastComponentInstanceReferenceSpringTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.component.hazelcast;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class HazelcastComponentInstanceReferenceSpringTest extends
HazelcastCamelSpringTestSupport {
private static final String TEST_VALUE = "TestValue";
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java
index 0be5c09..28674bb 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java
@@ -26,12 +26,17 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.hazelcast.map.HazelcastMapComponent;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+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;
public class HazelcastConfigurationTest {
- @After
+ @AfterEach
public void tearDown() throws Exception {
Hazelcast.shutdownAll();
}
@@ -57,20 +62,20 @@ public class HazelcastConfigurationTest {
HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context,
"hazelcast-map:my-cache-1?hazelcastInstanceName=" + instanceName);
HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context,
"hazelcast-map:my-cache-2?hazelcastInstanceName=" + instanceName);
- Assert.assertNotNull(endpoint1.getHazelcastInstance());
- Assert.assertNotNull(endpoint2.getHazelcastInstance());
- Assert.assertTrue(endpoint1.getHazelcastInstance() ==
endpoint2.getHazelcastInstance());
+ assertNotNull(endpoint1.getHazelcastInstance());
+ assertNotNull(endpoint2.getHazelcastInstance());
+ assertTrue(endpoint1.getHazelcastInstance() ==
endpoint2.getHazelcastInstance());
HazelcastMapComponent component =
context.getComponent("hazelcast-map", HazelcastMapComponent.class);
- Assert.assertNull(component.getHazelcastInstance());
+ assertNull(component.getHazelcastInstance());
for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1,
endpoint2)) {
HazelcastInstance hz = endpoint.getHazelcastInstance();
- Assert.assertEquals(instanceName, hz.getName());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
-
Assert.assertTrue(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
- Assert.assertEquals(6789,
hz.getConfig().getNetworkConfig().getPort());
+ assertEquals(instanceName, hz.getName());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
+
assertTrue(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
+ assertEquals(6789,
hz.getConfig().getNetworkConfig().getPort());
}
} finally {
if (context != null) {
@@ -90,19 +95,19 @@ public class HazelcastConfigurationTest {
HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context,
"hazelcast-map:my-cache-1");
HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context,
"hazelcast-map:my-cache-2");
- Assert.assertNotNull(endpoint1.getHazelcastInstance());
- Assert.assertNotNull(endpoint2.getHazelcastInstance());
- Assert.assertTrue(endpoint1.getHazelcastInstance() !=
endpoint2.getHazelcastInstance());
+ assertNotNull(endpoint1.getHazelcastInstance());
+ assertNotNull(endpoint2.getHazelcastInstance());
+ assertTrue(endpoint1.getHazelcastInstance() !=
endpoint2.getHazelcastInstance());
HazelcastMapComponent component =
context.getComponent("hazelcast-map", HazelcastMapComponent.class);
- Assert.assertNull(component.getHazelcastInstance());
+ assertNull(component.getHazelcastInstance());
for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1,
endpoint2)) {
HazelcastInstance hz = endpoint.getHazelcastInstance();
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
-
Assert.assertTrue(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
- Assert.assertEquals(5701,
hz.getConfig().getNetworkConfig().getPort());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
+
assertTrue(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
+ assertEquals(5701,
hz.getConfig().getNetworkConfig().getPort());
}
} finally {
if (context != null) {
@@ -122,18 +127,18 @@ public class HazelcastConfigurationTest {
HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context,
"hazelcast-map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-named.xml");
HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context,
"hazelcast-map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-named.xml");
- Assert.assertNotNull(endpoint1.getHazelcastInstance());
- Assert.assertNotNull(endpoint2.getHazelcastInstance());
- Assert.assertTrue(endpoint1.getHazelcastInstance() ==
endpoint2.getHazelcastInstance());
+ assertNotNull(endpoint1.getHazelcastInstance());
+ assertNotNull(endpoint2.getHazelcastInstance());
+ assertTrue(endpoint1.getHazelcastInstance() ==
endpoint2.getHazelcastInstance());
HazelcastMapComponent component =
context.getComponent("hazelcast-map", HazelcastMapComponent.class);
- Assert.assertNull(component.getHazelcastInstance());
+ assertNull(component.getHazelcastInstance());
HazelcastInstance hz = endpoint1.getHazelcastInstance();
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
- Assert.assertEquals(9876,
hz.getConfig().getNetworkConfig().getPort());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
+ assertEquals(9876, hz.getConfig().getNetworkConfig().getPort());
} finally {
if (context != null) {
@@ -153,19 +158,19 @@ public class HazelcastConfigurationTest {
HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context,
"hazelcast-map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-custom.xml");
HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context,
"hazelcast-map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-custom.xml");
- Assert.assertNotNull(endpoint1.getHazelcastInstance());
- Assert.assertNotNull(endpoint2.getHazelcastInstance());
- Assert.assertTrue(endpoint1.getHazelcastInstance() !=
endpoint2.getHazelcastInstance());
+ assertNotNull(endpoint1.getHazelcastInstance());
+ assertNotNull(endpoint2.getHazelcastInstance());
+ assertTrue(endpoint1.getHazelcastInstance() !=
endpoint2.getHazelcastInstance());
HazelcastMapComponent component =
context.getComponent("hazelcast-map", HazelcastMapComponent.class);
- Assert.assertNull(component.getHazelcastInstance());
+ assertNull(component.getHazelcastInstance());
for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1,
endpoint2)) {
HazelcastInstance hz = endpoint.getHazelcastInstance();
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
- Assert.assertEquals(9876,
hz.getConfig().getNetworkConfig().getPort());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
+ assertEquals(9876,
hz.getConfig().getNetworkConfig().getPort());
}
} finally {
@@ -194,16 +199,16 @@ public class HazelcastConfigurationTest {
context.getEndpoint("hazelcast-map:my-cache?hazelcastConfig=#my-config");
HazelcastDefaultEndpoint endpoint = getHzEndpoint(context,
"hazelcast-map:my-cache?hazelcastConfig=#my-config");
- Assert.assertNotNull(endpoint.getHazelcastInstance());
+ assertNotNull(endpoint.getHazelcastInstance());
HazelcastMapComponent component =
context.getComponent("hazelcast-map", HazelcastMapComponent.class);
- Assert.assertNull(component.getHazelcastInstance());
+ assertNull(component.getHazelcastInstance());
HazelcastInstance hz = endpoint.getHazelcastInstance();
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
-
Assert.assertTrue(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
-
Assert.assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
- Assert.assertEquals(6789,
hz.getConfig().getNetworkConfig().getPort());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getAwsConfig().isEnabled());
+
assertTrue(hz.getConfig().getNetworkConfig().getJoin().getMulticastConfig().isEnabled());
+
assertFalse(hz.getConfig().getNetworkConfig().getJoin().getTcpIpConfig().isEnabled());
+ assertEquals(6789, hz.getConfig().getNetworkConfig().getPort());
} finally {
if (context != null) {
@@ -267,24 +272,24 @@ public class HazelcastConfigurationTest {
HazelcastDefaultEndpoint endpoint3 = getHzEndpoint(context,
"hazelcast-map:my-cache-2?hazelcastInstance=#" +
sharedConfig.getInstanceName());
HazelcastDefaultEndpoint endpoint4 = getHzEndpoint(context,
"hazelcast-map:my-cache-4");
- Assert.assertNotNull(endpoint1.getHazelcastInstance());
- Assert.assertNotNull(endpoint2.getHazelcastInstance());
- Assert.assertNotNull(endpoint3.getHazelcastInstance());
- Assert.assertNotNull(endpoint4.getHazelcastInstance());
+ assertNotNull(endpoint1.getHazelcastInstance());
+ assertNotNull(endpoint2.getHazelcastInstance());
+ assertNotNull(endpoint3.getHazelcastInstance());
+ assertNotNull(endpoint4.getHazelcastInstance());
- Assert.assertEquals(4,
Hazelcast.getAllHazelcastInstances().size());
+ assertEquals(4, Hazelcast.getAllHazelcastInstances().size());
- Assert.assertTrue(hzNamed == endpoint1.getHazelcastInstance());
-
Assert.assertTrue(Hazelcast.getHazelcastInstanceByName(customConfig.getInstanceName())
== endpoint2.getHazelcastInstance());
- Assert.assertTrue(hzShared == endpoint3.getHazelcastInstance());
- Assert.assertTrue(hzComponent == endpoint4.getHazelcastInstance());
+ assertTrue(hzNamed == endpoint1.getHazelcastInstance());
+
assertTrue(Hazelcast.getHazelcastInstanceByName(customConfig.getInstanceName())
== endpoint2.getHazelcastInstance());
+ assertTrue(hzShared == endpoint3.getHazelcastInstance());
+ assertTrue(hzComponent == endpoint4.getHazelcastInstance());
- Assert.assertNotNull(component.getHazelcastInstance());
- Assert.assertTrue(hzComponent == component.getHazelcastInstance());
+ assertNotNull(component.getHazelcastInstance());
+ assertTrue(hzComponent == component.getHazelcastInstance());
context.stop();
- Assert.assertEquals(3,
Hazelcast.getAllHazelcastInstances().size());
+ assertEquals(3, Hazelcast.getAllHazelcastInstances().size());
} finally {
if (context != null && context.isStarted()) {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java
index ae810b1..19d2bf2 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java
@@ -17,7 +17,10 @@
package org.apache.camel.component.hazelcast;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class HazelcastErrorMessagesTest extends HazelcastCamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
index 729d787..7884466 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java
@@ -30,10 +30,12 @@ import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
index 0b051ac..10bed57 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
@@ -27,12 +27,17 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ItemEventType;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
index 3cdb165..b9c3dbf 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
@@ -23,11 +23,16 @@ import com.hazelcast.collection.IList;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastListProducerTest extends HazelcastCamelTestSupport {
@@ -44,14 +49,15 @@ public class HazelcastListProducerTest extends
HazelcastCamelTestSupport {
verify(hazelcastInstance, atLeastOnce()).getList("bar");
}
- @After
+ @AfterEach
public final void verifyListMock() {
verifyNoMoreInteractions(list);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBody("direct:addInvalid", "bar");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:addInvalid", "bar"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
index e71bb30..fe74908 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
@@ -27,11 +27,13 @@ import com.hazelcast.map.IMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hazelcast.listener.MapEntryListener;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
index 60ff742..7b2e1f2 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
@@ -28,12 +28,15 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
import com.hazelcast.query.impl.predicates.SqlPredicate;
import org.apache.camel.component.hazelcast.testutil.Dummy;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Mockito.atLeastOnce;
@@ -56,7 +59,7 @@ public class HazelcastMapProducerForSpringTest extends
HazelcastCamelSpringTestS
verify(hazelcastInstance, atLeastOnce()).getMap("foo");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
index b524893..8a767ff 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
@@ -31,11 +31,20 @@ import com.hazelcast.query.impl.predicates.SqlPredicate;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hazelcast.testutil.Dummy;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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 static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anySet;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastMapProducerTest extends HazelcastCamelTestSupport
implements Serializable {
@@ -53,14 +62,15 @@ public class HazelcastMapProducerTest extends
HazelcastCamelTestSupport implemen
verify(hazelcastInstance, atLeastOnce()).getMap("foo");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBody("direct:putInvalid", "my-foo");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:putInvalid", "my-foo"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
index bb4bc14..b8ffa6a 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
@@ -27,11 +27,13 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.multimap.MultiMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
index 86936e6..940bdf1 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
@@ -21,12 +21,14 @@ import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.multimap.MultiMap;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -47,7 +49,7 @@ public class HazelcastMultimapProducerForSpringTest extends
HazelcastCamelSpring
verify(hazelcastInstance, atLeastOnce()).getMultiMap("bar");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
index f542564..229fe3a 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
@@ -23,11 +23,17 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.multimap.MultiMap;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+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 static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastMultimapProducerTest extends HazelcastCamelTestSupport {
@@ -44,14 +50,15 @@ public class HazelcastMultimapProducerTest extends
HazelcastCamelTestSupport {
verify(hazelcastInstance, atLeastOnce()).getMultiMap("bar");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBodyAndHeader("direct:putInvalid", "my-foo",
HazelcastConstants.OBJECT_ID, "4711");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBodyAndHeader("direct:putInvalid", "my-foo",
HazelcastConstants.OBJECT_ID, "4711"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
index 64bf5f3..c1632b4 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
@@ -23,9 +23,11 @@ import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
index 73439a2..947197a 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
@@ -27,11 +27,13 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ItemEventType;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
index 37f8d07..27678a9 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
@@ -25,13 +25,16 @@ import java.util.function.Predicate;
import com.hazelcast.collection.IQueue;
import com.hazelcast.core.HazelcastInstance;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastQueueProducerTest extends HazelcastCamelTestSupport {
@@ -48,16 +51,11 @@ public class HazelcastQueueProducerTest extends
HazelcastCamelTestSupport {
verify(hazelcastInstance, atLeastOnce()).getQueue("bar");
}
- @After
+ @AfterEach
public void verifyQueueMock() {
verifyNoMoreInteractions(queue);
}
- @Test(expected = CamelExecutionException.class)
- public void testWithInvalidOperation() {
- template.sendBody("direct:putInvalid", "foo");
- }
-
@Test
public void put() throws InterruptedException {
template.sendBody("direct:put", "foo");
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
index b8eab03..01eadfb 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java
@@ -26,11 +26,13 @@ import com.hazelcast.topic.Message;
import com.hazelcast.topic.MessageListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
index f4ff491..1f61a4d 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java
@@ -20,11 +20,15 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.topic.ITopic;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastReliableTopicProducerTest extends
HazelcastCamelTestSupport {
@@ -41,14 +45,15 @@ public class HazelcastReliableTopicProducerTest extends
HazelcastCamelTestSuppor
verify(hazelcastInstance, atLeastOnce()).getReliableTopic("bar");
}
- @After
+ @AfterEach
public void verifyQueueMock() {
verifyNoMoreInteractions(reliableTopic);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBody("direct:publishInvalid", "foo");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:publishInvalid", "foo"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
index e859a24..9ef9d15 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java
@@ -27,11 +27,13 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java
index 63160c8..cca37a5 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerForSpringTest.java
@@ -21,12 +21,14 @@ import java.util.Collection;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.replicatedmap.ReplicatedMap;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -47,7 +49,7 @@ public class HazelcastReplicatedmapProducerForSpringTest
extends HazelcastCamelS
verify(hazelcastInstance, atLeastOnce()).getReplicatedMap("bar");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java
index 73e1712..46723f6 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java
@@ -23,11 +23,17 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.replicatedmap.ReplicatedMap;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+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 static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastReplicatedmapProducerTest extends
HazelcastCamelTestSupport {
@@ -44,14 +50,15 @@ public class HazelcastReplicatedmapProducerTest extends
HazelcastCamelTestSuppor
verify(hazelcastInstance, atLeastOnce()).getReplicatedMap("bar");
}
- @After
+ @AfterEach
public void verifyMapMock() {
verifyNoMoreInteractions(map);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBodyAndHeader("direct:putInvalid", "my-foo",
HazelcastConstants.OBJECT_ID, "4711");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBodyAndHeader("direct:putInvalid", "my-foo",
HazelcastConstants.OBJECT_ID, "4711"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java
index c32ba7f..c4472a2 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java
@@ -18,12 +18,13 @@ package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.ringbuffer.Ringbuffer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java
index d541d6b..3545266 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java
@@ -19,10 +19,11 @@ package org.apache.camel.component.hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.ringbuffer.Ringbuffer;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java
index a2c9cc2..9140855 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.hazelcast;
import org.apache.camel.EndpointInject;
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 concurrent consumers.
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java
index 659c7b4..23664f9 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java
@@ -19,8 +19,14 @@ package org.apache.camel.component.hazelcast;
import org.apache.camel.PropertyBindingException;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpoint;
-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.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+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 static org.junit.jupiter.api.Assertions.fail;
public class HazelcastSedaConfigurationTest extends CamelTestSupport {
@@ -28,53 +34,53 @@ public class HazelcastSedaConfigurationTest extends
CamelTestSupport {
public void createEndpointWithTransferExchange() throws Exception {
HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo?transferExchange=true");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertTrue("Default value of concurrent consumers is invalid",
hzlqEndpoint.getConfiguration().isTransferExchange());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertTrue(hzlqEndpoint.getConfiguration().isTransferExchange(),
"Default value of concurrent consumers is invalid");
hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo?transferExchange=false");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertFalse("Default value of concurrent consumers is invalid",
hzlqEndpoint.getConfiguration().isTransferExchange());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertFalse(hzlqEndpoint.getConfiguration().isTransferExchange(),
"Default value of concurrent consumers is invalid");
}
@Test
public void createEndpointWithNoParams() throws Exception {
HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertEquals("Default value of concurrent consumers is invalid", 1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers());
- assertEquals("Default value of pool timeout is invalid", 1000,
hzlqEndpoint.getConfiguration().getPollTimeout());
- assertEquals("Default value of on error delay is invalid", 1000,
hzlqEndpoint.getConfiguration().getOnErrorDelay());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertEquals(1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers(), "Default value of
concurrent consumers is invalid");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getPollTimeout(),
"Default value of pool timeout is invalid");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getOnErrorDelay(),
"Default value of on error delay is invalid");
}
@Test
public void createEndpointWithConcurrentConsumersParam() throws Exception {
HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo?concurrentConsumers=4");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertEquals("Value of concurrent consumers is invalid", 4,
hzlqEndpoint.getConfiguration().getConcurrentConsumers());
- assertEquals("Default value of pool timeout is invalid", 1000,
hzlqEndpoint.getConfiguration().getPollTimeout());
- assertEquals("Default value of on error delay is invalid", 1000,
hzlqEndpoint.getConfiguration().getOnErrorDelay());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertEquals(4,
hzlqEndpoint.getConfiguration().getConcurrentConsumers(), "Value of concurrent
consumers is invalid");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getPollTimeout(),
"Default value of pool timeout is invalid");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getOnErrorDelay(),
"Default value of on error delay is invalid");
}
@Test
public void createEndpointWithPoolIntevalParam() throws Exception {
HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo?pollTimeout=4000");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertEquals("Default value of concurrent consumers is invalid", 1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers());
- assertEquals("Invalid pool timeout", 4000,
hzlqEndpoint.getConfiguration().getPollTimeout());
- assertEquals("Default value of on error delay is invalid", 1000,
hzlqEndpoint.getConfiguration().getOnErrorDelay());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertEquals(1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers(), "Default value of
concurrent consumers is invalid");
+ assertEquals(4000, hzlqEndpoint.getConfiguration().getPollTimeout(),
"Invalid pool timeout");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getOnErrorDelay(),
"Default value of on error delay is invalid");
}
@Test
public void createEndpointWithOnErrorDelayParam() throws Exception {
HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint)
context.getEndpoint("hazelcast-seda:foo?onErrorDelay=5000");
- assertEquals("Invalid queue name", "foo",
hzlqEndpoint.getConfiguration().getQueueName());
- assertEquals("Default value of concurrent consumers is invalid", 1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers());
- assertEquals("Default value of pool timeout is invalid", 1000,
hzlqEndpoint.getConfiguration().getPollTimeout());
- assertEquals("Value of on error delay is invalid", 5000,
hzlqEndpoint.getConfiguration().getOnErrorDelay());
+ assertEquals("foo", hzlqEndpoint.getConfiguration().getQueueName(),
"Invalid queue name");
+ assertEquals(1,
hzlqEndpoint.getConfiguration().getConcurrentConsumers(), "Default value of
concurrent consumers is invalid");
+ assertEquals(1000, hzlqEndpoint.getConfiguration().getPollTimeout(),
"Default value of pool timeout is invalid");
+ assertEquals(5000, hzlqEndpoint.getConfiguration().getOnErrorDelay(),
"Value of on error delay is invalid");
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java
index 0bf698e..da83b59 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.camel.EndpointInject;
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 FIFO ordering.
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java
index 9d6c96c..288d7dc 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
public class HazelcastSedaInOnlyTest extends CamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java
index 2d70b6b..4e5eaae 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
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;
public class HazelcastSedaInOutTest extends CamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerNewTransactionTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerNewTransactionTest.java
index 0402fbe..21f8155 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerNewTransactionTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerNewTransactionTest.java
@@ -21,7 +21,10 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.transaction.TransactionContext;
import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class HazelcastSedaRecoverableConsumerNewTransactionTest extends
HazelcastSedaRecoverableConsumerTest {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerRollbackTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerRollbackTest.java
index aeb3c4e..8355a6f 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerRollbackTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerRollbackTest.java
@@ -21,7 +21,11 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.transaction.TransactionContext;
import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class HazelcastSedaRecoverableConsumerRollbackTest extends
HazelcastSedaRecoverableConsumerTest {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
index d87ed13..e7eacd6 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java
@@ -23,8 +23,8 @@ import com.hazelcast.transaction.TransactionalQueue;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -67,7 +67,7 @@ public abstract class HazelcastSedaRecoverableConsumerTest
extends HazelcastCame
};
}
- @After
+ @AfterEach
public final void stopContext() throws Exception {
context.stop();
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java
index a85eef4..35cb8a1 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.hazelcast;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java
index e4026c5..1bb8405 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.EndpointInject;
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.assertThrows;
public class HazelcastSedaTransferExchangeTest extends CamelTestSupport {
@@ -45,7 +47,7 @@ public class HazelcastSedaTransferExchangeTest extends
CamelTestSupport {
mock.reset();
}
- @Test(expected = AssertionError.class)
+ @Test
public void testExchangeTransferDisabled() throws InterruptedException {
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("test");
@@ -56,7 +58,9 @@ public class HazelcastSedaTransferExchangeTest extends
CamelTestSupport {
template.send("direct:foo", exchange);
- assertMockEndpointsSatisfied();
+ assertThrows(AssertionError.class,
+ () -> assertMockEndpointsSatisfied());
+
mock.reset();
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
index ef4e279..15e1e1e 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
@@ -27,12 +27,17 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ItemEventType;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java
index 6401d13..3060867 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java
@@ -23,11 +23,15 @@ import com.hazelcast.collection.ISet;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastSetProducerTest extends HazelcastCamelTestSupport {
@@ -44,14 +48,15 @@ public class HazelcastSetProducerTest extends
HazelcastCamelTestSupport {
verify(hazelcastInstance, atLeastOnce()).getSet("bar");
}
- @After
+ @AfterEach
public final void verifySetMock() {
verifyNoMoreInteractions(set);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBody("direct:addInvalid", "bar");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:addInvalid", "bar"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
index fa67350..8333756 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java
@@ -26,11 +26,13 @@ import com.hazelcast.topic.Message;
import com.hazelcast.topic.MessageListener;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
index e398f3b..9786343 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java
@@ -20,11 +20,15 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.topic.ITopic;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class HazelcastTopicProducerTest extends HazelcastCamelTestSupport {
@@ -41,14 +45,15 @@ public class HazelcastTopicProducerTest extends
HazelcastCamelTestSupport {
verify(hazelcastInstance, atLeastOnce()).getTopic("bar");
}
- @After
+ @AfterEach
public void verifyQueueMock() {
verifyNoMoreInteractions(topic);
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testWithInvalidOperation() {
- template.sendBody("direct:publishInvalid", "foo");
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:publishInvalid", "foo"));
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
index 2abfc13..0082127 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryCamelTestSupport.java
@@ -19,9 +19,9 @@ package org.apache.camel.processor.aggregate.hazelcast;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class HazelcastAggregationRepositoryCamelTestSupport extends
CamelTestSupport {
private static HazelcastInstance hzOne;
@@ -35,13 +35,13 @@ public class HazelcastAggregationRepositoryCamelTestSupport
extends CamelTestSup
return hzTwo;
}
- @BeforeClass
+ @BeforeAll
public static void setUpHazelcastCluster() {
hzOne = Hazelcast.newHazelcastInstance(createConfig("hzOne"));
hzTwo = Hazelcast.newHazelcastInstance(createConfig("hzTwo"));
}
- @AfterClass
+ @AfterAll
public static void shutDownHazelcastCluster() {
Hazelcast.shutdownAll();
}
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java
index 85d5ef0..a63e623 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryConstructorsTest.java
@@ -19,12 +19,14 @@ package org.apache.camel.processor.aggregate.hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.assertThrows;
public class HazelcastAggregationRepositoryConstructorsTest extends
CamelTestSupport {
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void nonOptimisticRepoFailsOnOptimisticAdd() throws Exception {
final String repoName = "hzRepoMap";
HazelcastAggregationRepository repo = new
HazelcastAggregationRepository(repoName);
@@ -34,14 +36,14 @@ public class HazelcastAggregationRepositoryConstructorsTest
extends CamelTestSup
Exchange oldOne = new DefaultExchange(context());
Exchange newOne = new DefaultExchange(context());
final String key = "abrakadabra";
- repo.add(context(), key, oldOne, newOne);
- fail("OptimisticLockingException should has been thrown");
+ assertThrows(UnsupportedOperationException.class,
+ () -> repo.add(context(), key, oldOne, newOne));
} finally {
repo.doStop();
}
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void optimisticRepoFailsForNonOptimisticAdd() throws Exception {
final String repoName = "hzRepoMap";
HazelcastAggregationRepository repo = new
HazelcastAggregationRepository(repoName, true);
@@ -50,17 +52,19 @@ public class HazelcastAggregationRepositoryConstructorsTest
extends CamelTestSup
try {
Exchange ex = new DefaultExchange(context());
final String key = "abrakadabra";
- repo.add(context(), key, ex);
+ assertThrows(UnsupportedOperationException.class,
+ () -> repo.add(context(), key, ex));
} finally {
repo.doStop();
}
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void uninitializedHazelcastInstanceThrows() throws Exception {
final String repoName = "hzRepoMap";
HazelcastAggregationRepository repo = new
HazelcastAggregationRepository(repoName, (HazelcastInstance) null);
- repo.doStart();
+ assertThrows(IllegalArgumentException.class,
+ () -> repo.doStart());
}
@Test
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
index 706be16..10126a6 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryOperationsTest.java
@@ -19,7 +19,12 @@ package org.apache.camel.processor.aggregate.hazelcast;
import java.util.Set;
import org.apache.camel.Exchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class HazelcastAggregationRepositoryOperationsTest extends
HazelcastAggregationRepositoryCamelTestSupport {
@@ -42,13 +47,13 @@ public class HazelcastAggregationRepositoryOperationsTest
extends HazelcastAggre
Exchange newEx = createExchangeWithBody(testBody);
Exchange oldEx = repoOne.add(context(), key, null, newEx);
- assertNull("Old exchange should be null.", oldEx);
+ assertNull(oldEx, "Old exchange should be null.");
final String theNewestBody = "This is the newest test body.";
Exchange theNewestEx = createExchangeWithBody(theNewestBody);
oldEx = repoTwo.add(context(), key, newEx, theNewestEx);
- assertNotNull("oldEx is null", oldEx);
+ assertNotNull(oldEx, "oldEx is null");
assertEquals(newEx.getIn().getBody(), oldEx.getIn().getBody());
} finally {
@@ -71,13 +76,13 @@ public class HazelcastAggregationRepositoryOperationsTest
extends HazelcastAggre
Exchange newEx = createExchangeWithBody(testBody);
Exchange oldEx = repoOne.add(context(), key, newEx);
- assertNull("Old exchange should be null.", oldEx);
+ assertNull(oldEx, "Old exchange should be null.");
final String theNewestBody = "This is the newest test body.";
Exchange theNewestEx = createExchangeWithBody(theNewestBody);
oldEx = repoTwo.add(context(), key, theNewestEx);
- assertNotNull("oldEx is null", oldEx);
+ assertNotNull(oldEx, "oldEx is null");
assertEquals(newEx.getIn().getBody(), oldEx.getIn().getBody());
} finally {
@@ -104,8 +109,8 @@ public class HazelcastAggregationRepositoryOperationsTest
extends HazelcastAggre
assertEquals(1,
getSecondInstance().getMap(THREAD_SAFE_REPO).size());
Exchange gotEx = repoTwo.get(context(), key);
- assertNotNull("gotEx is null", gotEx);
- assertEquals("ex and gotEx should be equal",
gotEx.getIn().getBody(), ex.getIn().getBody());
+ assertNotNull(gotEx, "gotEx is null");
+ assertEquals(gotEx.getIn().getBody(), ex.getIn().getBody(), "ex
and gotEx should be equal");
} finally {
repoOne.doStop();
repoTwo.doStop();
@@ -129,8 +134,8 @@ public class HazelcastAggregationRepositoryOperationsTest
extends HazelcastAggre
repoOne.add(context(), key, ex);
Exchange gotEx = repoTwo.get(context(), key);
- assertNotNull("gotEx is null", gotEx);
- assertEquals("ex and gotEx should be equal",
gotEx.getIn().getBody(), ex.getIn().getBody());
+ assertNotNull(gotEx, "gotEx is null");
+ assertEquals(gotEx.getIn().getBody(), ex.getIn().getBody(), "ex
and gotEx should be equal");
} finally {
repoOne.doStop();
repoTwo.doStop();
@@ -155,18 +160,18 @@ public class HazelcastAggregationRepositoryOperationsTest
extends HazelcastAggre
repoOne.add(context(), key, null, ex);
Exchange getBackEx = repoTwo.get(context(), key);
- assertNotNull("getBackEx should not be null.", getBackEx);
+ assertNotNull(getBackEx, "getBackEx should not be null.");
repoTwo.remove(context(), key, ex);
getBackEx = repoOne.get(context(), key);
- assertNull("getBackEx should be null here.", getBackEx);
+ assertNull(getBackEx, "getBackEx should be null here.");
Set<String> keys = repoTwo.scan(context());
assertCollectionSize(keys, 1);
getBackEx = repoOne.recover(context(), keys.iterator().next());
- assertNotNull("getBackEx got from persistent repo should not be
null.", getBackEx);
+ assertNotNull(getBackEx, "getBackEx got from persistent repo
should not be null.");
} finally {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java
index 180c21a..d586c8c 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRecoverableRoutesTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class HazelcastAggregationRepositoryRecoverableRoutesTest extends
HazelcastAggregationRepositoryCamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java
index 78002bf..1fd4883 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepositoryRoutesTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class HazelcastAggregationRepositoryRoutesTest extends
HazelcastAggregationRepositoryCamelTestSupport {
diff --git
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
index 688f602..5668f3b 100644
---
a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
+++
b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java
@@ -21,10 +21,14 @@ import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+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;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HazelcastIdempotentRepositoryTest extends CamelTestSupport {
@@ -36,7 +40,7 @@ public class HazelcastIdempotentRepositoryTest extends
CamelTestSupport {
private String key02 = "456";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
hazelcastInstance = Hazelcast.newHazelcastInstance(null);
cache = hazelcastInstance.getMap("myRepo");
@@ -47,7 +51,7 @@ public class HazelcastIdempotentRepositoryTest extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
repo.stop();
super.tearDown();
@@ -123,7 +127,7 @@ public class HazelcastIdempotentRepositoryTest extends
CamelTestSupport {
// c is a duplicate
// should be started
- assertEquals("Should be started", true, repo.getStatus().isStarted());
+ assertTrue(repo.getStatus().isStarted(), "Should be started");
// send 3 message with one duplicated key (key01)
template.sendBodyAndHeader("direct://in", "a", "messageId", key01);
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 34019cd..2194670 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -101,7 +101,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -110,13 +110,18 @@
<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>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
index a6e5c2f..45d6ec0 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/FromFileToHdfsTest.java
@@ -24,9 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -36,23 +40,17 @@ public class FromFileToHdfsTest extends HdfsTestSupport {
private static final Path TEMP_DIR = new Path(new
File("target/outbox/").getAbsolutePath());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
deleteDirectory("target/inbox");
deleteDirectory("target/outbox");
super.setUp();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
- if (skipTest()) {
- return;
- }
-
super.tearDown();
Configuration conf = new Configuration();
Path dir = new Path("target/outbox");
@@ -62,10 +60,6 @@ public class FromFileToHdfsTest extends HdfsTestSupport {
@Test
public void testFileToHdfs() throws Exception {
- if (skipTest()) {
- return;
- }
-
NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
template.sendBodyAndHeader("file:target/inbox", "Hello World",
Exchange.FILE_NAME, "hello.txt");
@@ -73,18 +67,14 @@ public class FromFileToHdfsTest extends HdfsTestSupport {
notify.matchesWaitTime();
File delete = new File("target/inbox/hello.txt");
- assertTrue("File should be deleted " + delete, !delete.exists());
+ assertFalse(delete.exists(), "File should be deleted " + delete);
File create = new File(TEMP_DIR + "/output.txt");
- assertTrue("File should be created " + create, create.exists());
+ assertTrue(create.exists(), "File should be created " + create);
}
@Test
public void testTwoFilesToHdfs() throws Exception {
- if (skipTest()) {
- return;
- }
-
NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
template.sendBodyAndHeader("file:target/inbox", "Hello World",
Exchange.FILE_NAME, "hello.txt");
@@ -93,12 +83,12 @@ public class FromFileToHdfsTest extends HdfsTestSupport {
notify.matchesWaitTime();
File delete = new File("target/inbox/hello.txt");
- assertTrue("File should be deleted " + delete, !delete.exists());
+ assertFalse(delete.exists(), "File should be deleted " + delete);
delete = new File("target/inbox/bye.txt");
- assertTrue("File should be deleted " + delete, !delete.exists());
+ assertFalse(delete.exists(), "File should be deleted " + delete);
File create = new File(TEMP_DIR + "/output.txt");
- assertTrue("File should be created " + create, create.exists());
+ assertTrue(create.exists(), "File should be created " + create);
}
@Override
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HaConfigurationBuilderTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HaConfigurationBuilderTest.java
index 91dffe7..229b80c 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HaConfigurationBuilderTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HaConfigurationBuilderTest.java
@@ -21,11 +21,11 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class HaConfigurationBuilderTest {
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
index 15b4bd6..dfa46c3 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
@@ -29,8 +29,8 @@ import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import static
org.apache.camel.component.hdfs.HdfsConstants.DEFAULT_OPENED_SUFFIX;
@@ -39,7 +39,7 @@ import static
org.apache.camel.component.hdfs.HdfsTestSupport.CWD;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -59,7 +59,7 @@ public class HdfsConsumerTest {
private HdfsConsumer underTest;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
endpoint = mock(HdfsEndpoint.class);
processor = mock(Processor.class);
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInputStreamTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInputStreamTest.java
index 2841a14..3f07e1b 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInputStreamTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsInputStreamTest.java
@@ -23,14 +23,14 @@ import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -47,7 +47,7 @@ public class HdfsInputStreamTest {
private HdfsInputStream underTest;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
hdfsInfoFactory = mock(HdfsInfoFactory.class);
HdfsInfo hdfsInfo = mock(HdfsInfo.class);
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsOutputStreamTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsOutputStreamTest.java
index a736c51..b40fac9 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsOutputStreamTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsOutputStreamTest.java
@@ -23,13 +23,13 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.Progressable;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -50,7 +50,7 @@ public class HdfsOutputStreamTest {
private HdfsOutputStream underTest;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
hdfsInfoFactory = mock(HdfsInfoFactory.class);
HdfsInfo hdfsInfo = mock(HdfsInfo.class);
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
index ef363b0..8c3b567 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
@@ -26,18 +26,18 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-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;
public class HdfsProducerConsumerTest extends HdfsTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
super.setUp();
}
@@ -48,9 +48,7 @@ public class HdfsProducerConsumerTest extends HdfsTestSupport
{
@Test
public void testSimpleSplitWriteRead() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
final Path file = new Path(new
File("target/test/test-camel-simple-write-file").getAbsolutePath());
@@ -80,11 +78,9 @@ public class HdfsProducerConsumerTest extends
HdfsTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
super.tearDown();
Thread.sleep(100);
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
index 62ce77d..8ba2b9c 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
@@ -25,20 +25,22 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HdfsProducerSplitTest extends HdfsTestSupport {
private static final Path BASE_FILE = new Path(new
File("target/test/test-camel-simple-write-BASE_FILE").getAbsolutePath());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
super.setUp();
}
@@ -54,10 +56,6 @@ public class HdfsProducerSplitTest extends HdfsTestSupport {
@Test
public void testSimpleWriteFileWithIdleSplit() throws Exception {
- if (skipTest()) {
- return;
- }
-
for (int i = 0; i < 3; ++i) {
template.sendBody("direct:start3", "CIAO" + i);
Thread.sleep(2000);
@@ -87,10 +85,6 @@ public class HdfsProducerSplitTest extends HdfsTestSupport {
}
private void doTest(int routeNr) throws Exception {
- if (skipTest()) {
- return;
- }
-
for (int i = 0; i < 10; ++i) {
template.sendBody("direct:start" + routeNr, "CIAO" + i);
}
@@ -107,12 +101,8 @@ public class HdfsProducerSplitTest extends HdfsTestSupport
{
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
- if (skipTest()) {
- return;
- }
-
super.tearDown();
Thread.sleep(100);
Configuration conf = new Configuration();
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
index 54970c7..d5176e9 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
@@ -41,30 +41,26 @@ import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.util.ReflectionUtils;
-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.apache.camel.language.simple.SimpleLanguage.simple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HdfsProducerTest extends HdfsTestSupport {
private static final Path TEMP_DIR = new Path(new
File("target/test/").getAbsolutePath());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
super.setUp();
}
@Test
public void testProducer() throws Exception {
- if (skipTest()) {
- return;
- }
template.sendBody("direct:start1", "PAPPO");
Configuration conf = new Configuration();
@@ -80,9 +76,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testProducerClose() throws Exception {
- if (skipTest()) {
- return;
- }
for (int i = 0; i < 10; ++i) {
// send 10 messages, and mark to close in last message
template.sendBodyAndHeader("direct:start1", "PAPPO" + i,
HdfsConstants.HDFS_CLOSE, i == 9 ? true : false);
@@ -106,9 +99,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteBoolean() throws Exception {
- if (skipTest()) {
- return;
- }
Boolean aBoolean = true;
template.sendBody("direct:write_boolean", aBoolean);
@@ -126,9 +116,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteByte() throws Exception {
- if (skipTest()) {
- return;
- }
byte aByte = 8;
template.sendBody("direct:write_byte", aByte);
@@ -146,9 +133,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteInt() throws Exception {
- if (skipTest()) {
- return;
- }
int anInt = 1234;
template.sendBody("direct:write_int", anInt);
@@ -166,9 +150,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteFloat() throws Exception {
- if (skipTest()) {
- return;
- }
float aFloat = 12.34f;
template.sendBody("direct:write_float", aFloat);
@@ -186,9 +167,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteDouble() throws Exception {
- if (skipTest()) {
- return;
- }
Double aDouble = 12.34D;
template.sendBody("direct:write_double", aDouble);
@@ -206,9 +184,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteLong() throws Exception {
- if (skipTest()) {
- return;
- }
long aLong = 1234567890;
template.sendBody("direct:write_long", aLong);
@@ -226,9 +201,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteText() throws Exception {
- if (skipTest()) {
- return;
- }
String txt = "CIAO MONDO !";
template.sendBody("direct:write_text1", txt);
@@ -246,9 +218,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteTextWithKey() throws Exception {
- if (skipTest()) {
- return;
- }
String txtKey = "THEKEY";
String txtValue = "CIAO MONDO !";
template.sendBodyAndHeader("direct:write_text2", txtValue, "KEY",
txtKey);
@@ -267,9 +236,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testMapWriteTextWithKey() throws Exception {
- if (skipTest()) {
- return;
- }
String txtKey = "THEKEY";
String txtValue = "CIAO MONDO !";
template.sendBodyAndHeader("direct:write_text3", txtValue, "KEY",
txtKey);
@@ -287,9 +253,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testArrayWriteText() throws Exception {
- if (skipTest()) {
- return;
- }
String txtValue = "CIAO MONDO !";
template.sendBody("direct:write_text4", txtValue);
@@ -306,9 +269,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testBloomMapWriteText() throws Exception {
- if (skipTest()) {
- return;
- }
String txtKey = "THEKEY";
String txtValue = "CIAO MONDO !";
template.sendBodyAndHeader("direct:write_text5", txtValue, "KEY",
txtKey);
@@ -326,10 +286,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteTextWithDynamicFilename() throws Exception {
- if (skipTest()) {
- return;
- }
-
for (int i = 0; i < 5; i++) {
template.sendBodyAndHeader("direct:write_dynamic_filename", "CIAO"
+ i, Exchange.FILE_NAME, "file" + i);
}
@@ -349,10 +305,6 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteTextWithDynamicFilenameExpression() throws Exception {
- if (skipTest()) {
- return;
- }
-
for (int i = 0; i < 5; i++) {
template.sendBodyAndHeader("direct:write_dynamic_filename", "CIAO"
+ i, Exchange.FILE_NAME, simple("file-${body}"));
}
@@ -371,11 +323,8 @@ public class HdfsProducerTest extends HdfsTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
- if (skipTest()) {
- return;
- }
super.tearDown();
Thread.sleep(250);
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
index e406014..2ed4978 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsTestSupport.java
@@ -17,36 +17,32 @@
package org.apache.camel.component.hdfs;
import java.io.File;
-import java.util.Objects;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.util.Shell;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
public abstract class HdfsTestSupport extends CamelTestSupport {
public static final File CWD = new File(".");
private static Boolean skipTests;
- public boolean skipTest() {
- if (Objects.isNull(skipTests)) {
- skipTests = notConfiguredToRunTests();
- }
-
- return skipTests;
- }
-
- private boolean notConfiguredToRunTests() {
- return isJavaFromIbm() || missingLocalHadoopConfiguration() ||
missingAuthenticationConfiguration();
+ public void checkTest() {
+ isJavaFromIbm();
+ missingLocalHadoopConfiguration();
+ missingAuthenticationConfiguration();
}
- private static boolean isJavaFromIbm() {
+ protected static void isJavaFromIbm() {
// Hadoop doesn't run on IBM JDK
- return System.getProperty("java.vendor").contains("IBM");
+ assumeFalse(System.getProperty("java.vendor").contains("IBM"), "IBM
JDK not supported");
}
- private static boolean missingLocalHadoopConfiguration() {
+ private static void missingLocalHadoopConfiguration() {
boolean hasLocalHadoop;
try {
String hadoopHome = Shell.getHadoopHome();
@@ -54,16 +50,14 @@ public abstract class HdfsTestSupport extends
CamelTestSupport {
} catch (Throwable e) {
hasLocalHadoop = false;
}
- return !hasLocalHadoop;
+ assumeTrue(hasLocalHadoop, "Missing local hadoop configuration");
}
- private boolean missingAuthenticationConfiguration() {
+ private void missingAuthenticationConfiguration() {
try {
javax.security.auth.login.Configuration.getConfiguration();
- return false;
} catch (Exception e) {
- log.debug("Cannot run test due security exception", e);
- return true;
+ assumeTrue(false, "Missing authentication configuration: " + e);
}
}
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
index eaf5316..e112b7a 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
@@ -18,18 +18,20 @@ package org.apache.camel.component.hdfs.integration;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Must run manual")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Must run manual")
public class HdfsAppendTest extends CamelTestSupport {
private static final int ITERATIONS = 10;
@@ -39,7 +41,7 @@ public class HdfsAppendTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -116,7 +118,7 @@ public class HdfsAppendTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsConsumerIntegrationTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsConsumerIntegrationTest.java
index d5a10dc..9acf92b 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsConsumerIntegrationTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsConsumerIntegrationTest.java
@@ -50,12 +50,15 @@ import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.Writer;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.util.Progressable;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.apache.hadoop.io.SequenceFile.CompressionType;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HdfsConsumerIntegrationTest extends HdfsTestSupport {
private static final int ITERATIONS = 200;
@@ -66,11 +69,9 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- if (skipTest()) {
- return;
- }
+ checkTest();
// must be able to get security configuration
try {
@@ -85,10 +86,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testSimpleConsumer() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-normal-file").getAbsolutePath());
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(file.toUri(), conf);
@@ -114,10 +111,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testConcurrentConsumers() throws Exception {
- if (skipTest()) {
- return;
- }
-
final File rootdir = CWD;
final File dir = new File("target/test/multiple-consumers");
dir.mkdirs();
@@ -158,10 +151,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testSimpleConsumerWithEmptyFile() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-normal-file").getAbsolutePath());
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(file.toUri(), conf);
@@ -187,10 +176,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testSimpleConsumerFileWithSizeEqualToNChunks() throws
Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-normal-file").getAbsolutePath());
Configuration conf = new Configuration();
FileSystem fs = FileSystem.get(file.toUri(), conf);
@@ -218,10 +203,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testSimpleConsumerWithEmptySequenceFile() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-sequence-file").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, BooleanWritable.class);
@@ -243,10 +224,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadWithReadSuffix() throws Exception {
- if (skipTest()) {
- return;
- }
-
String[] beforeFiles = new File("target/test").list();
int before = beforeFiles != null ? beforeFiles.length : 0;
@@ -288,10 +265,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadBoolean() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-boolean").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, BooleanWritable.class);
@@ -316,10 +289,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadByte() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-byte").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, ByteWritable.class);
@@ -347,10 +316,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadFloat() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-float").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, FloatWritable.class);
@@ -377,10 +342,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadDouble() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-double").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, DoubleWritable.class);
@@ -407,10 +368,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadInt() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-int").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, IntWritable.class);
@@ -437,10 +394,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadLong() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-long").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, LongWritable.class);
@@ -467,10 +420,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadBytes() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-bytes").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, BytesWritable.class);
@@ -497,10 +446,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadString() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-string").getAbsolutePath());
Configuration conf = new Configuration();
SequenceFile.Writer writer = createWriter(conf, file,
NullWritable.class, Text.class);
@@ -527,10 +472,6 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
@Test
public void testReadStringArrayFile() throws Exception {
- if (skipTest()) {
- return;
- }
-
final Path file = new Path(new
File("target/test/test-camel-string").getAbsolutePath());
Configuration conf = new Configuration();
FileSystem fs1 = FileSystem.get(file.toUri(), conf);
@@ -559,12 +500,8 @@ public class HdfsConsumerIntegrationTest extends
HdfsTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
- if (skipTest()) {
- return;
- }
-
super.tearDown();
Thread.sleep(100);
Configuration conf = new Configuration();
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
index d1c13aa..19c313a 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
@@ -26,19 +26,20 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
-@Ignore("Must run manual")
+@Disabled("Must run manual")
public class HdfsProducerConsumerIntegrationTest extends CamelTestSupport {
private static final int ITERATIONS = 400;
@@ -124,7 +125,7 @@ public class HdfsProducerConsumerIntegrationTest extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosAuthenticationTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosAuthenticationTest.java
index 383a45d..4274d5a 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosAuthenticationTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosAuthenticationTest.java
@@ -20,9 +20,10 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.hdfs.HdfsTestSupport.CWD;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class KerberosAuthenticationTest {
@@ -45,7 +46,7 @@ public class KerberosAuthenticationTest {
/* message is printed in the logs */
}
- @Test(expected = FileNotFoundException.class)
+ @Test
public void loginWithMissingKeytabFile() throws IOException {
// given
Configuration configuration = new Configuration();
@@ -56,7 +57,8 @@ public class KerberosAuthenticationTest {
underTest = new KerberosAuthentication(configuration, username,
keyTabFileLocation);
// when
- underTest.loginWithKeytab();
+ assertThrows(FileNotFoundException.class,
+ () -> underTest.loginWithKeytab());
// then
/* exception was thrown */
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosConfigurationBuilderTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosConfigurationBuilderTest.java
index af75002..4d118d7 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosConfigurationBuilderTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/kerberos/KerberosConfigurationBuilderTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.component.hdfs.kerberos;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.hdfs.HdfsTestSupport.CWD;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KerberosConfigurationBuilderTest {
