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 5ae3a1cdacfbe76be69c248c79d1e622a90c46c1
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 10:30:53 2020 +0200
[CAMEL-11807] Upgrade camel-jgroups to junit5
---
components/camel-jgroups/pom.xml | 8 ++++----
.../camel/component/jgroups/CamelJGroupsReceiverTest.java | 14 ++++++++------
.../camel/component/jgroups/JGroupsClusterRouteTest.java | 9 ++++-----
.../apache/camel/component/jgroups/JGroupsClusterTest.java | 10 +++++-----
.../camel/component/jgroups/JGroupsComponentTest.java | 11 +++++++----
.../jgroups/JGroupsComponentWithChannelPropertiesTest.java | 11 +++++++----
.../camel/component/jgroups/JGroupsConsumerTest.java | 8 ++++----
.../camel/component/jgroups/JGroupsEndpointTest.java | 7 +++++--
.../camel/component/jgroups/JGroupsProducerTest.java | 11 +++++++----
.../camel/component/jgroups/JGroupsSharedChannelTest.java | 4 ++--
.../component/jgroups/cluster/JGroupsLockMasterTest.java | 10 ++++++----
11 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 9d53592..b0a2352 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -52,18 +52,18 @@
<!-- Testing dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
index d071bea..61e47b8 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/CamelJGroupsReceiverTest.java
@@ -18,16 +18,17 @@ package org.apache.camel.component.jgroups;
import org.apache.camel.Processor;
import org.jgroups.Message;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.BDDMockito.willThrow;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CamelJGroupsReceiverTest {
// Fixtures
@@ -43,14 +44,15 @@ public class CamelJGroupsReceiverTest {
// Tests
- @Test(expected = JGroupsException.class)
+ @Test
public void shouldHandleProcessingException() throws Exception {
// Given
willThrow(Exception.class).given(processor).process(ArgumentMatchers.isNull());
Message message = new Message(null, "someMessage");
message.setSrc(null);
// When
- receiver.receive(message);
+ assertThrows(JGroupsException.class,
+ () -> receiver.receive(message));
}
}
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
index e5a9e1a..87113dc 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
@@ -20,16 +20,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.util.UUID.randomUUID;
import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.camel.component.jgroups.JGroupsExpressions.delayIfContextNotStarted;
import static
org.apache.camel.component.jgroups.JGroupsFilters.dropNonCoordinatorViews;
-public class JGroupsClusterRouteTest extends Assert {
+public class JGroupsClusterRouteTest {
// Routing fixtures
@@ -54,7 +53,7 @@ public class JGroupsClusterRouteTest extends Assert {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
firstCamelContext = new DefaultCamelContext();
firstCamelContext.addRoutes(new Builder());
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
index 04be06d..6b0b15d 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterTest.java
@@ -20,15 +20,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.lang.String.format;
import static java.util.UUID.randomUUID;
import static
org.apache.camel.component.jgroups.JGroupsFilters.dropNonCoordinatorViews;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-public class JGroupsClusterTest extends Assert {
+public class JGroupsClusterTest {
// Tested state
@@ -63,7 +63,7 @@ public class JGroupsClusterTest extends Assert {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
firstCamelContext = new DefaultCamelContext();
firstCamelContext.setName("firstNode");
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java
index ac6a583..9f908df 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentTest.java
@@ -18,11 +18,14 @@ package org.apache.camel.component.jgroups;
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.jgroups.JChannel;
import org.jgroups.Message;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JGroupsComponentTest extends CamelTestSupport {
@@ -73,7 +76,7 @@ public class JGroupsComponentTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
clientChannel.close();
super.tearDown();
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java
index e8c9351..5d92d0c 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentWithChannelPropertiesTest.java
@@ -18,11 +18,14 @@ package org.apache.camel.component.jgroups;
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.jgroups.JChannel;
import org.jgroups.Message;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JGroupsComponentWithChannelPropertiesTest extends
CamelTestSupport {
@@ -73,7 +76,7 @@ public class JGroupsComponentWithChannelPropertiesTest
extends CamelTestSupport
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
clientChannel.close();
super.tearDown();
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java
index 475ed50..96d9746 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsConsumerTest.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.jgroups;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jgroups.JChannel;
import org.jgroups.Message;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.jgroups.JGroupsEndpoint.HEADER_JGROUPS_ORIGINAL_MESSAGE;
@@ -62,7 +62,7 @@ public class JGroupsConsumerTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
channel.close();
super.tearDown();
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java
index 8a46df8..962ca3d 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsEndpointTest.java
@@ -17,8 +17,11 @@
package org.apache.camel.component.jgroups;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JGroupsEndpointTest extends CamelTestSupport {
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java
index f96f970..d600940 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsProducerTest.java
@@ -19,12 +19,15 @@ package org.apache.camel.component.jgroups;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.jgroups.JChannel;
import org.jgroups.Message;
import org.jgroups.ReceiverAdapter;
-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;
public class JGroupsProducerTest extends CamelTestSupport {
@@ -66,7 +69,7 @@ public class JGroupsProducerTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
channel.close();
super.tearDown();
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java
index 0987983..54d1d5d 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsSharedChannelTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.jgroups;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Test for shared channel in JGroups endpoint
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
index 2662e90..4a88742 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
@@ -28,11 +28,13 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-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 class JGroupsLockMasterTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(JGroupsLockMasterTest.class);
private static final List<String> CLIENTS = IntStream.range(0,
3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -53,8 +55,8 @@ public class JGroupsLockMasterTest {
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));
}
// ************************************
