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/07/27 15:38:51 UTC
[camel] 04/43: [CAMEL-11807] Upgrade camel-xmpp 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 8ac9e3a15d35690d486db75afa337cc684ffad0f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 11:05:20 2020 +0200
[CAMEL-11807] Upgrade camel-xmpp to junit5
---
components/camel-xmpp/pom.xml | 2 +-
.../camel/component/xmpp/GoogleTalkTest.java | 10 +++---
.../camel/component/xmpp/UriConfigurationTest.java | 16 +++++----
.../component/xmpp/XmppDeferredConnectionTest.java | 12 +++----
.../component/xmpp/XmppMultiUserChatTest.java | 12 +++----
.../component/xmpp/XmppProducerConcurrentTest.java | 14 ++++----
.../component/xmpp/XmppRobustConnectionTest.java | 18 +++++-----
.../camel/component/xmpp/XmppRouteChatTest.java | 12 +++----
...ppRouteMultipleProducersSingleConsumerTest.java | 12 +++----
.../apache/camel/component/xmpp/XmppRouteTest.java | 39 ++++++++++------------
10 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 0712c16..a708184 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -75,7 +75,7 @@
<!-- test dependencies -->
<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-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
index 85606a6..2347e05 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.xmpp;
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;
public class GoogleTalkTest extends CamelTestSupport {
- @Ignore
+ @Disabled
@Test
public void testSendToGTalk() throws Exception {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
@@ -34,7 +34,7 @@ public class GoogleTalkTest extends CamelTestSupport {
result.assertIsSatisfied();
}
- @Ignore
+ @Disabled
@Test
public void testSendToGTalkWithSubject() throws Exception {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
index bf19e2f..a32178b 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
@@ -19,16 +19,18 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class UriConfigurationTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class UriConfigurationTest {
protected CamelContext context = new DefaultCamelContext();
@Test
public void testPrivateChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@localhost:123/test-user@localhost?password=secret&serviceName=someCoolChat");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
@@ -43,7 +45,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testGroupChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com:123?room=cheese&password=secret&nickname=incognito");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
@@ -61,7 +63,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testDefaultResource() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com?password=secret");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
assertEquals("Camel", xmppEndpoint.getResource());
@@ -70,7 +72,7 @@ public class UriConfigurationTest extends Assert {
@Test
public void testPubSubConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@localhost:123?password=secret&pubsub=true");
- assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
+ assertTrue(endpoint instanceof XmppEndpoint, "Endpoint not an XmppEndpoint: " + endpoint);
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
assertEquals("localhost", xmppEndpoint.getHost());
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
index a618436..69ad3d4 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
@@ -20,17 +20,17 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test to verify that the XMPP producer and consumer will create deferred / lazy connections
* to the XMPP server when the server is not available upon route initialization. Also verify that
* these endpoints will then deliver messages as expected.
*/
-@Ignore("This test is not working at the moment")
+@Disabled("This test is not working at the moment")
public class XmppDeferredConnectionTest extends CamelTestSupport {
private EmbeddedXmppTestServer embeddedXmppTestServer;
@@ -119,7 +119,7 @@ public class XmppDeferredConnectionTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
index ce63be6..156e97e 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is not working at the moment")
+@Disabled("This test is not working at the moment")
public class XmppMultiUserChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
@@ -92,7 +92,7 @@ public class XmppMultiUserChatTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
index 8ff10cb..197460c 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
@@ -23,12 +23,14 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is not working at the moment")
+import static org.apache.camel.test.junit5.TestSupport.body;
+
+@Disabled("This test is not working at the moment")
public class XmppProducerConcurrentTest extends CamelTestSupport {
private EmbeddedXmppTestServer embeddedXmppTestServer;
@@ -90,7 +92,7 @@ public class XmppProducerConcurrentTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index 65e920d..5adb28d 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -20,11 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-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.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.isPlatform;
/**
* Test to verify that the XMPP consumer will reconnect when the connection is lost.
@@ -43,7 +45,7 @@ public class XmppRobustConnectionTest extends CamelTestSupport {
return registry;
}
- @Ignore("Since upgrade to smack 4.2.0 the robust connection handling doesn't seem to work, as consumerEndpoint below receives only 5 payloads instead of the expected 9")
+ @Disabled("Since upgrade to smack 4.2.0 the robust connection handling doesn't seem to work, as consumerEndpoint below receives only 5 payloads instead of the expected 9")
@Test
public void testXmppChatWithRobustConnection() throws Exception {
// does not work well on aix or solaris
@@ -112,14 +114,14 @@ public class XmppRobustConnectionTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
embeddedXmppTestServer = new EmbeddedXmppTestServer();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
index 5ad9864..116d533 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is flaky on CI server")
+@Disabled("This test is flaky on CI server")
public class XmppRouteChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
@@ -101,7 +101,7 @@ public class XmppRouteChatTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
index e164d72..181c664 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("This test is flaky on CI server")
+@Disabled("This test is flaky on CI server")
public class XmppRouteMultipleProducersSingleConsumerTest extends CamelTestSupport {
protected MockEndpoint goodEndpoint;
protected MockEndpoint badEndpoint;
@@ -104,7 +104,7 @@ public class XmppRouteMultipleProducersSingleConsumerTest extends CamelTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
embeddedXmppTestServer.stop();
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
index 54f3f3c..9223f68 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.xmpp;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -31,13 +28,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
import org.jivesoftware.smack.packet.Message;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("Caused by: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target")
-public class XmppRouteTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("Caused by: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target")
+public class XmppRouteTest {
protected static boolean enabled;
protected static String xmppUrl;
private static final Logger LOG = LoggerFactory.getLogger(XmppRouteTest.class);
@@ -48,21 +51,13 @@ public class XmppRouteTest extends TestCase {
protected ProducerTemplate client;
private EmbeddedXmppTestServer embeddedXmppTestServer;
- public static void main(String[] args) {
- enabled = true;
- if (args.length > 0) {
- xmppUrl = args[0];
- }
- TestRunner.run(XmppRouteTest.class);
- }
-
@Test
public void testXmppRouteWithTextMessage() throws Exception {
String expectedBody = "Hello there!";
sendExchange(expectedBody);
Object body = assertReceivedValidExchange();
- assertEquals("body", expectedBody, body);
+ assertEquals(expectedBody, body, "body");
}
protected void sendExchange(final Object expectedBody) {
@@ -82,7 +77,7 @@ public class XmppRouteTest extends TestCase {
assertNotNull(receivedExchange);
XmppMessage receivedMessage = (XmppMessage)receivedExchange.getIn();
- assertEquals("cheese header", 123, receivedMessage.getHeader("cheese"));
+ assertEquals(123, receivedMessage.getHeader("cheese"), "cheese header");
Object body = receivedMessage.getBody();
XmppRouteTest.LOG.debug("Received body: " + body);
Message xmppMessage = receivedMessage.getXmppMessage();
@@ -92,8 +87,8 @@ public class XmppRouteTest extends TestCase {
return body;
}
- @Override
- protected void setUp() throws Exception {
+ @BeforeEach
+ public void setUp() throws Exception {
client = new DefaultProducerTemplate(context);
String uriPrefix = getUriPrefix();
@@ -103,7 +98,7 @@ public class XmppRouteTest extends TestCase {
LOG.info("Using URI " + uri1 + " and " + uri2);
endpoint = context.getEndpoint(uri1);
- assertNotNull("No endpoint found!", endpoint);
+ assertNotNull(endpoint, "No endpoint found!");
// lets add some routes
context.addRoutes(new RouteBuilder() {
@@ -127,8 +122,8 @@ public class XmppRouteTest extends TestCase {
return "xmpp://localhost:" + embeddedXmppTestServer.getXmppPort() + "/camel?login=false&room=camel-anon";
}
- @Override
- protected void tearDown() throws Exception {
+ @AfterEach
+ public void tearDown() throws Exception {
client.stop();
context.stop();
embeddedXmppTestServer.stop();