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 977b454b9c1e37639d11b4a5c4e79355fbe695ff
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jul 20 14:47:20 2020 +0200
[CAMEL-11807] Upgrade camel-rss to junit5
---
components/camel-rss/pom.xml | 6 +++---
.../org/apache/camel/component/rss/JettyTestServer.java | 2 +-
.../camel/component/rss/RssEntryPollingConsumerTest.java | 4 ++--
.../rss/RssEntryPollingConsumerWithBasicAuthTest.java | 12 ++++++------
.../rss/RssEntryPollingConsumerWithFilterTest.java | 6 ++++--
.../org/apache/camel/component/rss/RssEntrySortTest.java | 4 ++--
.../java/org/apache/camel/component/rss/RssFilterTest.java | 4 ++--
.../camel/component/rss/RssHttpNoCamelParametersTest.java | 7 +++++--
.../camel/component/rss/RssMultipleEndpointsIssueTest.java | 8 ++++----
.../apache/camel/component/rss/RssPollingConsumerTest.java | 8 ++++++--
.../component/rss/RssPollingConsumerWithBasicAuthTest.java | 8 ++++----
.../rss/RssPollingConsumerWithFeedHeaderDisabledTest.java | 7 +++++--
.../camel/component/rss/RssUriEncodingIssueTest.java | 14 ++++++++++----
.../apache/camel/component/rss/UpdatedDateFilterTest.java | 10 +++++-----
.../org/apache/camel/dataformat/rss/RssDataFormatTest.java | 8 ++++----
15 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index 65aa785..67539c4 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -58,7 +58,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -67,8 +67,8 @@
<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>
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
index 7907323..81e4c6b 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
@@ -41,7 +41,7 @@ import org.eclipse.jetty.util.security.Credential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
public final class JettyTestServer {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
index 6508c69..7e6b3d1 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.rss;
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;
public class RssEntryPollingConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
index 5325610..862b630 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.rss;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class RssEntryPollingConsumerWithBasicAuthTest extends CamelTestSupport
{
@@ -42,12 +42,12 @@ public class RssEntryPollingConsumerWithBasicAuthTest
extends CamelTestSupport {
};
}
- @BeforeClass
+ @BeforeAll
public static void startServer() {
JettyTestServer.getInstance().startServer();
}
- @AfterClass
+ @AfterAll
public static void stopServer() {
JettyTestServer.getInstance().stopServer();
}
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
index ccd59a5..98b67c3 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-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.assertTrue;
public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
index 01bbf53..db7f3af 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class RssEntrySortTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
index 0abc5a3..8f70e15 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Body;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class RssFilterTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java
index 182b7f8..6e18d31 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.rss;
-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 RssHttpNoCamelParametersTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
index 32464db..c22c9a6 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
@@ -18,14 +18,14 @@ package org.apache.camel.component.rss;
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 RssMultipleEndpointsIssueTest extends CamelTestSupport {
@Test
- @Ignore("A manual test")
+ @Disabled("A manual test")
public void testMultipleEndpointIssueTest() throws Exception {
MockEndpoint a = getMockEndpoint("mock:a");
a.expectedMinimumMessageCount(1);
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
index 99b4d88..856a3b9 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
@@ -21,8 +21,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RssPollingConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java
index ea66340..fb2e4ba 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rss;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RssPollingConsumerWithBasicAuthTest extends
RssPollingConsumerTest {
@@ -32,12 +32,12 @@ public class RssPollingConsumerWithBasicAuthTest extends
RssPollingConsumerTest
};
}
- @BeforeClass
+ @BeforeAll
public static void startServer() {
JettyTestServer.getInstance().startServer();
}
- @AfterClass
+ @AfterAll
public static void stopServer() {
JettyTestServer.getInstance().stopServer();
}
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
index ec87332..fa2ce5e 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
@@ -20,8 +20,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class RssPollingConsumerWithFeedHeaderDisabledTest extends
CamelTestSupport {
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java
index a512607..b298c8c 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssUriEncodingIssueTest.java
@@ -18,13 +18,19 @@ package org.apache.camel.component.rss;
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
-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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-@Ignore("Must be online")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be online")
public class RssUriEncodingIssueTest extends CamelTestSupport {
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testUriIssue() throws Exception {
String uri =
"rss:http://api.flickr.com/services/feeds/photos_public.gne?id=23353282@N05&tags=lowlands&lang=en-us&format=rss_200";;
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
index 78ebc5d..08d1d5b 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
@@ -21,18 +21,18 @@ import java.util.Date;
import com.rometools.rome.feed.synd.SyndEntry;
import com.rometools.rome.feed.synd.SyndEntryImpl;
import com.rometools.rome.feed.synd.SyndFeedImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UpdatedDateFilterTest {
private UpdatedDateFilter fixture;
private Date now;
- @Before
+ @BeforeEach
public void setup() {
now = new Date();
fixture = new UpdatedDateFilter(now);
diff --git
a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
index 747fe9c..aaf931f 100644
---
a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
+++
b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
@@ -20,9 +20,9 @@ import com.rometools.rome.feed.synd.SyndFeed;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rss.RssUtils;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class RssDataFormatTest extends CamelTestSupport {
private String feedXml;
@@ -46,7 +46,7 @@ public class RssDataFormatTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
feed = RssUtils.createFeed("file:src/test/data/rss20.xml");
feedXml = RssConverter.feedToXml(feed);
