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/24 20:52:57 UTC
[camel] 15/27: [CAMEL-11807] Upgrade camel-tagsoup 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 0753aeaf9e5629cad84906054eff32000f3e2c3a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 11:49:34 2020 +0200
[CAMEL-11807] Upgrade camel-tagsoup to junit5
---
components/camel-tagsoup/pom.xml | 6 +++---
.../tagsoup/TidyMarkupDataFormatAsDomNodeTest.java | 18 +++++++++++++-----
.../tagsoup/TidyMarkupDataFormatAsStringTest.java | 15 +++++++++++----
.../dataformat/tagsoup/TidyMarkupTestSupport.java | 9 ---------
4 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 010c3ef..6bfbc87 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -52,7 +52,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -61,8 +61,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>
</dependencies>
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
index 06aa8ae..ad47e52 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
@@ -23,11 +23,19 @@ 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class TidyMarkupDataFormatAsDomNodeTest extends CamelTestSupport {
-
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testUnMarshalToStringOfXml() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -53,14 +61,14 @@ public class TidyMarkupDataFormatAsDomNodeTest extends CamelTestSupport {
String response = in.getBody(String.class);
log.debug("Received " + response);
- assertNotNull("Should be able to convert received body to a string", response);
+ assertNotNull(response, "Should be able to convert received body to a string");
try {
/*
* our route xpaths the existence of our signature "<p>TidyMarkupNode"
* but of course, by the xpath time, it is well formed
*/
- assertTrue(response.equals("true"));
+ assertEquals("true", response);
} catch (Exception e) {
fail("Failed to convert the resulting String to XML: " + e.getLocalizedMessage());
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
index 4d96509..84cbf5a 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
@@ -25,11 +25,18 @@ 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class TidyMarkupDataFormatAsStringTest extends CamelTestSupport {
-
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testUnMarshalToStringOfXml() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
@@ -51,7 +58,7 @@ public class TidyMarkupDataFormatAsStringTest extends CamelTestSupport {
Node tidyMarkup = in.getBody(Node.class);
log.debug("Received " + tidyMarkup);
- assertNotNull("Should be able to convert received body to a string", tidyMarkup);
+ assertNotNull(tidyMarkup, "Should be able to convert received body to a string");
} catch (Exception e) {
fail("Failed to convert the resulting String to XML: " + e.getLocalizedMessage());
diff --git a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
index 2b53585..affc30c 100644
--- a/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
+++ b/components/camel-tagsoup/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
@@ -56,12 +56,6 @@ public final class TidyMarkupTestSupport {
/**
* Convert XML String to a Document.
- *
- * @param xmlString
- * @return document Document
- * @throws IOException
- * @throws SAXException
- * @throws ParserConfigurationException
*/
public static Document stringToXml(String xmlString) throws SAXException, IOException, ParserConfigurationException {
return createDocumentBuilder().parse(new InputSource(new StringReader(xmlString)));
@@ -69,9 +63,6 @@ public final class TidyMarkupTestSupport {
/**
* Static to generate a documentBuilder
- *
- * @return
- * @throws ParserConfigurationException
*/
public static DocumentBuilder createDocumentBuilder() throws ParserConfigurationException {