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 0cc3c949eaa83d781c8498c22ce483bd8077224c
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:57:57 2020 +0200
[CAMEL-11807] Upgrade camel-jcache to junit5
---
components/camel-jcache/pom.xml | 8 +++----
.../jcache/JCacheComponentTestSupport.java | 2 +-
.../component/jcache/JCacheConfigurationTest.java | 4 +++-
.../camel/component/jcache/JCacheConsumerTest.java | 2 +-
.../camel/component/jcache/JCacheManagerTest.java | 12 +++++-----
.../component/jcache/JCacheProducerClearTest.java | 4 +++-
.../component/jcache/JCacheProducerGetTest.java | 13 +++++++----
.../component/jcache/JCacheProducerInvokeTest.java | 5 ++++-
.../component/jcache/JCacheProducerPutTest.java | 10 ++++++---
.../component/jcache/JCacheProducerRemoveTest.java | 5 ++++-
.../jcache/JCacheProducerReplaceTest.java | 14 +++++++-----
.../policy/CacheManagerFromRegistryTest.java | 9 +++++---
.../jcache/policy/JCachePolicyProcessorTest.java | 6 ++++-
.../component/jcache/policy/JCachePolicyTest.java | 5 ++++-
.../jcache/policy/JCachePolicyTestBase.java | 10 ++++-----
.../jcache/policy/SpringJCachePolicyTest.java | 21 +++++++++--------
.../JCacheAggregationRepositoryRoutesTest.java | 2 +-
.../aggregate/JCacheAggregationRepositoryTest.java | 26 +++++++++++++---------
.../JCacheAggregationRepositoryTestSupport.java | 2 +-
.../idempotent/JCacheIdempotentRepositoryTest.java | 15 ++++++++-----
20 files changed, 110 insertions(+), 65 deletions(-)
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index b9658ec..8b615b9 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -57,12 +57,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</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>
<dependency>
@@ -82,8 +82,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
index c8e334c..931df55 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
@@ -22,7 +22,7 @@ import java.util.UUID;
import javax.cache.Cache;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
index 658d37a..9d83c2d 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
@@ -36,7 +36,9 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JCacheConfigurationTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
index 3881024..49f3598 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
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 JCacheConsumerTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
index aad98d7..ca2f784 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheManagerTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.camel.component.jcache;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class JCacheManagerTest extends JCacheComponentTestSupport {
@@ -31,14 +34,13 @@ public class JCacheManagerTest extends
JCacheComponentTestSupport {
manager.close();
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void testCacheCreationFailure() throws Exception {
JCacheConfiguration conf = new JCacheConfiguration();
conf.setCacheName(randomString());
conf.setCreateCacheIfNotExists(false);
- new JCacheManager<>(conf).getCache();
-
- fail("Should have raised IllegalStateException");
+ assertThrows(IllegalStateException.class,
+ () -> new JCacheManager<>(conf).getCache());
}
}
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java
index dfb5549..65fe705 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerClearTest.java
@@ -22,7 +22,9 @@ import java.util.Map;
import javax.cache.Cache;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class JCacheProducerClearTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java
index 87f5665..18dc9d6 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerGetTest.java
@@ -25,9 +25,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+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;
public class JCacheProducerGetTest extends JCacheComponentTestSupport {
@@ -52,7 +57,7 @@ public class JCacheProducerGetTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
@@ -81,7 +86,7 @@ public class JCacheProducerGetTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
@@ -114,7 +119,7 @@ public class JCacheProducerGetTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java
index c525979..01db7cc 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerInvokeTest.java
@@ -29,7 +29,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
public class JCacheProducerInvokeTest extends JCacheComponentTestSupport {
private static final EntryProcessor<Object, Object, Object>
ENTRY_PROCESSOR = new EntryProcessor<Object, Object, Object>() {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java
index bf17008..daea493 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerPutTest.java
@@ -25,7 +25,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JCacheProducerPutTest extends JCacheComponentTestSupport {
@@ -85,7 +89,7 @@ public class JCacheProducerPutTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
@@ -115,7 +119,7 @@ public class JCacheProducerPutTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java
index 4d59275..7f67f9e 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerRemoveTest.java
@@ -23,7 +23,10 @@ import javax.cache.Cache;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JCacheProducerRemoveTest extends JCacheComponentTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java
index 87c1050..7fc1309 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheProducerReplaceTest.java
@@ -25,7 +25,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JCacheProducerReplaceTest extends JCacheComponentTestSupport {
@Test
@@ -51,7 +55,7 @@ public class JCacheProducerReplaceTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val1);
}
});
@@ -85,7 +89,7 @@ public class JCacheProducerReplaceTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val1);
}
});
@@ -119,7 +123,7 @@ public class JCacheProducerReplaceTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val1);
}
});
@@ -151,7 +155,7 @@ public class JCacheProducerReplaceTest extends
JCacheComponentTestSupport {
mock.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
- assertNotNull("body", exchange.getIn().getBody());
+ assertNotNull(exchange.getIn().getBody(), "body");
return exchange.getIn().getBody().equals(val);
}
});
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
index 453de34..310bddb 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
@@ -24,8 +24,11 @@ import javax.cache.Caching;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
//This test requires a registered CacheManager, but the others do not.
public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
@@ -66,7 +69,7 @@ public class CacheManagerFromRegistryTest extends
JCachePolicyTestBase {
}
@Override
- @After
+ @AfterEach
public void after() {
super.after();
CacheManager cacheManager =
Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null);
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessorTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessorTest.java
index dd813a1..247442d 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessorTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyProcessorTest.java
@@ -26,10 +26,14 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+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;
+
public class JCachePolicyProcessorTest extends JCachePolicyTestBase {
private static final Logger LOG =
LoggerFactory.getLogger(JCachePolicyProcessorTest.class);
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTest.java
index 682326b..74f758d 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTest.java
@@ -27,7 +27,10 @@ import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
import org.apache.camel.builder.RouteBuilder;
-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.assertNull;
public class JCachePolicyTest extends JCachePolicyTestBase {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
index 8cd1d7d..b28d0a5 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
@@ -22,13 +22,13 @@ import javax.cache.Cache;
import javax.cache.CacheManager;
import javax.cache.Caching;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public class JCachePolicyTestBase extends CamelTestSupport {
- @Before
+ @BeforeEach
public void before() {
//Setup mock
getMockEndpoint("mock:value").whenAnyExchangeReceived(e ->
@@ -48,7 +48,7 @@ public class JCachePolicyTestBase extends CamelTestSupport {
return "value-" + key;
}
- @After
+ @AfterEach
public void after() {
//The RouteBuilder code is called for every test, so we destroy cache
after each test
CacheManager cacheManager =
Caching.getCachingProvider().getCacheManager();
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
index a806a5c..09ec555 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
@@ -19,15 +19,18 @@ package org.apache.camel.component.jcache.policy;
import javax.cache.Cache;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.apache.camel.component.jcache.policy.JCachePolicyTestBase.*;
+import static
org.apache.camel.component.jcache.policy.JCachePolicyTestBase.generateValue;
+import static
org.apache.camel.component.jcache.policy.JCachePolicyTestBase.lookupCache;
+import static
org.apache.camel.component.jcache.policy.JCachePolicyTestBase.randomString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SpringJCachePolicyTest extends CamelSpringTestSupport {
@@ -36,17 +39,17 @@ public class SpringJCachePolicyTest extends
CamelSpringTestSupport {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.xml");
}
- @BeforeClass
+ @BeforeAll
public static void beforeAll() {
System.setProperty("hazelcast.config",
"classpath:org/apache/camel/component/jcache/policy/hazelcast-spring.xml");
}
- @AfterClass
+ @AfterAll
public static void afterAll() {
System.clearProperty("hazelcast.config");
}
- @Before
+ @BeforeEach
public void before() {
//reset mock
MockEndpoint mock = getMockEndpoint("mock:spring");
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java
index 02f7fdc..d5aca14 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryRoutesTest.java
@@ -23,7 +23,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 JCacheAggregationRepositoryRoutesTest extends
JCacheAggregationRepositoryTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTest.java
index df23914..96952a4 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTest.java
@@ -18,11 +18,15 @@ package
org.apache.camel.component.jcache.processor.aggregate;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepositoryTestSupport {
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void nonOptimisticRepoFailsOnOptimisticAdd() throws Exception {
JCacheAggregationRepository repo = createRepository(false);
repo.start();
@@ -30,22 +34,22 @@ public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepository
try {
Exchange oldOne = new DefaultExchange(context());
Exchange newOne = new DefaultExchange(context());
- repo.add(context(), "myKey", oldOne, newOne);
-
- fail("OptimisticLockingException should has been thrown");
+ assertThrows(UnsupportedOperationException.class,
+ () -> repo.add(context(), "myKey", oldOne, newOne));
} finally {
repo.stop();
}
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void optimisticRepoFailsForNonOptimisticAdd() throws Exception {
JCacheAggregationRepository repo = createRepository(true);
repo.start();
try {
Exchange ex = new DefaultExchange(context());
- repo.add(context(), "myKey", ex);
+ assertThrows(UnsupportedOperationException.class,
+ () -> repo.add(context(), "myKey", ex));
} finally {
repo.stop();
}
@@ -65,7 +69,7 @@ public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepository
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);
@@ -92,7 +96,7 @@ public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepository
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);
@@ -121,7 +125,7 @@ public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepository
repoOne.add(context(), key, null, ex);
Exchange gotEx = repoTwo.get(context(), key);
- assertEquals("ex and gotEx should be equal",
gotEx.getIn().getBody(), ex.getIn().getBody());
+ assertEquals(gotEx.getIn().getBody(), ex.getIn().getBody(), "ex
and gotEx should be equal");
} finally {
repoOne.stop();
repoTwo.stop();
@@ -144,7 +148,7 @@ public class JCacheAggregationRepositoryTest extends
JCacheAggregationRepository
repoOne.add(context(), key, ex);
Exchange gotEx = repoTwo.get(context(), key);
- assertEquals("ex and gotEx should be equal",
gotEx.getIn().getBody(), ex.getIn().getBody());
+ assertEquals(gotEx.getIn().getBody(), ex.getIn().getBody(), "ex
and gotEx should be equal");
} finally {
repoOne.stop();
repoTwo.stop();
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java
index 426787b..ceb04ea 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepositoryTestSupport.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.jcache.processor.aggregate;
import org.apache.camel.component.jcache.JCacheConfiguration;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
class JCacheAggregationRepositoryTestSupport extends CamelTestSupport {
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java
index 2c85d5e..f3e56bf 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/processor/idempotent/JCacheIdempotentRepositoryTest.java
@@ -21,13 +21,16 @@ import javax.cache.Cache;
import org.apache.camel.component.jcache.JCacheConfiguration;
import org.apache.camel.component.jcache.JCacheHelper;
import org.apache.camel.component.jcache.JCacheManager;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class JCacheIdempotentRepositoryTest extends CamelTestSupport {
private static final Logger LOGGER =
LoggerFactory.getLogger(JCacheIdempotentRepositoryTest.class);
@@ -36,7 +39,7 @@ public class JCacheIdempotentRepositoryTest extends
CamelTestSupport {
private JCacheIdempotentRepository repository;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
cacheManager = JCacheHelper.createManager(new
JCacheConfiguration("idempotent-repository"));
cache = cacheManager.getCache();
@@ -47,7 +50,7 @@ public class JCacheIdempotentRepositoryTest extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
repository.stop();
cacheManager.close();
