You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/03/21 09:54:28 UTC
[camel] branch master updated: CAMEL-11807: Migrated
camel-atomix/attachments/barcode tests to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 778800e CAMEL-11807: Migrated camel-atomix/attachments/barcode tests to JUnit 5
778800e is described below
commit 778800e6eef086f93b0cceac652c8aa862e600af
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Mar 21 10:28:49 2020 +0100
CAMEL-11807: Migrated camel-atomix/attachments/barcode tests to JUnit 5
---
components/camel-atomix/pom.xml | 10 +-
.../component/atomix/AtomixTypeConverterTest.java | 22 ++-
.../client/AtomixClientSpringTestSupport.java | 2 +-
.../atomix/client/AtomixClientTestSupport.java | 4 +-
.../atomix/client/map/AtomixMapConsumerTest.java | 10 +-
.../client/map/AtomixMapNodesProducerTest.java | 13 +-
.../atomix/client/map/AtomixMapProducerTest.java | 34 +++--
.../client/map/SpringAtomixMapProducerTest.java | 7 +-
.../client/messaging/AtomixMessagingTest.java | 8 +-
.../multimap/AtomixMultiMapProducerTest.java | 35 +++--
.../client/queue/AtomixQueueConsumerTest.java | 11 +-
.../client/queue/AtomixQueueProducerTest.java | 23 +--
.../atomix/client/set/AtomixSetConsumerTest.java | 10 +-
.../atomix/client/set/AtomixSetProducerTest.java | 20 ++-
.../client/value/AtomixValueConsumerTest.java | 10 +-
.../client/value/AtomixValueProducerTest.java | 14 +-
...tomixClientClusteredRoutePolicyFactoryMain.java | 4 +-
.../AtomixClientRoutePolicyFactoryTestSupport.java | 15 +-
.../AtomixClientRoutePolicyTestSupport.java | 15 +-
.../cluster/AtomixRoutePolicyFactoryTest.java | 15 +-
.../atomix/cluster/AtomixRoutePolicyTest.java | 15 +-
components/camel-attachments/pom.xml | 8 +-
.../attachment/BeanMethodWithExchangeTest.java | 25 ++--
.../camel/attachment/BodyAndHeaderConvertTest.java | 32 ++--
.../MessageWithAttachmentRedeliveryIssueTest.java | 23 +--
components/camel-barcode/pom.xml | 7 +-
.../barcode/BarcodeDataFormatCamelTest.java | 18 +--
.../barcode/BarcodeDataFormatSpringTest.java | 13 +-
.../dataformat/barcode/BarcodeDataFormatTest.java | 166 +++++++++++----------
.../camel/dataformat/barcode/BarcodeTestBase.java | 5 +-
30 files changed, 304 insertions(+), 290 deletions(-)
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index a940d3c..bd714ad 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -103,18 +103,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>hamcrest-core</artifactId>
- <groupId>org.hamcrest</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/AtomixTypeConverterTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/AtomixTypeConverterTest.java
index 433ead5..6196d46 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/AtomixTypeConverterTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/AtomixTypeConverterTest.java
@@ -20,29 +20,25 @@ import io.atomix.catalyst.transport.Address;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class AtomixTypeConverterTest {
@Test
- public void testStringToAddressConversion() throws Exception {
- DefaultCamelContext context = null;
+ void testStringToAddressConversion() throws Exception {
- try {
- context = new DefaultCamelContext();
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
context.start();
TypeConverterRegistry registry = context.getTypeConverterRegistry();
TypeConverter converter = registry.lookup(Address.class, String.class);
- Assert.assertNotNull(converter);
- Assert.assertEquals("127.0.0.1", converter.mandatoryConvertTo(Address.class, "127.0.0.1:1234").host());
- Assert.assertEquals(1234, converter.mandatoryConvertTo(Address.class, "127.0.0.1:1234").port());
- } finally {
- if (context != null) {
- context.stop();
- }
+ assertNotNull(converter);
+ assertEquals("127.0.0.1", converter.mandatoryConvertTo(Address.class, "127.0.0.1:1234").host());
+ assertEquals(1234, converter.mandatoryConvertTo(Address.class, "127.0.0.1:1234").port());
}
}
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientSpringTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientSpringTestSupport.java
index 9de0d9d..0853b73 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientSpringTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientSpringTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.atomix.client;
import io.atomix.AtomixClient;
import io.atomix.AtomixReplica;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
public abstract class AtomixClientSpringTestSupport extends CamelSpringTestSupport {
protected Address getReplicaAddress() {
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientTestSupport.java
index e5c3763..6e7e123 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/AtomixClientTestSupport.java
@@ -24,7 +24,7 @@ import io.atomix.catalyst.transport.Address;
import org.apache.camel.Component;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
public abstract class AtomixClientTestSupport extends CamelTestSupport {
protected Address replicaAddress;
@@ -32,7 +32,7 @@ public abstract class AtomixClientTestSupport extends CamelTestSupport {
protected AtomixClient client;
@Override
- protected Registry createCamelRegistry() throws Exception {
+ protected Registry createCamelRegistry() {
SimpleRegistry registry = new SimpleRegistry();
createComponents().entrySet().stream()
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
index fb88aa6f..9d24f6a 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
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;
public class AtomixMapConsumerTest extends AtomixClientTestSupport {
private static final String MAP_NAME = UUID.randomUUID().toString();
@@ -57,7 +57,7 @@ public class AtomixMapConsumerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
map.close();
@@ -69,7 +69,7 @@ public class AtomixMapConsumerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testEvents() throws Exception {
+ void testEvents() throws Exception {
String key = context().getUuidGenerator().generateUuid();
String put = context().getUuidGenerator().generateUuid();
String upd = context().getUuidGenerator().generateUuid();
@@ -127,7 +127,7 @@ public class AtomixMapConsumerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
fromF("atomix-map:%s", MAP_NAME)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
index b43fb18..7a892b8 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
@@ -29,8 +29,11 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-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;
public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
@@ -57,7 +60,7 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
map.close();
@@ -69,7 +72,7 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testPut() throws Exception {
+ void testPut() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -91,7 +94,7 @@ public class AtomixMapNodesProducerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
index abbfcb1..7ea4ea7 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
@@ -32,10 +32,14 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+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 AtomixMapProducerTest extends AtomixClientTestSupport {
private static final String MAP_NAME = UUID.randomUUID().toString();
@@ -64,7 +68,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
map.close();
@@ -76,7 +80,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testPut() throws Exception {
+ void testPut() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -94,7 +98,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testPutWithTTL() throws Exception {
+ void testPutWithTTL() throws Exception {
final String key1 = context().getUuidGenerator().generateUuid();
final String key2 = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -134,7 +138,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testPutIfAbsent() throws Exception {
+ void testPutIfAbsent() {
final String key = context().getUuidGenerator().generateUuid();
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -163,7 +167,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testGet() throws Exception {
+ void testGet() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -190,7 +194,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testSizeClearIsEmpty() throws Exception {
+ void testSizeClearIsEmpty() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -240,7 +244,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testContainsKey() throws Exception {
+ void testContainsKey() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -270,7 +274,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testContainsValue() throws Exception {
+ void testContainsValue() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -298,7 +302,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testRemove() throws Exception {
+ void testRemove() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -339,7 +343,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testReplace() throws Exception {
+ void testReplace() {
final String key = context().getUuidGenerator().generateUuid();
final String oldVal = context().getUuidGenerator().generateUuid();
final String newVal = context().getUuidGenerator().generateUuid();
@@ -384,7 +388,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testValues() throws Exception {
+ void testValues() {
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
@@ -398,7 +402,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testEntrySet() throws Exception {
+ void testEntrySet() {
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
map.put(context().getUuidGenerator().generateUuid(), context().getUuidGenerator().generateUuid()).join();
@@ -416,7 +420,7 @@ public class AtomixMapProducerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/SpringAtomixMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/SpringAtomixMapProducerTest.java
index e69e109..79b67903 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/SpringAtomixMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/SpringAtomixMapProducerTest.java
@@ -21,11 +21,14 @@ import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientSpringTestSupport;
import org.apache.camel.impl.engine.DefaultFluentProducerTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
@DirtiesContext
public class SpringAtomixMapProducerTest extends AtomixClientSpringTestSupport {
@@ -35,7 +38,7 @@ public class SpringAtomixMapProducerTest extends AtomixClientSpringTestSupport {
}
@Test
- public void testPut() throws Exception {
+ void testPut() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
final DistributedMap<Object, Object> map = getClient().getMap("test-map").join();
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
index 61818a9..1242068 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.atomix.client.messaging;
import java.util.Collections;
import java.util.Map;
-import java.util.UUID;
import org.apache.camel.Component;
import org.apache.camel.EndpointInject;
@@ -28,10 +27,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class AtomixMessagingTest extends AtomixClientTestSupport {
- private static final String NODE_NAME = UUID.randomUUID().toString();
@EndpointInject("direct:start")
private FluentProducerTemplate template;
@@ -53,7 +51,7 @@ public class AtomixMessagingTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testMessaging() throws Exception {
+ void testMessaging() {
MockEndpoint mock1 = getMockEndpoint("mock:member-1");
mock1.expectedMessageCount(2);
mock1.expectedBodiesReceived("direct-message", "broadcast-message");
@@ -81,7 +79,7 @@ public class AtomixMessagingTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
index 49ac0ad..fc2dc23 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
@@ -31,10 +31,13 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-import org.junit.Assert;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
private static final String MAP_NAME = UUID.randomUUID().toString();
@@ -63,7 +66,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
map.close();
@@ -75,7 +78,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testPut() throws Exception {
+ void testPut() {
final String key = context().getUuidGenerator().generateUuid();
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -104,7 +107,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testGet() throws Exception {
+ void testGet() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -132,7 +135,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testSizeClearIsEmpty() throws Exception {
+ void testSizeClearIsEmpty() {
final String key1 = context().getUuidGenerator().generateUuid();
final String key2 = context().getUuidGenerator().generateUuid();
@@ -190,7 +193,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testContainsKey() throws Exception {
+ void testContainsKey() {
final String key = context().getUuidGenerator().generateUuid();
final String val = context().getUuidGenerator().generateUuid();
@@ -220,7 +223,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
}
// @Test
-// public void testContainsValue() throws Exception {
+// void testContainsValue() throws Exception {
// final String key = context().getUuidGenerator().generateUuid();
// final String val1 = context().getUuidGenerator().generateUuid();
// final String val2 = context().getUuidGenerator().generateUuid();
@@ -260,7 +263,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
//
// @Test
-// public void testContainsEntry() throws Exception {
+// void testContainsEntry() throws Exception {
// final String key = context().getUuidGenerator().generateUuid();
// final String val1 = context().getUuidGenerator().generateUuid();
// final String val2 = context().getUuidGenerator().generateUuid();
@@ -292,7 +295,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// }
@Test
- public void testRemove() throws Exception {
+ void testRemove() {
final String key = context().getUuidGenerator().generateUuid();
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -331,11 +334,11 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
assertFalse(map.containsKey(key).join());
}
- @Ignore
+ @Disabled
@Test
- public void test() {
+ void test() {
//Assert.assertFalse(map.containsValue("abc").join());
- Assert.assertFalse(map.containsEntry("abc", "abc").join());
+ assertFalse(map.containsEntry("abc", "abc").join());
}
// ************************************
@@ -343,7 +346,7 @@ public class AtomixMultiMapProducerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
index 8f08cef..49f8c9b 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
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;
public class AtomixQueueConsumerTest extends AtomixClientTestSupport {
private static final String QUEUE_NAME = UUID.randomUUID().toString();
@@ -55,7 +55,7 @@ public class AtomixQueueConsumerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
queue.close();
@@ -65,9 +65,8 @@ public class AtomixQueueConsumerTest extends AtomixClientTestSupport {
// ************************************
// Test
// ************************************
-
@Test
- public void testEvents() throws Exception {
+ void testEvents() throws Exception {
String val1 = context().getUuidGenerator().generateUuid();
String val2 = context().getUuidGenerator().generateUuid();
@@ -99,7 +98,7 @@ public class AtomixQueueConsumerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
fromF("atomix-queue:%s", QUEUE_NAME)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
index 2ded4a6..bdd95c5 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
@@ -29,8 +29,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-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.assertTrue;
public class AtomixQueueProducerTest extends AtomixClientTestSupport {
private static final String QUEUE_NAME = UUID.randomUUID().toString();
@@ -59,7 +63,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
queue.close();
@@ -71,7 +75,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testAdd() throws Exception {
+ void testAdd() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -95,7 +99,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testOfferPeekAndPoll() throws Exception {
+ void testOfferPeekAndPoll() {
final String val = context().getUuidGenerator().generateUuid();
Message result;
@@ -126,7 +130,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testSizeClearIsEmpty() throws Exception {
+ void testSizeClearIsEmpty() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -175,7 +179,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testContains() throws Exception {
+ void testContains() {
final String val = context().getUuidGenerator().generateUuid();
Message result;
@@ -202,7 +206,7 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testRemove() throws Exception {
+ void testRemove() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -224,9 +228,8 @@ public class AtomixQueueProducerTest extends AtomixClientTestSupport {
// ************************************
// Routes
// ************************************
-
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
index 85d6a33..c564259 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
@@ -28,8 +28,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
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;
public class AtomixSetConsumerTest extends AtomixClientTestSupport {
private static final String SET_NAME = UUID.randomUUID().toString();
@@ -55,7 +55,7 @@ public class AtomixSetConsumerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
set.close();
@@ -67,7 +67,7 @@ public class AtomixSetConsumerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testEvents() throws Exception {
+ void testEvents() throws Exception {
String val1 = context().getUuidGenerator().generateUuid();
String val2 = context().getUuidGenerator().generateUuid();
@@ -99,7 +99,7 @@ public class AtomixSetConsumerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
fromF("atomix-set:%s", SET_NAME)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
index 3977e6e..01bac55 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
@@ -29,8 +29,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-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.assertTrue;
public class AtomixSetProducerTest extends AtomixClientTestSupport {
private static final String SET_NAME = UUID.randomUUID().toString();
@@ -59,7 +63,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
set.close();
@@ -71,7 +75,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testAdd() throws Exception {
+ void testAdd() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -95,7 +99,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testSizeClearIsEmpty() throws Exception {
+ void testSizeClearIsEmpty() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -144,7 +148,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testContains() throws Exception {
+ void testContains() {
final String val = context().getUuidGenerator().generateUuid();
Message result;
@@ -171,7 +175,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
}
@Test
- public void testRemove() throws Exception {
+ void testRemove() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -195,7 +199,7 @@ public class AtomixSetProducerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
index 3efc45f..075a678 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
@@ -27,8 +27,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
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;
public class AtomixValueConsumerTest extends AtomixClientTestSupport {
private static final String VALUE_NAME = UUID.randomUUID().toString();
@@ -54,7 +54,7 @@ public class AtomixValueConsumerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
value.close();
@@ -66,7 +66,7 @@ public class AtomixValueConsumerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void testEvents() throws Exception {
+ void testEvents() throws Exception {
String val1 = context().getUuidGenerator().generateUuid();
String val2 = context().getUuidGenerator().generateUuid();
@@ -89,7 +89,7 @@ public class AtomixValueConsumerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
fromF("atomix-value:%s", VALUE_NAME)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
index 770476b..2d14b15 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
@@ -29,8 +29,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
-import org.junit.After;
-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.assertTrue;
public class AtomixValueProducerTest extends AtomixClientTestSupport {
private static final String VALUE_NAME = UUID.randomUUID().toString();
@@ -59,7 +63,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
value.close();
@@ -71,7 +75,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
// ************************************
@Test
- public void test() throws Exception {
+ void test() {
final String val1 = context().getUuidGenerator().generateUuid();
final String val2 = context().getUuidGenerator().generateUuid();
@@ -118,7 +122,7 @@ public class AtomixValueProducerTest extends AtomixClientTestSupport {
// ************************************
@Override
- protected RoutesBuilder createRouteBuilder() throws Exception {
+ protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
index ddcfa21..b6fec94 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
@@ -54,9 +54,9 @@ public final class AtomixClientClusteredRoutePolicyFactoryMain {
}
});
- main.addRouteBuilder(new RouteBuilder() {
+ main.addRoutesBuilder(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("timer:clustered?delay=1000&period=1000")
.routeId("route-" + id)
.log("Route ${routeId} is running ...");
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
index 6e40701..b870162 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
@@ -34,11 +34,13 @@ import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.component.atomix.client.AtomixFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public abstract class AtomixClientRoutePolicyFactoryTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(AtomixClientRoutePolicyFactoryTestSupport.class);
@@ -53,7 +55,7 @@ public abstract class AtomixClientRoutePolicyFactoryTestSupport {
// ************************************
@Test
- public void test() throws Exception {
+ void test() throws Exception {
AtomixReplica boot = null;
try {
@@ -66,8 +68,8 @@ public abstract class AtomixClientRoutePolicyFactoryTestSupport {
latch.await(1, TimeUnit.MINUTES);
scheduler.shutdownNow();
- Assert.assertEquals(clients.size(), results.size());
- Assert.assertTrue(results.containsAll(clients));
+ assertEquals(clients.size(), results.size());
+ assertTrue(results.containsAll(clients));
} finally {
if (boot != null) {
boot.shutdown();
@@ -80,11 +82,10 @@ public abstract class AtomixClientRoutePolicyFactoryTestSupport {
// ************************************
private void run(String id) {
- try {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
int events = ThreadLocalRandom.current().nextInt(2, 6);
CountDownLatch contextLatch = new CountDownLatch(events);
- DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
context.setName("context-" + id);
context.addService(createClusterService(id, address));
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index df21c45..74d652d 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
@@ -34,11 +34,13 @@ import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.component.atomix.client.AtomixFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public abstract class AtomixClientRoutePolicyTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(AtomixClientRoutePolicyTestSupport.class);
@@ -53,7 +55,7 @@ public abstract class AtomixClientRoutePolicyTestSupport {
// ************************************
@Test
- public void test() throws Exception {
+ void test() throws Exception {
AtomixReplica boot = null;
try {
@@ -66,8 +68,8 @@ public abstract class AtomixClientRoutePolicyTestSupport {
latch.await(1, TimeUnit.MINUTES);
scheduler.shutdownNow();
- Assert.assertEquals(clients.size(), results.size());
- Assert.assertTrue(results.containsAll(clients));
+ assertEquals(clients.size(), results.size());
+ assertTrue(results.containsAll(clients));
} finally {
if (boot != null) {
boot.shutdown();
@@ -80,11 +82,10 @@ public abstract class AtomixClientRoutePolicyTestSupport {
// ************************************
private void run(String id) {
- try {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
int events = ThreadLocalRandom.current().nextInt(2, 6);
CountDownLatch contextLatch = new CountDownLatch(events);
- DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
context.setName("context-" + id);
context.addService(createClusterService(id, address));
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index 5d91e68..eeee513 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
@@ -32,11 +32,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class AtomixRoutePolicyFactoryTest {
private static final Logger LOGGER = LoggerFactory.getLogger(AtomixRoutePolicyFactoryTest.class);
@@ -55,7 +57,7 @@ public final class AtomixRoutePolicyFactoryTest {
// ************************************
@Test
- public void test() throws Exception {
+ void test() throws Exception {
for (Address address: addresses) {
scheduler.submit(() -> run(address));
}
@@ -63,8 +65,8 @@ public final class AtomixRoutePolicyFactoryTest {
latch.await(1, TimeUnit.MINUTES);
scheduler.shutdownNow();
- Assert.assertEquals(addresses.size(), results.size());
- Assert.assertTrue(results.containsAll(addresses));
+ assertEquals(addresses.size(), results.size());
+ assertTrue(results.containsAll(addresses));
}
// ************************************
@@ -72,7 +74,7 @@ public final class AtomixRoutePolicyFactoryTest {
// ************************************
private void run(Address address) {
- try {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
int events = ThreadLocalRandom.current().nextInt(2, 6);
CountDownLatch contextLatch = new CountDownLatch(events);
@@ -82,7 +84,6 @@ public final class AtomixRoutePolicyFactoryTest {
service.setAddress(address);
service.setNodes(addresses);
- DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
context.setName("context-" + address.port());
context.addService(service);
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index 9aecdba..e1c5c04 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
@@ -32,11 +32,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class AtomixRoutePolicyTest {
private static final Logger LOGGER = LoggerFactory.getLogger(AtomixRoutePolicyTest.class);
@@ -55,7 +57,7 @@ public final class AtomixRoutePolicyTest {
// ************************************
@Test
- public void test() throws Exception {
+ void test() throws Exception {
for (Address address: addresses) {
scheduler.submit(() -> run(address));
}
@@ -63,8 +65,8 @@ public final class AtomixRoutePolicyTest {
latch.await(1, TimeUnit.MINUTES);
scheduler.shutdownNow();
- Assert.assertEquals(addresses.size(), results.size());
- Assert.assertTrue(results.containsAll(addresses));
+ assertEquals(addresses.size(), results.size());
+ assertTrue(results.containsAll(addresses));
}
// ************************************
@@ -72,7 +74,7 @@ public final class AtomixRoutePolicyTest {
// ************************************
private void run(Address address) {
- try {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
int events = ThreadLocalRandom.current().nextInt(2, 6);
CountDownLatch contextLatch = new CountDownLatch(events);
@@ -82,7 +84,6 @@ public final class AtomixRoutePolicyTest {
service.setAddress(address);
service.setNodes(addresses);
- DefaultCamelContext context = new DefaultCamelContext();
context.disableJMX();
context.setName("context-" + address.port());
context.addService(service);
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index 020155f..6fa20db 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -58,13 +58,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index 9f29328..83c001d 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -22,33 +22,36 @@ import javax.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BeanMethodWithExchangeTest extends CamelTestSupport {
@Test
- public void testBeanWithAnnotationAndExchangeTest() throws Exception {
+ void testBeanWithAnnotationAndExchangeTest() {
Exchange result = template.request("direct:start1", new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
AttachmentMessage m = exchange.getIn(AttachmentMessage.class);
m.addAttachment("attachment", new DataHandler(new FileDataSource("src/test/org/apache/camel/attachment/BeanMethodWithExchangeTest.java")));
}
});
-
- Assert.assertTrue(result.getMessage(AttachmentMessage.class).getAttachmentObjects().containsKey("attachment2"));
- Assert.assertTrue(result.getMessage(AttachmentMessage.class).getAttachments().containsKey("attachment1"));
+
+ assertTrue(result.getMessage(AttachmentMessage.class).getAttachmentObjects().containsKey("attachment2"));
+ assertTrue(result.getMessage(AttachmentMessage.class).getAttachments().containsKey("attachment1"));
assertEquals("attachmentValue1", result.getMessage(AttachmentMessage.class).getAttachmentObjects().get("attachment1").getHeader("attachmentHeader1"));
- Assert.assertFalse(result.getMessage(AttachmentMessage.class).getAttachments().containsKey("attachment"));
+ assertFalse(result.getMessage(AttachmentMessage.class).getAttachments().containsKey("attachment"));
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("direct:start1").process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
index 53265e4..ead17e7 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
@@ -27,42 +27,44 @@ import org.w3c.dom.Element;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultExchange;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class BodyAndHeaderConvertTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class BodyAndHeaderConvertTest {
protected Exchange exchange;
@Test
- public void testConversionOfBody() throws Exception {
+ void testConversionOfBody() {
Document document = exchange.getIn().getBody(Document.class);
- Assert.assertNotNull(document);
+ assertNotNull(document);
Element element = document.getDocumentElement();
- Assert.assertEquals("Root element name", "hello", element.getLocalName());
+ assertEquals("hello", element.getLocalName(), "Root element name");
}
@Test
- public void testConversionOfExchangeProperties() throws Exception {
+ void testConversionOfExchangeProperties() {
String text = exchange.getProperty("foo", String.class);
- Assert.assertEquals("foo property", "1234", text);
+ assertEquals("1234", text, "foo property");
}
@Test
- public void testConversionOfMessageHeaders() throws Exception {
+ void testConversionOfMessageHeaders() {
String text = exchange.getIn().getHeader("bar", String.class);
- Assert.assertEquals("bar header", "567", text);
+ assertEquals("567", text, "bar header");
}
@Test
- public void testConversionOfMessageAttachments() throws Exception {
+ void testConversionOfMessageAttachments() {
DataHandler handler = exchange.getIn(AttachmentMessage.class).getAttachment("att");
- Assert.assertNotNull("attachment got lost", handler);
+ assertNotNull(handler, "attachment got lost");
Attachment attachment = exchange.getIn(AttachmentMessage.class).getAttachmentObject("att");
- Assert.assertNotNull("attachment got lost", attachment);
+ assertNotNull(attachment, "attachment got lost");
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
exchange = new DefaultExchange(new DefaultCamelContext());
exchange.setProperty("foo", 1234);
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index f15308f..96cd3b2 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -24,9 +24,12 @@ import javax.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -34,12 +37,12 @@ import org.junit.Test;
public class MessageWithAttachmentRedeliveryIssueTest extends CamelTestSupport {
@Test
- public void testMessageWithAttachmentRedeliveryIssue() throws Exception {
+ void testMessageWithAttachmentRedeliveryIssue() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
template.send("direct:start", new Processor() {
@Override
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
exchange.getIn().setBody("Hello World");
exchange.getIn(AttachmentMessage.class).addAttachment("message1.xml", new DataHandler(new FileDataSource(new File("src/test/data/message1.xml"))));
exchange.getIn(AttachmentMessage.class).addAttachmentObject("message2.xml", new DefaultAttachment(new FileDataSource(new File("src/test/data/message2.xml"))));
@@ -49,24 +52,24 @@ public class MessageWithAttachmentRedeliveryIssueTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
AttachmentMessage msg = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getIn(AttachmentMessage.class);
- Assert.assertNotNull(msg);
+ assertNotNull(msg);
assertEquals("Hello World", msg.getBody());
- Assert.assertTrue(msg.hasAttachments());
+ assertTrue(msg.hasAttachments());
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
onException(Exception.class).maximumRedeliveries(3).redeliveryDelay(0);
from("direct:start")
.process(new Processor() {
private int counter;
@Override
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
if (counter++ < 2) {
throw new IllegalArgumentException("Forced");
}
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 1114129..c18454a 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -54,7 +54,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,10 +72,5 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
index 3c130e3..0b3261c 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit;
import com.google.zxing.BarcodeFormat;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.DataFormat;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
private static final Logger LOG = LoggerFactory.getLogger(BarcodeDataFormatCamelTest.class);
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
@@ -59,7 +59,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
* @throws Exception
*/
@Test
- public void testDefaultQRCode() throws Exception {
+ void testDefaultQRCode() throws Exception {
out.reset();
out.expectedBodiesReceived(MSG);
image.expectedMessageCount(1);
@@ -76,7 +76,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
* @throws Exception
*/
@Test
- public void testQRCodeWithModifiedSize() throws Exception {
+ void testQRCodeWithModifiedSize() throws Exception {
out.reset();
out.expectedBodiesReceived(MSG);
image.expectedMessageCount(1);
@@ -93,7 +93,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
* @throws Exception
*/
@Test
- public void testQRCodeWithJPEGType() throws Exception {
+ void testQRCodeWithJPEGType() throws Exception {
out.reset();
out.expectedBodiesReceived(MSG);
image.expectedMessageCount(1);
@@ -110,7 +110,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
* @throws Exception
*/
@Test
- public void testPDF417CodeWidthModifiedSizeAndImageType() throws Exception {
+ void testPDF417CodeWidthModifiedSizeAndImageType() throws Exception {
out.reset();
out.expectedBodiesReceived(MSG);
image.expectedMessageCount(1);
@@ -128,7 +128,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
* @see CAMEL-7681
*/
@Test
- public void testAZTECWidthModifiedSizeAndImageType() throws Exception {
+ void testAZTECWidthModifiedSizeAndImageType() throws Exception {
out.reset();
out.expectedBodiesReceived(MSG);
image.expectedMessageCount(1);
@@ -140,7 +140,7 @@ public class BarcodeDataFormatCamelTest extends BarcodeTestBase {
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
index 64f3557..3c31ea6 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
@@ -18,22 +18,19 @@ package org.apache.camel.dataformat.barcode;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+@TestInstance(Lifecycle.PER_CLASS)
public class BarcodeDataFormatSpringTest extends BarcodeDataFormatCamelTest {
-
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
+
@Override
public boolean isUseRouteBuilder() {
return false;
}
-
-
+
@Override
protected CamelContext createCamelContext() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/dataformat/barcode/barcodeDataformatSpring.xml");
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
index 9c4fced..a301ac1 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
@@ -16,21 +16,22 @@
*/
package org.apache.camel.dataformat.barcode;
+import java.io.IOException;
import java.util.Map;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
import com.google.zxing.EncodeHintType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * This class tests all Camel independend test cases
- * for {@link BarcodeDataFormat}.
+ * This class tests all Camel independent test cases for
+ * {@link BarcodeDataFormat}.
*/
public class BarcodeDataFormatTest {
@@ -38,173 +39,174 @@ public class BarcodeDataFormatTest {
* Test default constructor.
*/
@Test
- public final void testDefaultConstructor() {
- BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat();
- this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ final void testDefaultConstructor() throws IOException {
+ try (BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat()) {
+ this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ }
}
/**
* Test constructor with barcode format.
*/
@Test
- public final void testConstructorWithBarcodeFormat() {
- BarcodeDataFormat barcodeDataFormat =
- new BarcodeDataFormat(BarcodeFormat.AZTEC);
- this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeFormat.AZTEC, barcodeDataFormat.getParams());
+ final void testConstructorWithBarcodeFormat() throws IOException {
+ try (BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(BarcodeFormat.AZTEC)) {
+ this.checkParams(BarcodeParameters.IMAGE_TYPE, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeFormat.AZTEC, barcodeDataFormat.getParams());
+ }
}
/**
* Test constructor with size.
*/
@Test
- public final void testConstructorWithSize() {
- BarcodeDataFormat barcodeDataFormat =
- new BarcodeDataFormat(200, 250);
- this.checkParams(BarcodeParameters.IMAGE_TYPE, 200, 250, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ final void testConstructorWithSize() throws IOException {
+ try (BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(200, 250)) {
+ this.checkParams(BarcodeParameters.IMAGE_TYPE, 200, 250, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ }
}
/**
* Test constructor with image type.
*/
@Test
- public final void testConstructorWithImageType() {
- BarcodeDataFormat barcodeDataFormat =
- new BarcodeDataFormat(BarcodeImageType.JPG);
- this.checkParams(BarcodeImageType.JPG, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ final void testConstructorWithImageType() throws IOException {
+ try (BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(BarcodeImageType.JPG)) {
+ this.checkParams(BarcodeImageType.JPG, BarcodeParameters.WIDTH, BarcodeParameters.HEIGHT, BarcodeParameters.FORMAT, barcodeDataFormat.getParams());
+ }
}
/**
* Test constructor with all.
*/
@Test
- public final void testConstructorWithAll() {
- BarcodeDataFormat barcodeDataFormat =
- new BarcodeDataFormat(200, 250, BarcodeImageType.JPG, BarcodeFormat.AZTEC);
- this.checkParams(BarcodeImageType.JPG, 200, 250, BarcodeFormat.AZTEC, barcodeDataFormat.getParams());
+ final void testConstructorWithAll() throws IOException {
+ try (BarcodeDataFormat barcodeDataFormat = new BarcodeDataFormat(200, 250, BarcodeImageType.JPG, BarcodeFormat.AZTEC)) {
+ this.checkParams(BarcodeImageType.JPG, 200, 250, BarcodeFormat.AZTEC, barcodeDataFormat.getParams());
+ }
}
/**
* Test of optimizeHints method, of class BarcodeDataFormat.
*/
@Test
- public final void testOptimizeHints() {
- BarcodeDataFormat instance = new BarcodeDataFormat();
- assertTrue(instance.getWriterHintMap()
- .containsKey(EncodeHintType.ERROR_CORRECTION));
- assertTrue(instance.getReaderHintMap()
- .containsKey(DecodeHintType.TRY_HARDER));
+ final void testOptimizeHints() throws IOException {
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ assertTrue(instance.getWriterHintMap().containsKey(EncodeHintType.ERROR_CORRECTION));
+ assertTrue(instance.getReaderHintMap().containsKey(DecodeHintType.TRY_HARDER));
+ }
}
/**
* Test optimized hints for data matrix.
*/
@Test
- public final void testOptimizieHintsForDataMatrix() {
- BarcodeDataFormat instance = new BarcodeDataFormat(BarcodeFormat.DATA_MATRIX);
- assertTrue("data matrix shape hint incorrect.",
- instance.getWriterHintMap()
- .containsKey(EncodeHintType.DATA_MATRIX_SHAPE));
- assertTrue("try harder hint incorrect.",
- instance.getReaderHintMap()
- .containsKey(DecodeHintType.TRY_HARDER));
+ final void testOptimizieHintsForDataMatrix() throws IOException {
+ try (BarcodeDataFormat instance = new BarcodeDataFormat(BarcodeFormat.DATA_MATRIX)) {
+ assertTrue(instance.getWriterHintMap().containsKey(EncodeHintType.DATA_MATRIX_SHAPE), "data matrix shape hint incorrect.");
+ assertTrue(instance.getReaderHintMap().containsKey(DecodeHintType.TRY_HARDER), "try harder hint incorrect.");
+ }
}
/**
* Test re-optimize hints.
*/
@Test
- public final void testReOptimizeHints() {
+ final void testReOptimizeHints() throws IOException {
// DATA-MATRIX
- BarcodeDataFormat instance = new BarcodeDataFormat(BarcodeFormat.DATA_MATRIX);
- assertTrue(instance.getWriterHintMap()
- .containsKey(EncodeHintType.DATA_MATRIX_SHAPE));
- assertTrue(instance.getReaderHintMap()
- .containsKey(DecodeHintType.TRY_HARDER));
+ try (BarcodeDataFormat instance = new BarcodeDataFormat(BarcodeFormat.DATA_MATRIX)) {
+ assertTrue(instance.getWriterHintMap().containsKey(EncodeHintType.DATA_MATRIX_SHAPE));
+ assertTrue(instance.getReaderHintMap().containsKey(DecodeHintType.TRY_HARDER));
- // -> QR-CODE
- instance.setBarcodeFormat(BarcodeFormat.QR_CODE);
- assertFalse(instance.getWriterHintMap()
- .containsKey(EncodeHintType.DATA_MATRIX_SHAPE));
- assertTrue(instance.getReaderHintMap()
- .containsKey(DecodeHintType.TRY_HARDER));
+ // -> QR-CODE
+ instance.setBarcodeFormat(BarcodeFormat.QR_CODE);
+ assertFalse(instance.getWriterHintMap().containsKey(EncodeHintType.DATA_MATRIX_SHAPE));
+ assertTrue(instance.getReaderHintMap().containsKey(DecodeHintType.TRY_HARDER));
+ }
}
/**
* Test of addToHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testAddToHintMapEncodeHintTypeObject() {
+ final void testAddToHintMapEncodeHintTypeObject() throws IOException {
EncodeHintType hintType = EncodeHintType.MARGIN;
Object value = 10;
- BarcodeDataFormat instance = new BarcodeDataFormat();
- instance.addToHintMap(hintType, value);
- assertTrue(instance.getWriterHintMap().containsKey(hintType));
- assertEquals(instance.getWriterHintMap().get(hintType), value);
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ instance.addToHintMap(hintType, value);
+ assertTrue(instance.getWriterHintMap().containsKey(hintType));
+ assertEquals(instance.getWriterHintMap().get(hintType), value);
+ }
}
/**
* Test of addToHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testAddToHintMapDecodeHintTypeObject() {
+ final void testAddToHintMapDecodeHintTypeObject() throws IOException {
DecodeHintType hintType = DecodeHintType.CHARACTER_SET;
Object value = "UTF-8";
- BarcodeDataFormat instance = new BarcodeDataFormat();
- instance.addToHintMap(hintType, value);
- assertTrue(instance.getReaderHintMap().containsKey(hintType));
- assertEquals(instance.getReaderHintMap().get(hintType), value);
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ instance.addToHintMap(hintType, value);
+ assertTrue(instance.getReaderHintMap().containsKey(hintType));
+ assertEquals(instance.getReaderHintMap().get(hintType), value);
+ }
}
/**
* Test of removeFromHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testRemoveFromHintMapEncodeHintType() {
+ final void testRemoveFromHintMapEncodeHintType() throws IOException {
EncodeHintType hintType = EncodeHintType.ERROR_CORRECTION;
- BarcodeDataFormat instance = new BarcodeDataFormat();
- instance.removeFromHintMap(hintType);
- assertFalse(instance.getWriterHintMap().containsKey(hintType));
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ instance.removeFromHintMap(hintType);
+ assertFalse(instance.getWriterHintMap().containsKey(hintType));
+ }
}
/**
* Test of removeFromHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testRemoveFromHintMapDecodeHintType() {
+ final void testRemoveFromHintMapDecodeHintType() throws IOException {
DecodeHintType hintType = DecodeHintType.TRY_HARDER;
- BarcodeDataFormat instance = new BarcodeDataFormat();
- instance.removeFromHintMap(hintType);
- assertFalse(instance.getReaderHintMap().containsKey(hintType));
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ instance.removeFromHintMap(hintType);
+ assertFalse(instance.getReaderHintMap().containsKey(hintType));
+ }
}
/**
* Test of getParams method, of class BarcodeDataFormat.
*/
@Test
- public final void testGetParams() {
- BarcodeDataFormat instance = new BarcodeDataFormat();
- BarcodeParameters result = instance.getParams();
- assertNotNull(result);
+ final void testGetParams() throws IOException {
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ BarcodeParameters result = instance.getParams();
+ assertNotNull(result);
+ }
}
/**
* Test of getWriterHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testGetWriterHintMap() {
- BarcodeDataFormat instance = new BarcodeDataFormat();
- Map<EncodeHintType, Object> result = instance.getWriterHintMap();
- assertNotNull(result);
+ final void testGetWriterHintMap() throws IOException {
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ Map<EncodeHintType, Object> result = instance.getWriterHintMap();
+ assertNotNull(result);
+ }
}
/**
* Test of getReaderHintMap method, of class BarcodeDataFormat.
*/
@Test
- public final void testGetReaderHintMap() {
- BarcodeDataFormat instance = new BarcodeDataFormat();
- Map<DecodeHintType, Object> result = instance.getReaderHintMap();
- assertNotNull(result);
+ final void testGetReaderHintMap() throws IOException {
+ try (BarcodeDataFormat instance = new BarcodeDataFormat()) {
+ Map<DecodeHintType, Object> result = instance.getReaderHintMap();
+ assertNotNull(result);
+ }
}
/**
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
index e8bb986..2d391e9 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
@@ -36,10 +36,13 @@ import com.google.zxing.common.HybridBinarizer;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class BarcodeTestBase extends CamelTestSupport {
protected static final String MSG = "This is a testmessage!";