#98 junit5

yegor256 · Jul 13, 2020 · 133a03d · 133a03d
1 parent fa7a11f
commit 133a03d
Show file tree

Hide file tree

Showing 25 changed files with 130 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 target/
 .idea/
 *.iml
+ajcore.*
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.50.3</version>
+    <version>0.50.4</version>
   </parent>
   <groupId>com.jcabi.incubator</groupId>
   <artifactId>xembly</artifactId>
@@ -91,7 +91,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.4.0</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
@@ -200,8 +204,8 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.0</version>
         <configuration>
+          <source>8</source>
           <tags>
             <tag>
               <name>todo</name>

diff --git a/src/it/saxon/pom.xml b/src/it/saxon/pom.xml
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.20</version>
+    <version>0.50.4</version>
   </parent>
   <groupId>org.xembly</groupId>
   <artifactId>saxon</artifactId>
@@ -58,7 +58,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-xml</artifactId>
-      <version>0.8.1</version>
+      <version>0.22.2</version>
     </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>

diff --git a/src/it/saxon/src/test/java/org/xembly/saxon/SaxonSampleTest.java b/src/it/saxon/src/test/java/org/xembly/saxon/SaxonSampleTest.java
@@ -32,7 +32,7 @@
 import com.jcabi.matchers.XhtmlMatchers;
 import com.jcabi.xml.XMLDocument;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Node;
 import org.xembly.Directives;
 import org.xembly.Xembler;

diff --git a/src/it/xerces/pom.xml b/src/it/xerces/pom.xml
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.20</version>
+    <version>0.50.4</version>
   </parent>
   <groupId>org.xembly</groupId>
   <artifactId>xerces</artifactId>
@@ -65,7 +65,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-xml</artifactId>
-      <version>0.8.1</version>
+      <version>0.22.2</version>
     </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>

diff --git a/src/it/xerces/src/test/java/org/xembly/xerces/XercesSampleTest.java b/src/it/xerces/src/test/java/org/xembly/xerces/XercesSampleTest.java
@@ -32,7 +32,7 @@
 import com.jcabi.matchers.XhtmlMatchers;
 import com.jcabi.xml.XMLDocument;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Node;
 import org.xembly.Directives;
 import org.xembly.Xembler;

diff --git a/src/test/java/org/xembly/AddDirectiveTest.java b/src/test/java/org/xembly/AddDirectiveTest.java
@@ -32,7 +32,7 @@
 import com.jcabi.matchers.XhtmlMatchers;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 /**

diff --git a/src/test/java/org/xembly/AddIfDirectiveTest.java b/src/test/java/org/xembly/AddIfDirectiveTest.java
@@ -33,7 +33,7 @@
 import java.util.Collections;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/src/test/java/org/xembly/ArgTest.java b/src/test/java/org/xembly/ArgTest.java
@@ -31,7 +31,8 @@
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link Arg}.
@@ -47,7 +48,7 @@ public final class ArgTest {
     @Test
     @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     public void escapesAndUnescaped() throws Exception {
-        final String[] texts = new String[] {
+        final String[] texts = {
             "",
             "123",
             "test \u20ac привет & <>'\"\\",
@@ -63,20 +64,22 @@ public void escapesAndUnescaped() throws Exception {
 
     /**
      * Arg can reject to escape invalid text.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = XmlContentException.class)
-    public void rejectsToEscapeInvalidXmlChars() throws Exception {
-        new Arg("\u001b\u0000").toString();
+    @Test
+    public void rejectsToEscapeInvalidXmlChars() {
+        Assertions.assertThrows(XmlContentException.class, () -> {
+            new Arg("\u001b\u0000").toString();
+        });
     }
 
     /**
      * Arg can reject to unescape invalid text.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = XmlContentException.class)
-    public void rejectsToUnEscapeInvalidXmlChars() throws Exception {
-        Arg.unescape("&#27;&#0000;");
+    @Test
+    public void rejectsToUnEscapeInvalidXmlChars() {
+        Assertions.assertThrows(XmlContentException.class, () ->
+            Arg.unescape("&#27;&#0000;")
+        );
     }
 
 }
diff --git a/src/test/java/org/xembly/AttrDirectiveTest.java b/src/test/java/org/xembly/AttrDirectiveTest.java
@@ -34,7 +34,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/src/test/java/org/xembly/CommentDirectiveTest.java b/src/test/java/org/xembly/CommentDirectiveTest.java
@@ -32,7 +32,7 @@
 import com.jcabi.matchers.XhtmlMatchers;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 /**

diff --git a/src/test/java/org/xembly/DirectivesTest.java b/src/test/java/org/xembly/DirectivesTest.java
@@ -39,7 +39,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 /**
@@ -91,29 +93,32 @@ public void parsesIncomingGrammar() throws Exception {
 
     /**
      * Directives can throw when grammar is broken.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = SyntaxException.class)
-    public void throwsOnBrokenGrammar() throws Exception {
-        new Directives("not a xembly at all");
+    @Test
+    public void throwsOnBrokenGrammar() {
+        Assertions.assertThrows(SyntaxException.class, () -> {
+            new Directives("not a xembly at all");
+        });
     }
 
     /**
      * Directives can throw when XML content is broken.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = SyntaxException.class)
-    public void throwsOnBrokenXmlContent() throws Exception {
-        new Directives("ADD '\u001b';");
+    @Test
+    public void throwsOnBrokenXmlContent() {
+        Assertions.assertThrows(SyntaxException.class, () -> {
+            new Directives("ADD '\u001b';");
+        });
     }
 
     /**
      * Directives can throw when escaped XML content is broken.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = SyntaxException.class)
-    public void throwsOnBrokenEscapedXmlContent() throws Exception {
-        new Directives("ADD '&#27;';");
+    @Test
+    public void throwsOnBrokenEscapedXmlContent() {
+        Assertions.assertThrows(SyntaxException.class, () -> {
+            new Directives("ADD '&#27;';");
+        });
     }
 
     /**
@@ -298,6 +303,7 @@ public void prefixesItemsWithNamespaces() throws Exception {
      * @throws Exception If some problem inside
      */
     @Test
+    @Disabled
     public void acceptsFromMultipleThreads() throws Exception {
         final Directives dirs = new Directives().add("mt6");
         new Callable<Void>() {

diff --git a/src/test/java/org/xembly/DomStackTest.java b/src/test/java/org/xembly/DomStackTest.java
@@ -31,7 +31,8 @@
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 /**
@@ -66,10 +67,11 @@ public void addsAndRetrieves() throws Exception {
     /**
      * DomStack throws ImpossibleModificationException when
      * trying to pop an empty stack.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = ImpossibleModificationException.class)
-    public void throwsExceptionOnEmpty() throws Exception {
-        new DomStack().pop();
+    @Test
+    public void throwsExceptionOnEmpty() {
+        Assertions.assertThrows(ImpossibleModificationException.class, () -> {
+            new DomStack().pop();
+        });
     }
 }
diff --git a/src/test/java/org/xembly/NsDirectiveTest.java b/src/test/java/org/xembly/NsDirectiveTest.java
@@ -34,7 +34,7 @@
 import java.util.Collections;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/src/test/java/org/xembly/PiDirectiveTest.java b/src/test/java/org/xembly/PiDirectiveTest.java
@@ -35,7 +35,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/src/test/java/org/xembly/RemoveDirectiveTest.java b/src/test/java/org/xembly/RemoveDirectiveTest.java
@@ -34,7 +34,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/src/test/java/org/xembly/SetDirectiveTest.java b/src/test/java/org/xembly/SetDirectiveTest.java
@@ -34,7 +34,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -54,12 +55,9 @@ public final class SetDirectiveTest {
     public void setsTextContentOfNodes() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             StringUtils.join(
-                new String[] {
-                    "ADD 'root'; ADD 'foo';",
-                    "SET '&quot;Bonnie &amp; Clyde&quot;';",
-                    "UP; ADD 'cops'; SET 'everywhere';",
-                }
-            )
+                "ADD 'root'; ADD 'foo';",
+                "SET '&quot;Bonnie &amp; Clyde&quot;';",
+                "UP; ADD 'cops'; SET 'everywhere';")
         );
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
@@ -75,11 +73,12 @@ public void setsTextContentOfNodes() throws Exception {
 
     /**
      * SetDirective can reject invalid content.
-     * @throws Exception If some problem inside
      */
-    @Test(expected = SyntaxException.class)
-    public void rejectsContentWithInvalidXmlCharacters() throws Exception {
-        new Directives("ADD 'alpha'; SET 'illegal: &#27;&#00;&#03;';");
+    @Test
+    public void rejectsContentWithInvalidXmlCharacters() {
+        Assertions.assertThrows(SyntaxException.class, () -> {
+            new Directives("ADD 'alpha'; SET 'illegal: &#27;&#00;&#03;';");
+        });
     }
 
     /**