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 7a547bfb4672504e9f8daf5dadb6680d9397875a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:09:50 2020 +0200
[CAMEL-11807] Upgrade camel-irc to junit5
---
components/camel-irc/pom.xml | 4 ++--
.../org/apache/camel/component/irc/IrcConfigurationTest.java | 7 +++++--
.../java/org/apache/camel/component/irc/IrcConsumerTest.java | 6 +++---
.../java/org/apache/camel/component/irc/IrcEndpointTest.java | 6 +++---
.../java/org/apache/camel/component/irc/IrcProducerTest.java | 12 +++++++-----
.../camel/component/irc/it/IrcIntegrationTestSupport.java | 12 ++++++++----
.../camel/component/irc/it/IrcMultiChannelRouteTest.java | 9 +++++++--
.../org/apache/camel/component/irc/it/IrcOnReplyTest.java | 9 +++++++--
.../org/apache/camel/component/irc/it/IrcPrivmsgTest.java | 9 +++++++--
.../java/org/apache/camel/component/irc/it/IrcRouteTest.java | 9 +++++++--
.../org/apache/camel/component/irc/it/IrcsListUsersTest.java | 6 ++++--
.../component/irc/it/IrcsWithSslContextParamsRouteTest.java | 4 ++--
12 files changed, 62 insertions(+), 31 deletions(-)
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index e48b082..461dce1 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -86,7 +86,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
index e484927..0ca31cd 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.irc;
import java.util.List;
-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 IrcConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
index 67bd3f2..cfcb1da 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConsumerTest.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.Processor;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
@@ -38,7 +38,7 @@ public class IrcConsumerTest {
private IrcConsumer consumer;
private IRCEventAdapter listener;
- @Before
+ @BeforeEach
public void doSetup() {
connection = mock(IRCConnection.class);
endpoint = mock(IrcEndpoint.class);
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
index 85762d2..9224704 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcEndpointTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.irc;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCConstants;
@@ -36,7 +36,7 @@ public class IrcEndpointTest {
private IRCConnection connection;
private IrcEndpoint endpoint;
- @Before
+ @BeforeEach
public void doSetup() {
component = mock(IrcComponent.class);
configuration = mock(IrcConfiguration.class);
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
index 3ad68cc..c6c8479 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcProducerTest.java
@@ -22,11 +22,12 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.RuntimeCamelException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -42,7 +43,7 @@ public class IrcProducerTest {
private Exchange exchange;
private Message message;
- @Before
+ @BeforeEach
public void doSetup() {
component = mock(IrcComponent.class);
connection = mock(IRCConnection.class);
@@ -105,7 +106,7 @@ public class IrcProducerTest {
verify(connection).doPrivmsg("#chan2", "foo");
}
- @Test (expected = RuntimeCamelException.class)
+ @Test
public void processTestException() throws Exception {
when(exchange.getIn()).thenReturn(message);
@@ -114,6 +115,7 @@ public class IrcProducerTest {
when(connection.isConnected()).thenReturn(false);
- producer.process(exchange);
+ assertThrows(RuntimeCamelException.class,
+ () -> producer.process(exchange));
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
index 5bfbab7..20fcb1f 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
@@ -22,17 +22,21 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcIntegrationTestSupport extends CamelTestSupport {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IrcIntegrationTestSupport.class);
+
@EndpointInject("mock:result")
protected MockEndpoint resultEndpoint;
protected Properties properties;
- @Before
+ @BeforeEach
public void doBefore() throws IOException {
properties = loadProperties();
resetMock(resultEndpoint);
@@ -54,7 +58,7 @@ public class IrcIntegrationTestSupport extends
CamelTestSupport {
try {
return loadProperties();
} catch (IOException e) {
- log.error("Can't load configuration properties");
+ LOGGER.error("Can't load configuration properties");
return null;
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
index 8fc1f40..f9aed5f 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
@@ -23,9 +23,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.irc.IrcConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcMultiChannelRouteTest extends IrcIntegrationTestSupport {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IrcMultiChannelRouteTest.class);
+
protected String body1 = "Message One";
protected String body2 = "Message Two";
protected String body3 = "Message Three";
@@ -50,7 +55,7 @@ public class IrcMultiChannelRouteTest extends
IrcIntegrationTestSupport {
List<Exchange> list = resultEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
- log.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
+ LOGGER.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
index 7edf9db..6035cf4 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
@@ -22,9 +22,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.irc.IrcConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcOnReplyTest extends IrcIntegrationTestSupport {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IrcOnReplyTest.class);
+
protected String command = "WHO #camel-test";
protected String resultEnd = "End of /WHO list.";
private boolean sentMessages;
@@ -37,7 +42,7 @@ public class IrcOnReplyTest extends IrcIntegrationTestSupport
{
List<Exchange> list = resultEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
- log.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
+ LOGGER.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
index 3101e8b..935a368 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
@@ -22,9 +22,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.irc.IrcConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcPrivmsgTest extends IrcIntegrationTestSupport {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IrcPrivmsgTest.class);
+
protected String expectedBody1 = "Message One";
protected String expectedBody2 = "Message Two";
@@ -41,7 +46,7 @@ public class IrcPrivmsgTest extends IrcIntegrationTestSupport
{
List<Exchange> list = resultEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
- log.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
+ LOGGER.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
index abc1329..d6c7ce3 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
@@ -22,9 +22,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.irc.IrcConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcRouteTest extends IrcIntegrationTestSupport {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(IrcRouteTest.class);
+
protected String body1 = "Message One";
protected String body2 = "Message Two";
private boolean sentMessages;
@@ -36,7 +41,7 @@ public class IrcRouteTest extends IrcIntegrationTestSupport {
List<Exchange> list = resultEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
- log.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
+ LOGGER.info("Received exchange: " + exchange + " headers: " +
exchange.getIn().getHeaders());
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
index b3dbe32..e5250fe 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.irc.it;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.irc.IrcConfiguration;
-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.assertTrue;
+
/**
* Integration test for the {@link IrcConfiguration#isNamesOnJoin()} option.
* Joins a channel and asserts that the username of the current test user is
@@ -63,7 +65,7 @@ public class IrcsListUsersTest extends
IrcIntegrationTestSupport {
String body =
resultEndpoint.getExchanges().get(0).getIn().getBody(String.class);
LOGGER.debug("Received usernames: [{}]", body);
String username = properties.getProperty("camelFrom");
- assertTrue("userlist does not contain test user",
body.contains(username));
+ assertTrue(body.contains(username), "userlist does not contain test
user");
}
}
diff --git
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
index 72061eba..78d604e 100644
---
a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
+++
b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-@Ignore
+@Disabled
public class IrcsWithSslContextParamsRouteTest extends IrcRouteTest {
// TODO This test is disabled until we can find a public SSL enabled IRC
