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 c2e8eca2df9d70965e282a9f807acd9cbb874f02
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 29 19:19:08 2020 +0200
[CAMEL-11807] Upgrade camel-ignite to junit5
---
components/camel-ignite/pom.xml | 6 +++---
.../camel/component/ignite/AbstractIgniteTest.java | 22 ++++++++++------------
.../ignite/IgniteCacheContinuousQueryTest.java | 15 ++++++---------
.../camel/component/ignite/IgniteCacheTest.java | 15 +++++++--------
.../camel/component/ignite/IgniteComputeTest.java | 17 ++++++++---------
.../camel/component/ignite/IgniteCreationTest.java | 15 +++++++--------
.../camel/component/ignite/IgniteEventsTest.java | 13 +++++--------
.../camel/component/ignite/IgniteIdGenTest.java | 13 +++++--------
.../component/ignite/IgniteMessagingTest.java | 13 +++++--------
.../camel/component/ignite/IgniteQueueTest.java | 13 +++++--------
.../camel/component/ignite/IgniteSetTest.java | 13 +++++--------
11 files changed, 66 insertions(+), 89 deletions(-)
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index c3bc28a..7a6792d 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -51,7 +51,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
@@ -62,8 +62,8 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
index a860b6f..15ef216 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/AbstractIgniteTest.java
@@ -16,23 +16,22 @@
*/
package org.apache.camel.component.ignite;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.UUID;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.ignite.Ignite;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.EventType;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
-public abstract class AbstractIgniteTest extends CamelTestSupport {
+public abstract class AbstractIgniteTest extends CamelTestSupport implements
BeforeEachCallback {
/** Ip finder for TCP discovery. */
private static final TcpDiscoveryIpFinder LOCAL_IP_FINDER = new
TcpDiscoveryVmIpFinder(false) {
@@ -49,12 +48,11 @@ public abstract class AbstractIgniteTest extends
CamelTestSupport {
private Ignite ignite;
- @Rule
- public TestRule watcher = new TestWatcher() {
- protected void starting(Description description) {
- resourceUid = description.getMethodName() +
UUID.randomUUID().toString();
- }
- };
+ @Override
+ public void beforeEach(ExtensionContext context) throws Exception {
+ super.beforeEach(context);
+ resourceUid = context.getTestMethod().map(Method::getName).orElse("")
+ UUID.randomUUID().toString();
+ }
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
index 6708d47..5ebe4bc 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheContinuousQueryTest.java
@@ -38,9 +38,11 @@ import
org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteCacheContinuousQueryTest extends AbstractIgniteTest
implements Serializable {
private static final long serialVersionUID = 1L;
@@ -187,12 +189,7 @@ public class IgniteCacheContinuousQueryTest extends
AbstractIgniteTest implement
return answer;
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void deleteCaches() {
for (String cacheName : ImmutableSet.<String> of("testcontinuous1",
"testcontinuous2", "testcontinuous3")) {
IgniteCache<?, ?> cache = ignite().cache(cacheName);
@@ -203,7 +200,7 @@ public class IgniteCacheContinuousQueryTest extends
AbstractIgniteTest implement
}
}
- @After
+ @AfterEach
public void stopAllRoutes() throws Exception {
for (Route route : context.getRoutes()) {
if (context.getRouteController().getRouteStatus(route.getId()) !=
ServiceStatus.Started) {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java
index fc951dc..389469e 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCacheTest.java
@@ -34,9 +34,13 @@ import org.apache.ignite.cache.query.Query;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteCacheTest extends AbstractIgniteTest {
@Override
@@ -222,12 +226,7 @@ public class IgniteCacheTest extends AbstractIgniteTest {
Assertions.assertThat(result).isNull();
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void deleteCaches() {
IgniteCache<?, ?> cache = ignite().cache(resourceUid);
if (cache != null) {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
index be5f3d8..b053bca 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteComputeTest.java
@@ -32,9 +32,13 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
import org.apache.ignite.events.EventType;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteComputeTest extends AbstractIgniteTest {
private static final List<Ignite> ADDITIONAL_INSTANCES =
Lists.newArrayList();
@@ -177,16 +181,11 @@ public class IgniteComputeTest extends AbstractIgniteTest
{
Assertions.assertThat(result).isEqualTo("hello Camel1hello Camel2hello
Camel3");
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
private void startAdditionalGridInstance() {
ADDITIONAL_INSTANCES.add(Ignition.start(createConfiguration()));
}
- @After
+ @AfterEach
public void stopAdditionalIgniteInstances() {
for (Ignite ignite : ADDITIONAL_INSTANCES) {
ignite.close();
@@ -194,7 +193,7 @@ public class IgniteComputeTest extends AbstractIgniteTest {
ADDITIONAL_INSTANCES.clear();
}
- @After
+ @AfterEach
public void stopRemoteListeners() {
for (UUID uuid : LISTENERS) {
ignite().events().stopRemoteListen(uuid);
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCreationTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCreationTest.java
index 0741629..fa06037 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCreationTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteCreationTest.java
@@ -19,9 +19,13 @@ package org.apache.camel.component.ignite;
import org.apache.camel.component.ignite.cache.IgniteCacheComponent;
import org.apache.ignite.Ignite;
import org.apache.ignite.Ignition;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteCreationTest extends AbstractIgniteTest {
private Ignite ignite;
@@ -42,12 +46,7 @@ public class IgniteCreationTest extends AbstractIgniteTest {
assertNotNull(ignite());
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void stopUserManagedIgnite() {
if (ignite != null) {
Ignition.stop(ignite.name(), true);
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
index 77e6f79..eac3824 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
@@ -34,9 +34,11 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteEventsTest extends AbstractIgniteTest {
@Override
@@ -119,12 +121,7 @@ public class IgniteEventsTest extends AbstractIgniteTest {
return eventTypes;
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void stopAllRoutes() throws Exception {
for (Route route : context.getRoutes()) {
if (context.getRouteController().getRouteStatus(route.getId()) !=
ServiceStatus.Started) {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteIdGenTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteIdGenTest.java
index ed8bd64..02327b1 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteIdGenTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteIdGenTest.java
@@ -21,9 +21,11 @@ import
org.apache.camel.component.ignite.idgen.IgniteIdGenEndpoint;
import org.apache.camel.component.ignite.idgen.IgniteIdGenOperation;
import org.apache.ignite.IgniteAtomicSequence;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteIdGenTest extends AbstractIgniteTest {
@Override
@@ -74,12 +76,7 @@ public class IgniteIdGenTest extends AbstractIgniteTest {
Assertions.assertThat(endpoint.getBatchSize());
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void deleteSets() {
IgniteAtomicSequence seq = ignite().atomicSequence(resourceUid, 0,
false);
if (seq != null) {
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteMessagingTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteMessagingTest.java
index f5b460e..b6e3579 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteMessagingTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteMessagingTest.java
@@ -32,11 +32,13 @@ import org.apache.camel.Processor;
import org.apache.camel.component.ignite.messaging.IgniteMessagingComponent;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import static org.awaitility.Awaitility.await;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteMessagingTest extends AbstractIgniteTest implements
Serializable {
private static final long serialVersionUID = 3967738538216977749L;
@@ -145,7 +147,7 @@ public class IgniteMessagingTest extends AbstractIgniteTest
implements Serializa
});
}
- @After
+ @AfterEach
public void stopMessageListener() {
if (uuid == null) {
return;
@@ -155,11 +157,6 @@ public class IgniteMessagingTest extends
AbstractIgniteTest implements Serializa
uuid = null;
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
private Processor storeBodyInListProcessor(final List<Object> list) {
return new Processor() {
@Override
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteQueueTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteQueueTest.java
index 254fdd1..b910b89 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteQueueTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteQueueTest.java
@@ -34,9 +34,11 @@ import
org.apache.camel.component.ignite.queue.IgniteQueueOperation;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteQueueTest extends AbstractIgniteTest {
@Override
@@ -244,12 +246,7 @@ public class IgniteQueueTest extends AbstractIgniteTest {
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void deleteQueue() {
ignite().queue(resourceUid, 0, null).close();
}
diff --git
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteSetTest.java
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteSetTest.java
index 2db63a4..1ba4c5b 100644
---
a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteSetTest.java
+++
b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteSetTest.java
@@ -29,9 +29,11 @@ import
org.apache.camel.component.ignite.set.IgniteSetOperation;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class IgniteSetTest extends AbstractIgniteTest {
@Override
@@ -169,12 +171,7 @@ public class IgniteSetTest extends AbstractIgniteTest {
Assertions.assertThat(igniteEndpoint.getConfiguration()).isEqualTo(configuration);
}
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @After
+ @AfterEach
public void deleteSet() {
ignite().set(resourceUid, null).close();
}
