You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/06/30 14:08:15 UTC
[camel] 06/23: [CAMEL-11807] Upgrade camel-infinispan to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 35582ed97d470c7dca7428acd70e661a5226a3d3
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 30 08:59:17 2020 +0200
[CAMEL-11807] Upgrade camel-infinispan to junit5
---
components/camel-infinispan/pom.xml | 13 +++++++++----
.../infinispan/InfinispanAsyncConsumerTest.java | 2 +-
.../infinispan/InfinispanClusterTestSupport.java | 6 +++---
.../infinispan/InfinispanClusteredConsumerTest.java | 12 +++++++-----
.../infinispan/InfinispanComponentTest.java | 6 ++++--
.../infinispan/InfinispanConfigurationIT.java | 16 ++++++++--------
.../InfinispanConsumerEntryCreatedTest.java | 2 +-
.../InfinispanConsumerEntryRemovedTest.java | 2 +-
.../InfinispanConsumerEntryUpdatedTest.java | 2 +-
.../InfinispanConsumerEntryVisitedTest.java | 2 +-
.../infinispan/InfinispanContinuousQueryIT.java | 6 ++++--
.../InfinispanLocalConsumerCustomListenerIT.java | 2 +-
.../infinispan/InfinispanLocalConsumerTest.java | 4 +++-
.../component/infinispan/InfinispanProducerTest.java | 6 +++++-
.../infinispan/InfinispanRemoteProducerTest.java | 10 ++++++----
.../infinispan/InfinispanRemoteQueryProducerIT.java | 8 ++++++--
.../infinispan/InfinispanSyncConsumerTest.java | 2 +-
.../component/infinispan/InfinispanTestSupport.java | 6 +++---
.../infinispan/MyEmbeddedCustomListener.java | 2 +-
.../policy/InfinispanRemoteRoutePolicyTest.java | 4 ++--
.../policy/InfinispanRoutePolicyTestBase.java | 14 ++++++++------
...spanLocalAggregationRepositoryOperationsTest.java | 20 ++++++++++----------
.../InfinispanLocalAggregationRepositoryTest.java | 4 ++--
.../InfinispanRemoteAggregationRepositoryTest.java | 8 ++++----
.../InfinispanDefaultIdempotentRepositoryTest.java | 2 +-
.../idempotent/InfinispanIdempotentRepositoryIT.java | 14 ++++++++------
.../InfinispanIdempotentRepositoryTest.java | 10 +++++-----
.../SpringInfinispanIdempotentRepositoryIT.java | 6 ++++--
.../apache/camel/component/infinispan/util/Wait.java | 4 ++--
29 files changed, 112 insertions(+), 83 deletions(-)
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index 91e5eb8..0171ec0 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -70,12 +70,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>
@@ -126,8 +126,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
index cc78275..9ae9866 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanAsyncConsumerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.infinispan;
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 InfinispanAsyncConsumerTest extends InfinispanTestSupport {
@Test
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
index 0c67e08..c9e72d3 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusterTestSupport.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
import java.util.List;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.Cache;
import org.infinispan.commons.api.BasicCacheContainer;
import org.infinispan.commons.time.TimeService;
@@ -31,7 +31,7 @@ import org.infinispan.test.TestDataSCI;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.TransactionMode;
import org.infinispan.util.ControlledTimeService;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
public class InfinispanClusterTestSupport extends CamelTestSupport {
@@ -83,7 +83,7 @@ public class InfinispanClusterTestSupport extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
ClusteredCacheSupport cluster = new ClusteredCacheSupport(CacheMode.DIST_SYNC, false, 2);
try {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
index 1fa819b..17354f4 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.infinispan.commons.test.TestResourceTracker;
import org.infinispan.distribution.MagicKey;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
public class InfinispanClusteredConsumerTest extends InfinispanClusterTestSupport {
@@ -37,12 +39,12 @@ public class InfinispanClusteredConsumerTest extends InfinispanClusterTestSuppor
@EndpointInject("mock:resultExpired")
private MockEndpoint mockResultExpiredEvents;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
TestResourceTracker.testStarted(InfinispanClusteredConsumerTest.class.getName());
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
TestResourceTracker.testFinished(InfinispanClusteredConsumerTest.class.getName());
}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
index 825476c..f81ea0a 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
@@ -18,9 +18,11 @@ package org.apache.camel.component.infinispan;
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.hamcrest.core.Is.is;
public class InfinispanComponentTest extends InfinispanTestSupport {
private final String cacheName = "default";
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationIT.java
index 8ec59ed..07d2ebb 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationIT.java
@@ -24,25 +24,25 @@ import org.infinispan.configuration.global.GlobalConfiguration;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.jgroups.util.UUID;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InfinispanConfigurationIT {
private RemoteCacheManager manager = new RemoteCacheManager();
- @Before
+ @BeforeEach
public void setupCache() {
RemoteCache<Object, Object> cache = manager.administration().getOrCreateCache("misc_cache", (String) null);
assertNotNull(cache);
}
- @After
+ @AfterEach
public void cleanupCache() {
manager.close();
}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
index 6a88d22..efb4917 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
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;
public class InfinispanConsumerEntryCreatedTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
index 1a240de..a058869 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
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;
public class InfinispanConsumerEntryRemovedTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
index 819a314..2957adf 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
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;
public class InfinispanConsumerEntryUpdatedTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
index 9931b80..df12861 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
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;
public class InfinispanConsumerEntryVisitedTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
index 3e51dbd7..ceea98a 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
@@ -37,10 +37,12 @@ import org.infinispan.query.dsl.Query;
import org.infinispan.query.dsl.QueryFactory;
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.infinispan.util.UserUtils.CQ_USERS;
import static org.apache.camel.component.infinispan.util.UserUtils.createKey;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InfinispanContinuousQueryIT extends CamelTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
index 77420c7..659d22c 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
@@ -20,7 +20,7 @@ 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;
public class InfinispanLocalConsumerCustomListenerIT extends InfinispanTestSupport {
private static final String CUSTOM_CACHE_NAME = "customCacheName";
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
index 523bbe4..1dff3f6 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.TimeUnit;
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.assertNull;
public class InfinispanLocalConsumerTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index f445dad..68e0c04 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -29,9 +29,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.infinispan.util.Condition;
import org.infinispan.Cache;
import org.infinispan.stats.Stats;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.infinispan.util.Wait.waitFor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InfinispanProducerTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
index 7574483..dcf56fd 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.component.infinispan;
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.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("start a local server with: ./bin/standalone.sh")
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@Disabled("start a local server with: ./bin/standalone.sh")
public class InfinispanRemoteProducerTest extends CamelTestSupport {
@Test
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
index 6b9eb57..3ac807e 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.BindToRegistry;
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.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
@@ -37,13 +37,17 @@ import org.infinispan.protostream.sampledomain.marshallers.GenderMarshaller;
import org.infinispan.protostream.sampledomain.marshallers.UserMarshaller;
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.infinispan.InfinispanConstants.OPERATION;
import static org.apache.camel.component.infinispan.InfinispanConstants.QUERY_BUILDER;
import static org.apache.camel.component.infinispan.util.UserUtils.USERS;
import static org.apache.camel.component.infinispan.util.UserUtils.createKey;
import static org.apache.camel.component.infinispan.util.UserUtils.hasUser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InfinispanRemoteQueryProducerIT extends CamelTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
index 733466d..63e253b 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.infinispan;
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;
public class InfinispanSyncConsumerTest extends InfinispanTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
index 63dea63..a35d8ad 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.infinispan;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.BasicCacheContainer;
import org.infinispan.commons.time.TimeService;
@@ -26,7 +26,7 @@ import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.util.ControlledTimeService;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
public class InfinispanTestSupport extends CamelTestSupport {
protected static final String KEY_ONE = "keyOne";
@@ -39,7 +39,7 @@ public class InfinispanTestSupport extends CamelTestSupport {
protected ControlledTimeService ts;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
basicCacheContainer = new DefaultCacheManager(new GlobalConfigurationBuilder().defaultCacheName("default").build(), new ConfigurationBuilder().build());
basicCacheContainer.start();
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/MyEmbeddedCustomListener.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/MyEmbeddedCustomListener.java
index 01a9121..a9a89fd 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/MyEmbeddedCustomListener.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/MyEmbeddedCustomListener.java
@@ -21,7 +21,7 @@ import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
import org.infinispan.notifications.cachelistener.event.CacheEntryEvent;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@Listener(sync = true)
public class MyEmbeddedCustomListener extends InfinispanEmbeddedCustomListener {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRemoteRoutePolicyTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRemoteRoutePolicyTest.java
index 77e3465..574c220 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRemoteRoutePolicyTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRemoteRoutePolicyTest.java
@@ -21,9 +21,9 @@ import java.util.Properties;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.api.BasicCacheContainer;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-@Ignore("Disabled as it requires a transactional cache")
+@Disabled("Disabled as it requires a transactional cache")
public class InfinispanRemoteRoutePolicyTest extends InfinispanRoutePolicyTestBase {
@Override
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java
index f222f9d..9ddbd48 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java
@@ -22,8 +22,10 @@ import org.apache.camel.model.Model;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.support.service.ServiceHelper;
import org.infinispan.commons.api.BasicCacheContainer;
-import org.junit.Assert;
-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;
abstract class InfinispanRoutePolicyTestBase {
private static final String CACHE_NAME = "camel-route-policy";
@@ -63,8 +65,8 @@ abstract class InfinispanRoutePolicyTestBase {
context.getExtension(Model.class).addRouteDefinition(RouteDefinition.fromUri("direct:r2").routePolicy(policy2).to("mock:p2"));
- Assert.assertTrue(policy1.isLeader());
- Assert.assertFalse(policy2.isLeader());
+ assertTrue(policy1.isLeader());
+ assertFalse(policy2.isLeader());
policy1.shutdown();
@@ -72,8 +74,8 @@ abstract class InfinispanRoutePolicyTestBase {
Thread.sleep(250);
}
- Assert.assertFalse(policy1.isLeader());
- Assert.assertTrue(policy2.isLeader());
+ assertFalse(policy1.isLeader());
+ assertTrue(policy2.isLeader());
} finally {
ServiceHelper.stopService(context);
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
index 7cf7dd5..afd7f7a 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
@@ -25,15 +25,15 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultExchangeHolder;
import org.infinispan.configuration.cache.Configuration;
import org.infinispan.configuration.cache.ConfigurationBuilder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unite test for {@link InfinispanLocalAggregationRepository}
@@ -43,7 +43,7 @@ public class InfinispanLocalAggregationRepositoryOperationsTest {
private static InfinispanLocalAggregationRepository aggregationRepository;
private CamelContext camelContext = new DefaultCamelContext();
- @BeforeClass
+ @BeforeAll
public static void starting() throws Exception {
Configuration conf = new ConfigurationBuilder().build();
aggregationRepository = new InfinispanLocalAggregationRepository();
@@ -51,7 +51,7 @@ public class InfinispanLocalAggregationRepositoryOperationsTest {
aggregationRepository.start();
}
- @AfterClass
+ @AfterAll
public static void stopping() throws Exception {
aggregationRepository.stop();
}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
index 1f48dc4..95f58a1 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
@@ -23,10 +23,10 @@ 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.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.configuration.cache.Configuration;
import org.infinispan.configuration.cache.ConfigurationBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InfinispanLocalAggregationRepositoryTest extends CamelTestSupport {
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepositoryTest.java
index f1f4462..8ebf039 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepositoryTest.java
@@ -23,11 +23,11 @@ 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.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("start a local server with: ./bin/standalone.sh")
+@Disabled("start a local server with: ./bin/standalone.sh")
public class InfinispanRemoteAggregationRepositoryTest extends CamelTestSupport {
private static final String MOCK_GOTCHA = "mock:gotcha";
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
index e1ecfdd..7e61149 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
@@ -20,7 +20,7 @@ import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.global.GlobalConfiguration;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.jgroups.util.Util.assertFalse;
import static org.jgroups.util.Util.assertTrue;
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryIT.java
index 69457ee..2e84033 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryIT.java
@@ -21,25 +21,27 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class InfinispanIdempotentRepositoryIT extends CamelTestSupport {
private RemoteCacheManager manager = new RemoteCacheManager();
- @Before
+ @BeforeEach
public void setupCache() {
RemoteCache<Object, Object> cache = manager.administration().getOrCreateCache("idempotent", (String) null);
assertNotNull(cache);
}
- @After
+ @AfterEach
public void cleanupCache() {
manager.close();
}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
index 8e41501..07551c3 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
@@ -23,9 +23,9 @@ import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.global.GlobalConfiguration;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.jgroups.util.Util.assertFalse;
import static org.jgroups.util.Util.assertTrue;
@@ -36,7 +36,7 @@ public class InfinispanIdempotentRepositoryTest {
protected InfinispanIdempotentRepository idempotentRepository;
protected String cacheName = "default";
- @Before
+ @BeforeEach
public void setUp() {
GlobalConfiguration global = new GlobalConfigurationBuilder().defaultCacheName("default").jmx().domain("test").build();
Configuration conf = new ConfigurationBuilder().build();
@@ -45,7 +45,7 @@ public class InfinispanIdempotentRepositoryTest {
idempotentRepository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, cacheName);
}
- @After
+ @AfterEach
public void tearDown() {
basicCacheContainer.stop();
}
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
index de2bd83..fb3df2f 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/SpringInfinispanIdempotentRepositoryIT.java
@@ -19,15 +19,17 @@ package org.apache.camel.component.infinispan.processor.idempotent;
import java.util.UUID;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.marshall.MarshallerUtil;
import org.infinispan.query.remote.client.impl.MarshallerRegistration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class SpringInfinispanIdempotentRepositoryIT extends CamelSpringTestSupport {
@Override
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
index e0026f7..f986b28 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/util/Wait.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.infinispan.util;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public final class Wait {
@@ -47,7 +47,7 @@ public final class Wait {
}
Thread.sleep(sleepDuration);
}
- assertTrue("The condition was not satisfied after " + timeout + " ms", ec.isSatisfied());
+ assertTrue(ec.isSatisfied(), "The condition was not satisfied after " + timeout + " ms");
} catch (Exception e) {
throw new RuntimeException("Unexpected!", e);
}