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 45ea5a045c30900972eb9af17269e7cd490f77f4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 9 17:38:40 2020 +0200
[CAMEL-11807] Upgrade camel-xml-jaxp to junit5
---
core/camel-xml-jaxp/pom.xml | 4 ++--
.../camel/language/xtokenizer/AttributedQNameTest.java | 8 +++++---
.../xtokenizer/XMLTokenExpressionIteratorCharsetTest.java | 11 ++++++-----
.../XMLTokenExpressionIteratorGroupingTest.java | 15 ++++++++-------
.../XMLTokenExpressionIteratorInvalidXMLTest.java | 12 +++++++-----
.../xtokenizer/XMLTokenExpressionIteratorTest.java | 15 ++++++++-------
.../apache/camel/util/xml/XmlLineNumberParserTest.java | 8 +++++---
7 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/core/camel-xml-jaxp/pom.xml b/core/camel-xml-jaxp/pom.xml
index ee86e43..2758b74 100644
--- a/core/camel-xml-jaxp/pom.xml
+++ b/core/camel-xml-jaxp/pom.xml
@@ -52,8 +52,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/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
index 1f6fab6..6beb3aa 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/AttributedQNameTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.language.xtokenizer;
import javax.xml.namespace.QName;
import
org.apache.camel.language.xtokenizer.XMLTokenExpressionIterator.AttributedQName;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class AttributedQNameTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class AttributedQNameTest {
@Test
public void testMatches() {
diff --git
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
index 91807b9..d8b0ad6 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorCharsetTest.java
@@ -30,13 +30,14 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
*/
-public class XMLTokenExpressionIteratorCharsetTest extends Assert {
+public class XMLTokenExpressionIteratorCharsetTest {
private static final String DATA_TEMPLATE =
"<?xml version=\"1.0\" encoding=\"{0}\"?>"
+ "<Statements xmlns=\"http://www.apache.org/xml/test\";>"
@@ -96,9 +97,9 @@ public class XMLTokenExpressionIteratorCharsetTest extends
Assert {
}
((Closeable)tokenizer).close();
- assertEquals("token count", RESULTS.length, results.size());
+ assertEquals(RESULTS.length, results.size(), "token count");
for (int i = 0; i < RESULTS.length; i++) {
- assertEquals("mismatch [" + i + "]", RESULTS[i], results.get(i));
+ assertEquals(RESULTS[i], results.get(i), "mismatch [" + i + "]");
}
}
diff --git
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
index 8c2c67d..81d0438 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorGroupingTest.java
@@ -26,11 +26,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class XMLTokenExpressionIteratorGroupingTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class XMLTokenExpressionIteratorGroupingTest {
// the input containing multiple Cs
private static final byte[] TEST_BODY = (
@@ -313,7 +314,7 @@ public class XMLTokenExpressionIteratorGroupingTest extends
Assert {
private Map<String, String> nsmap;
- @Before
+ @BeforeEach
public void setUp() {
nsmap = new HashMap<>();
nsmap.put("g", "urn:g");
@@ -425,9 +426,9 @@ public class XMLTokenExpressionIteratorGroupingTest extends
Assert {
}
((Closeable)it).close();
- Assert.assertEquals("token count", expected.length, results.size());
+ assertEquals(expected.length, results.size(), "token count");
for (int i = 0; i < expected.length; i++) {
- Assert.assertEquals("mismatch [" + i + "]", expected[i],
results.get(i));
+ assertEquals(expected[i], results.get(i), "mismatch [" + i + "]");
}
}
}
diff --git
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
index 92834d9..f4e2c76 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorInvalidXMLTest.java
@@ -26,13 +26,15 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
*
*/
-public class XMLTokenExpressionIteratorInvalidXMLTest extends Assert {
+public class XMLTokenExpressionIteratorInvalidXMLTest {
private static final String DATA_TEMPLATE =
"<?xml version=\"1.0\" encoding=\"utf-u\"?>"
+ "<Statements xmlns=\"http://www.apache.org/xml/test\";>"
@@ -68,9 +70,9 @@ public class XMLTokenExpressionIteratorInvalidXMLTest extends
Assert {
}
if (error) {
- assertNotNull("the error expected", exp);
+ assertNotNull(exp, "the error expected");
} else {
- assertNull("no error expected", exp);
+ assertNull(exp, "no error expected");
}
}
diff --git
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
index afab658..5a1d131 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
@@ -25,14 +25,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-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 org.junit.jupiter.api.Assertions.assertEquals;
/**
*
*/
-public class XMLTokenExpressionIteratorTest extends Assert {
+public class XMLTokenExpressionIteratorTest {
private static final byte[] TEST_BODY =
("<?xml version='1.0' encoding='UTF-8'?>"
+ "<g:greatgrandparent
xmlns:g='urn:g'><grandparent><uncle/><aunt>emma</aunt>"
@@ -245,7 +246,7 @@ public class XMLTokenExpressionIteratorTest extends Assert {
private Map<String, String> nsmap;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
nsmap = new HashMap<>();
nsmap.put("G", "urn:g");
@@ -417,9 +418,9 @@ public class XMLTokenExpressionIteratorTest extends Assert {
}
((Closeable)it).close();
- assertEquals("token count", expected.length, results.size());
+ assertEquals(expected.length, results.size(), "token count");
for (int i = 0; i < expected.length; i++) {
- assertEquals("mismatch [" + i + "]", expected[i], results.get(i));
+ assertEquals(expected[i], results.get(i), "mismatch [" + i + "]");
}
}
diff --git
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
index 47ba43d..4b7d5b8 100644
---
a/core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
+++
b/core/camel-xml-jaxp/src/test/java/org/apache/camel/util/xml/XmlLineNumberParserTest.java
@@ -24,10 +24,12 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class XmlLineNumberParserTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class XmlLineNumberParserTest {
@Test
public void testParse() throws Exception {
