#107 qulice 0.22.0

yegor256 · Aug 24, 2022 · c8c5bc2 · c8c5bc2
1 parent 8eddbd5
commit c8c5bc2
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 94 deletions.
diff --git a/pom.xml b/pom.xml
@@ -293,7 +293,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.21.1</version>
+            <version>0.22.0</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>findbugs:.*</exclude>

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
@@ -41,10 +41,10 @@
  * Test of XML features with Saxon.
  * @since 0.17
  */
-public final class SaxonSampleTest {
+final class SaxonSampleTest {
 
     @Test
-    public void buildsDocument() throws Exception {
+    void buildsDocument() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(
                 new Directives().add("root")
@@ -56,7 +56,7 @@ public void buildsDocument() throws Exception {
     }
 
     @Test
-    public void appliesChangesToNode() throws Exception {
+    void appliesChangesToNode() throws Exception {
         final Node node = new XMLDocument("<doc/>").node();
         new Xembler(
             new Directives().xpath("/doc")

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
@@ -41,10 +41,10 @@
  * Test of XML features with Xerces.
  * @since 0.17
  */
-public final class XercesSampleTest {
+final class XercesSampleTest {
 
     @Test
-    public void buildsDocument() throws Exception {
+    void buildsDocument() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(
                 new Directives().add("root")
@@ -56,7 +56,7 @@ public void buildsDocument() throws Exception {
     }
 
     @Test
-    public void appliesChangesToNode() throws Exception {
+    void appliesChangesToNode() throws Exception {
         final Node node = new XMLDocument("<doc/>").node();
         new Xembler(
             new Directives().xpath("/doc")

diff --git a/src/test/java/org/xembly/AddDirectiveTest.java b/src/test/java/org/xembly/AddDirectiveTest.java
@@ -40,10 +40,10 @@
  *
  * @since 0.1
  */
-public final class AddDirectiveTest {
+final class AddDirectiveTest {
 
     @Test
-    public void addsNodesToCurrentNodes() throws Exception {
+    void addsNodesToCurrentNodes() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             "ADD 'root'; ADD 'foo'; ADD 'x'; UP; UP; ADD 'bar'; UP; ADD 'bar';"
         );

diff --git a/src/test/java/org/xembly/AddIfDirectiveTest.java b/src/test/java/org/xembly/AddIfDirectiveTest.java
@@ -42,10 +42,10 @@
  *
  * @since 0.1
  */
-public final class AddIfDirectiveTest {
+final class AddIfDirectiveTest {
 
     @Test
-    public void addsNodesToCurrentNodes() throws Exception {
+    void addsNodesToCurrentNodes() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             "ADD 'root'; ADD 'foo'; UP; ADDIF 'bar'; UP; ADDIF 'bar';"
         );
@@ -62,7 +62,7 @@ public void addsNodesToCurrentNodes() throws Exception {
     }
 
     @Test
-    public void addsDomNodesDirectly() throws Exception {
+    void addsDomNodesDirectly() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Element root = dom.createElement("xxx");

diff --git a/src/test/java/org/xembly/ArgTest.java b/src/test/java/org/xembly/ArgTest.java
@@ -39,11 +39,10 @@
  *
  * @since 0.1
  */
-public final class ArgTest {
+final class ArgTest {
 
     @Test
-    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-    public void escapesAndUnescaped() throws Exception {
+    void escapesAndUnescaped() throws Exception {
         final String[] texts = {
             "",
             "123",
@@ -59,15 +58,15 @@ public void escapesAndUnescaped() throws Exception {
     }
 
     @Test
-    public void rejectsToEscapeInvalidXmlChars() {
+    void rejectsToEscapeInvalidXmlChars() {
         Assertions.assertThrows(
             XmlContentException.class,
             () -> new Arg("\u001b\u0000").toString()
         );
     }
 
     @Test
-    public void rejectsToUnEscapeInvalidXmlChars() {
+    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
@@ -43,10 +43,10 @@
  *
  * @since 0.1
  */
-public final class AttrDirectiveTest {
+final class AttrDirectiveTest {
 
     @Test
-    public void addsAttributesToCurrentNodes() throws Exception {
+    void addsAttributesToCurrentNodes() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             StringUtils.join(
                 new String[]{
@@ -68,7 +68,7 @@ public void addsAttributesToCurrentNodes() throws Exception {
     }
 
     @Test
-    public void addsDomAttributesDirectly() throws Exception {
+    void addsDomAttributesDirectly() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Element root = dom.createElement("xxx");
@@ -88,7 +88,7 @@ public void addsDomAttributesDirectly() throws Exception {
     }
 
     @Test
-    public void addsCaseSensitiveAttributesDirectly() throws Exception {
+    void addsCaseSensitiveAttributesDirectly() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Element root = dom.createElement("f");

diff --git a/src/test/java/org/xembly/CommentDirectiveTest.java b/src/test/java/org/xembly/CommentDirectiveTest.java
@@ -40,10 +40,10 @@
  *
  * @since 0.1
  */
-public final class CommentDirectiveTest {
+final class CommentDirectiveTest {
 
     @Test
-    public void addsComment() throws Exception {
+    void addsComment() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             "ADD 'root'; ADD 'foo'; COMMENT 'How are you?';"
         );

diff --git a/src/test/java/org/xembly/DirectivesTest.java b/src/test/java/org/xembly/DirectivesTest.java
@@ -50,10 +50,10 @@
  * @since 0.1
  */
 @SuppressWarnings({"PMD.TooManyMethods", "PMD.AvoidDuplicateLiterals"})
-public final class DirectivesTest {
+final class DirectivesTest {
 
     @Test
-    public void makesXmlDocument() throws Exception {
+    void makesXmlDocument() throws Exception {
         MatcherAssert.assertThat(
             XhtmlMatchers.xhtml(
                 new Xembler(
@@ -73,39 +73,39 @@ public void makesXmlDocument() throws Exception {
     }
 
     @Test
-    public void parsesIncomingGrammar() {
+    void parsesIncomingGrammar() {
         final Iterable<Directive> dirs = new Directives(
             "XPATH '//orders[@id=\"152\"]'; SET 'test';"
         );
         MatcherAssert.assertThat(dirs, Matchers.iterableWithSize(2));
     }
 
     @Test
-    public void throwsOnBrokenGrammar() {
+    void throwsOnBrokenGrammar() {
         Assertions.assertThrows(
             SyntaxException.class,
             () -> new Directives("not a xembly at all")
         );
     }
 
     @Test
-    public void throwsOnBrokenXmlContent() {
+    void throwsOnBrokenXmlContent() {
         Assertions.assertThrows(
             SyntaxException.class,
             () -> new Directives("ADD '\u001b';")
         );
     }
 
     @Test
-    public void throwsOnBrokenEscapedXmlContent() {
+    void throwsOnBrokenEscapedXmlContent() {
         Assertions.assertThrows(
             SyntaxException.class,
             () -> new Directives("ADD '&#27;';")
         );
     }
 
     @Test
-    public void addsMapOfValues() throws Exception {
+    void addsMapOfValues() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         dom.appendChild(dom.createElement("root"));
@@ -127,15 +127,15 @@ public void addsMapOfValues() throws Exception {
     }
 
     @Test
-    public void ingoresEmptyInput() {
+    void ingoresEmptyInput() {
         MatcherAssert.assertThat(
             new Directives("\n\t   \r"),
             Matchers.emptyIterable()
         );
     }
 
     @Test
-    public void performsFullScaleModifications() throws Exception {
+    void performsFullScaleModifications() throws Exception {
         final String script = new Directives()
             .add("html").attr("xmlns", "http://www.w3.org/1999/xhtml")
             .add("body")
@@ -155,7 +155,7 @@ public void performsFullScaleModifications() throws Exception {
     }
 
     @Test
-    public void copiesExistingNode() throws Exception {
+    void copiesExistingNode() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Iterable<Directive> copy = Directives.copyOf(
@@ -182,7 +182,7 @@ public void copiesExistingNode() throws Exception {
     }
 
     @Test
-    public void appendsExistingNode() throws Exception {
+    void appendsExistingNode() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         new Xembler(
@@ -207,7 +207,7 @@ public void appendsExistingNode() throws Exception {
     }
 
     @Test
-    public void addsElementsCaseSensitively() throws Exception {
+    void addsElementsCaseSensitively() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(new Directives().add("XHtml").addIf("Body")).xml(),
             XhtmlMatchers.hasXPaths(
@@ -218,7 +218,7 @@ public void addsElementsCaseSensitively() throws Exception {
     }
 
     @Test
-    public void convertsToString() {
+    void convertsToString() {
         final Directives dirs = new Directives();
         for (int idx = 0; idx < Tv.TEN; ++idx) {
             dirs.add("HELLO");
@@ -234,7 +234,7 @@ public void convertsToString() {
     }
 
     @Test
-    public void pushesAndPopsCursor() throws Exception {
+    void pushesAndPopsCursor() throws Exception {
         MatcherAssert.assertThat(
             XhtmlMatchers.xhtml(
                 new Xembler(
@@ -255,7 +255,7 @@ public void pushesAndPopsCursor() throws Exception {
     }
 
     @Test
-    public void prefixesItemsWithNamespaces() throws Exception {
+    void prefixesItemsWithNamespaces() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(
                 new Directives()
@@ -269,7 +269,7 @@ public void prefixesItemsWithNamespaces() throws Exception {
 
     @Test
     @Disabled
-    public void acceptsFromMultipleThreads() throws Exception {
+    void acceptsFromMultipleThreads() throws Exception {
         final Directives dirs = new Directives().add("mt6");
         new Callable<Void>() {
             @Parallel(threads = Tv.FIFTY)
@@ -291,7 +291,7 @@ public Void call() {
     }
 
     @Test
-    public void addsComments() throws Exception {
+    void addsComments() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(
                 new Directives()
@@ -303,7 +303,7 @@ public void addsComments() throws Exception {
     }
 
     @Test
-    public void appendsDirs() {
+    void appendsDirs() {
         MatcherAssert.assertThat(
             new Directives().add("0").append(
                 new Directives().add("1")

diff --git a/src/test/java/org/xembly/DomStackTest.java b/src/test/java/org/xembly/DomStackTest.java
@@ -40,10 +40,10 @@
  *
  * @since 0.21
  */
-public final class DomStackTest {
+final class DomStackTest {
 
     @Test
-    public void addsAndRetrieves() throws Exception {
+    void addsAndRetrieves() throws Exception {
         final Directive.Stack stack = new DomStack();
         final Directive.Cursor first = Mockito.mock(Directive.Cursor.class);
         final Directive.Cursor second = Mockito.mock(Directive.Cursor.class);
@@ -60,7 +60,7 @@ public void addsAndRetrieves() throws Exception {
     }
 
     @Test
-    public void throwsExceptionOnEmpty() {
+    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
@@ -42,9 +42,9 @@
  * Validates NsDirective class.
  * @since 0.19.3
  */
-public final class NsDirectiveTest {
+final class NsDirectiveTest {
     @Test
-    public void setsNsAttr() throws Exception {
+    void setsNsAttr() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Element root = dom.createElement("f");

diff --git a/src/test/java/org/xembly/PiDirectiveTest.java b/src/test/java/org/xembly/PiDirectiveTest.java
@@ -43,10 +43,10 @@
  * Test case for {@link PiDirective}.
  * @since 0.9
  */
-public final class PiDirectiveTest {
+final class PiDirectiveTest {
 
     @Test
-    public void addsProcessingInstructionsToDom() throws Exception {
+    void addsProcessingInstructionsToDom() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             StringUtils.join(
                 new String[] {
@@ -69,7 +69,7 @@ public void addsProcessingInstructionsToDom() throws Exception {
     }
 
     @Test
-    public void addsProcessingInstructionsDirectlyToDom() throws Exception {
+    void addsProcessingInstructionsDirectlyToDom() throws Exception {
         final Document dom = DocumentBuilderFactory.newInstance()
             .newDocumentBuilder().newDocument();
         final Element root = dom.createElement("xxx");
@@ -85,7 +85,7 @@ public void addsProcessingInstructionsDirectlyToDom() throws Exception {
     }
 
     @Test
-    public void addsProcessingInstructionsToDomRoot() throws Exception {
+    void addsProcessingInstructionsToDomRoot() throws Exception {
         final Iterable<Directive> dirs = new Directives(
             "XPATH '/'; PI 'alpha' 'beta \u20ac'; ADD 'x4';"
         );
@@ -101,7 +101,7 @@ public void addsProcessingInstructionsToDomRoot() throws Exception {
     }
 
     @Test
-    public void prependsProcessingInstructionsToDomRoot() throws Exception {
+    void prependsProcessingInstructionsToDomRoot() throws Exception {
         MatcherAssert.assertThat(
             new Xembler(new Directives("PI 'a' 'b'; ADD 'c';")).xml(),
             Matchers.containsString("<?a b?><c/>")