This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jxpath.git


The following commit(s) were added to refs/heads/master by this push:
     new f7eaca8  Use JUnit 5 convention for test method visibility
f7eaca8 is described below

commit f7eaca8c6733fbf78770acad4885eef9dd978332
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jun 7 17:48:20 2025 -0400

    Use JUnit 5 convention for test method visibility
---
 .../apache/commons/jxpath/BasicNodeSetTest.java    |   6 +-
 .../commons/jxpath/issues/JXPath113Test.java       |   2 +-
 .../commons/jxpath/issues/JXPath118Test.java       |   2 +-
 .../commons/jxpath/issues/JXPath149Test.java       |   2 +-
 .../jxpath/issues/JXPath172DynamicTest.java        |  12 +--
 .../commons/jxpath/issues/JXPath172Test.java       |  10 +--
 .../commons/jxpath/issues/JXPath177Test.java       |   6 +-
 .../commons/jxpath/ri/ExceptionHandlerTest.java    |   4 +-
 .../jxpath/ri/JXPathCompiledExpressionTest.java    |  58 ++++++------
 .../ri/JXPathContextReferenceImplTestCase.java     |   2 +-
 .../org/apache/commons/jxpath/ri/StressTest.java   |   2 +-
 .../commons/jxpath/ri/axes/RecursiveAxesTest.java  |   2 +-
 .../jxpath/ri/axes/SimplePathInterpreterTest.java  |  16 ++--
 .../jxpath/ri/compiler/ContextDependencyTest.java  |   4 +-
 .../jxpath/ri/compiler/CoreFunctionTest.java       |  10 +--
 .../jxpath/ri/compiler/CoreOperationTest.java      |   8 +-
 .../jxpath/ri/compiler/ExtensionFunctionTest.java  |  34 +++----
 .../commons/jxpath/ri/compiler/VariableTest.java   |  40 ++++-----
 .../jxpath/ri/model/AbstractBeanModelTest.java     | 100 ++++++++++-----------
 .../jxpath/ri/model/AbstractXMLModelTest.java      |  64 ++++++-------
 .../ri/model/AliasedNamespaceIterationTest.java    |   4 +-
 .../jxpath/ri/model/EmbeddedColonMapKeysTest.java  |   4 +-
 .../jxpath/ri/model/EmptyCollectionTest.java       |  12 +--
 .../jxpath/ri/model/ExternalXMLNamespaceTest.java  |   6 +-
 .../commons/jxpath/ri/model/JXPath151Test.java     |   4 +-
 .../commons/jxpath/ri/model/JXPath154Test.java     |   4 +-
 .../commons/jxpath/ri/model/MixedModelTest.java    |  80 ++++++++---------
 .../jxpath/ri/model/XMLPreserveSpaceTest.java      |  20 ++---
 .../commons/jxpath/ri/model/XMLSpaceTest.java      |  20 ++---
 .../jxpath/ri/model/XMLUpperCaseElementsTest.java  |   8 +-
 .../model/beans/BadlyImplementedFactoryTest.java   |   2 +-
 .../jxpath/ri/model/beans/BeanModelTest.java       |   2 +-
 .../ri/model/container/ContainerModelTest.java     |   8 +-
 .../commons/jxpath/ri/model/dom/DOMModelTest.java  |   4 +-
 .../ri/model/dynabeans/LazyDynaBeanTest.java       |   4 +-
 .../model/dynamic/DynamicPropertiesModelTest.java  |  36 ++++----
 .../jxpath/ri/model/jdom/JDOMModelTest.java        |   4 +-
 .../jxpath/servlet/JXPathServletContextTest.java   |   8 +-
 .../jxpath/util/BasicTypeConverterTest.java        |  22 ++---
 .../commons/jxpath/util/ClassLoaderUtilTest.java   |   8 +-
 .../apache/commons/jxpath/util/ValueUtilsTest.java |  18 ++--
 41 files changed, 331 insertions(+), 331 deletions(-)

diff --git a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java 
b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
index 7f227f5..c01792d 100644
--- a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
+++ b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
@@ -111,7 +111,7 @@ public class BasicNodeSetTest extends AbstractJXPathTest {
      * Test adding pointers.
      */
     @Test
-    public void testAdd() {
+    void testAdd() {
         addPointers("/bean/integers");
         assertEquals(list("/bean/integers[1]", "/bean/integers[2]", 
"/bean/integers[3]", "/bean/integers[4]").toString(), 
nodeSet.getPointers().toString());
         assertEquals(list(Integer.valueOf(1), Integer.valueOf(2), 
Integer.valueOf(3), Integer.valueOf(4)), nodeSet.getValues());
@@ -122,7 +122,7 @@ public class BasicNodeSetTest extends AbstractJXPathTest {
      * Demonstrate when nodes != values: in XML models.
      */
     @Test
-    public void testNodes() {
+    void testNodes() {
         addPointers("/document/vendor/contact");
         assertEquals(
                 list("/document/vendor[1]/contact[1]", 
"/document/vendor[1]/contact[2]", "/document/vendor[1]/contact[3]", 
"/document/vendor[1]/contact[4]")
@@ -137,7 +137,7 @@ public class BasicNodeSetTest extends AbstractJXPathTest {
      * Test removing a pointer.
      */
     @Test
-    public void testRemove() {
+    void testRemove() {
         addPointers("/bean/integers");
         removePointers("/bean/integers[4]");
         assertEquals(list("/bean/integers[1]", "/bean/integers[2]", 
"/bean/integers[3]").toString(), nodeSet.getPointers().toString());
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java
index 8a9ea34..dbe6a16 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java
@@ -56,7 +56,7 @@ public class JXPath113Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue113() throws Exception {
+    void testIssue113() throws Exception {
         final Document doc = JAXP.getDocument("<xml/>");
         final JXPathContext context = JXPathContext.newContext(doc);
         final List result = context.selectNodes("//following-sibling::node()");
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
index a7900b5..d0e6033 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
@@ -62,7 +62,7 @@ public class JXPath118Test {
     }
 
     @Test
-    public void testJXPATH118IssueWithAsPath() throws Exception {
+    void testJXPATH118IssueWithAsPath() throws Exception {
         final Object contextBean = new SomeChildClass();
         final JXPathContext context = JXPathContext.newContext(contextBean);
         final Iterator<Pointer> iteratePointers = 
context.iteratePointers("//*");
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java
index f8e90ed..9cc7fb8 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 public class JXPath149Test extends AbstractJXPathTest {
 
     @Test
-    public void testComplexOperationWithVariables() {
+    void testComplexOperationWithVariables() {
         final JXPathContext context = JXPathContext.newContext(null);
         context.getVariables().declareVariable("a", Integer.valueOf(0));
         context.getVariables().declareVariable("b", Integer.valueOf(0));
diff --git 
a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
index 7700fa9..825a7f8 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
@@ -48,7 +48,7 @@ public class JXPath172DynamicTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_nestedpropertyDoesNotExist_Lenient() {
+    void testIssue172_nestedpropertyDoesNotExist_Lenient() {
         final JXPathContext context = getContext(null, true);
         final Object bRet = context.selectSingleNode("value.unexisting");
         assertNull(bRet);
@@ -58,7 +58,7 @@ public class JXPath172DynamicTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_nestedpropertyDoesNotExist_NotLenient() {
+    void testIssue172_nestedpropertyDoesNotExist_NotLenient() {
         final JXPathContext context = getContext(null, false);
         final Object bRet = context.selectSingleNode("value.unexisting");
         assertNull(bRet);
@@ -68,7 +68,7 @@ public class JXPath172DynamicTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyDoesNotExist() {
+    void testIssue172_propertyDoesNotExist() {
         final JXPathContext context = getContext(null, false);
         final Object bRet = context.selectSingleNode("unexisting");
         assertNull(bRet);
@@ -78,7 +78,7 @@ public class JXPath172DynamicTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyDoesNotExist_Lenient() {
+    void testIssue172_propertyDoesNotExist_Lenient() {
         final JXPathContext context = getContext(null, true);
         final Object bRet = context.selectSingleNode("unexisting");
         assertNull(bRet);
@@ -88,7 +88,7 @@ public class JXPath172DynamicTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyExistAndIsNotNull() {
+    void testIssue172_propertyExistAndIsNotNull() {
         final JXPathContext context = getContext("ciao", false);
         final Object bRet = context.selectSingleNode("value");
         assertNotNull(bRet, "null!!");
@@ -100,7 +100,7 @@ public class JXPath172DynamicTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyExistAndIsNull() {
+    void testIssue172_propertyExistAndIsNull() {
         final JXPathContext context = getContext(null, false);
         final Object bRet = context.selectSingleNode("value");
         assertNull(bRet, "not null!!");
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
index 77bad03..372e3c7 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
@@ -61,7 +61,7 @@ public class JXPath172Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_NestedPropertyUnexisting() {
+    void testIssue172_NestedPropertyUnexisting() {
         final JXPathContext context = getContext(null, true);
         final Object bRet = context.selectSingleNode("value.child");
         assertNull(bRet, "not null!!");
@@ -72,7 +72,7 @@ public class JXPath172Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyDoesNotExist_NotLenient() {
+    void testIssue172_propertyDoesNotExist_NotLenient() {
         final JXPathContext context = getContext(null, false);
         assertThrows(JXPathNotFoundException.class, () -> 
context.selectSingleNode("unexisting"));
         assertThrows(JXPathNotFoundException.class, () -> 
context.getPointer("unexisting"));
@@ -80,7 +80,7 @@ public class JXPath172Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyExistAndIsNotNull() {
+    void testIssue172_propertyExistAndIsNotNull() {
         final JXPathContext context = getContext("ciao", false);
         final Object bRet = context.selectSingleNode("value");
         assertNotNull(bRet, "null!!");
@@ -92,7 +92,7 @@ public class JXPath172Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_propertyExistAndIsNull() {
+    void testIssue172_propertyExistAndIsNull() {
         final JXPathContext context = getContext(null, false);
         final Object bRet = context.selectSingleNode("value");
         assertNull(bRet, "not null!!");
@@ -103,7 +103,7 @@ public class JXPath172Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIssue172_PropertyUnexisting() {
+    void testIssue172_PropertyUnexisting() {
         final JXPathContext context = getContext(null, true);
         final Object bRet = context.selectSingleNode("unexisting");
         assertNull(bRet, "not null!!");
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java 
b/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
index adf43be..bd56972 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java
@@ -88,19 +88,19 @@ public class JXPath177Test {
     }
 
     @Test
-    public void testJx177() {
+    void testJx177() {
         doTest("name", "ROOT name");
         doTest("/x/name", "X name");
         doTest("$__root/x/name", "X name");
     }
 
     @Test
-    public void testJx177_Union1() {
+    void testJx177_Union1() {
         doTest("$__root/x/name|name", "X name");
     }
 
     @Test
-    public void testJx177_Union2() {
+    void testJx177_Union2() {
         doTest("$__root/x/unexisting|name", "ROOT name");
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java
index f793998..ae9ab95 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java
@@ -64,7 +64,7 @@ public class ExceptionHandlerTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testHandleBarBaz() throws Exception {
+    void testHandleBarBaz() throws Exception {
         Throwable t = assertThrows(Throwable.class, () -> 
context.getValue("bar/baz"), "expected Throwable");
         while (t != null) {
             if ("baz unavailable".equals(t.getMessage())) {
@@ -76,7 +76,7 @@ public class ExceptionHandlerTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testHandleFoo() throws Exception {
+    void testHandleFoo() throws Exception {
         Throwable t = assertThrows(Throwable.class, () -> 
context.getValue("foo"), "expected Throwable");
         while (t != null) {
             if ("foo unavailable".equals(t.getMessage())) {
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
index a5beb2d..d38fafe 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
@@ -65,14 +65,14 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testConstant() {
+    void testConstant() {
         assertXPathExpression("1", Constant.class);
         assertXPathExpression("1.5", Constant.class);
         assertXPathExpression("'foo'", Constant.class);
     }
 
     @Test
-    public void testCoreFunction() {
+    void testCoreFunction() {
         assertXPathExpression("last()", CoreFunction.class);
         assertXPathExpression("position()", CoreFunction.class);
         assertXPathExpression("count(book)", CoreFunction.class);
@@ -110,87 +110,87 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCoreOperationAnd() {
+    void testCoreOperationAnd() {
         assertXPathExpression("2 and 4", CoreOperationAnd.class);
         assertXPathExpression("2 > 1 and 4 < 5", CoreOperationAnd.class);
     }
 
     @Test
-    public void testCoreOperationDivide() {
+    void testCoreOperationDivide() {
         assertXPathExpression("2 div 4", CoreOperationDivide.class);
         assertXPathExpression("2|3 div -3", CoreOperationDivide.class, "2 | 3 
div -3");
     }
 
     @Test
-    public void testCoreOperationEqual() {
+    void testCoreOperationEqual() {
         assertXPathExpression("2 = 4", CoreOperationEqual.class);
         assertXPathExpression("2 + 1 = 3", CoreOperationEqual.class);
     }
 
     @Test
-    public void testCoreOperationGreaterThan() {
+    void testCoreOperationGreaterThan() {
         assertXPathExpression("3>4", CoreOperationGreaterThan.class, "3 > 4");
         assertXPathExpression("3>(2>=1)", CoreOperationGreaterThan.class, "3 > 
(2 >= 1)");
         assertXPathExpression("1 > (1 and 2 <= (2 or 3) = 4)", 
CoreOperationGreaterThan.class);
     }
 
     @Test
-    public void testCoreOperationGreaterThanOrEqual() {
+    void testCoreOperationGreaterThanOrEqual() {
         assertXPathExpression("3>=4", CoreOperationGreaterThanOrEqual.class, 
"3 >= 4");
         assertXPathExpression("3>=(2>=1)", 
CoreOperationGreaterThanOrEqual.class, "3 >= (2 >= 1)");
     }
 
     @Test
-    public void testCoreOperationLessThan() {
+    void testCoreOperationLessThan() {
         assertXPathExpression("3<4", CoreOperationLessThan.class, "3 < 4");
         assertXPathExpression("3<(2>=1)", CoreOperationLessThan.class, "3 < (2 
>= 1)");
     }
 
     @Test
-    public void testCoreOperationLessThanOrEqual() {
+    void testCoreOperationLessThanOrEqual() {
         assertXPathExpression("3<=4", CoreOperationLessThanOrEqual.class, "3 
<= 4");
         assertXPathExpression("3<=(2>=1)", CoreOperationLessThanOrEqual.class, 
"3 <= (2 >= 1)");
     }
 
     @Test
-    public void testCoreOperationMinus() {
+    void testCoreOperationMinus() {
         assertXPathExpression("1 - 1", CoreOperationSubtract.class);
         assertXPathExpression("1 - 1 - 2", CoreOperationSubtract.class);
         assertXPathExpression("1 - (1 - 2)", CoreOperationSubtract.class);
     }
 
     @Test
-    public void testCoreOperationMod() {
+    void testCoreOperationMod() {
         assertXPathExpression("2 mod 4", CoreOperationMod.class);
         assertXPathExpression("2|3 mod -3", CoreOperationMod.class, "2 | 3 mod 
-3");
     }
 
     @Test
-    public void testCoreOperationMultiply() {
+    void testCoreOperationMultiply() {
         assertXPathExpression("2*4", CoreOperationMultiply.class, "2 * 4");
         assertXPathExpression("2*(3 + 1)", CoreOperationMultiply.class, "2 * 
(3 + 1)");
     }
 
     @Test
-    public void testCoreOperationNameAttributeTest() {
+    void testCoreOperationNameAttributeTest() {
         assertXPathExpression("@name = 'bar'", NameAttributeTest.class);
     }
 
     @Test
-    public void testCoreOperationNotEqual() {
+    void testCoreOperationNotEqual() {
         assertXPathExpression("2 != 4", CoreOperationNotEqual.class);
         assertXPathExpression("2 + 1 != 3", CoreOperationNotEqual.class);
     }
 
     @Test
-    public void testCoreOperationOr() {
+    void testCoreOperationOr() {
         assertXPathExpression("2 or 4", CoreOperationOr.class);
         assertXPathExpression("2 > 1 or 4 < 5", CoreOperationOr.class);
         assertXPathExpression("1 > 1 and 2 <= 2 or 3 = 4", 
CoreOperationOr.class);
     }
 
     @Test
-    public void testCoreOperationSum() {
+    void testCoreOperationSum() {
         assertXPathExpression("3 + 1 + 4", CoreOperationAdd.class);
         assertXPathExpression("(3 + 1) + 4", CoreOperationAdd.class, "3 + 1 + 
4");
         assertXPathExpression("3 + (1 + 4)", CoreOperationAdd.class, "3 + 1 + 
4");
@@ -199,30 +199,30 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCoreOperationUnaryMinus() {
+    void testCoreOperationUnaryMinus() {
         assertXPathExpression("-3", CoreOperationNegate.class);
         assertXPathExpression("-(3 + 1)", CoreOperationNegate.class);
     }
 
     @Test
-    public void testCoreOperationUnion() {
+    void testCoreOperationUnion() {
         assertXPathExpression("3 | 1 | 4", CoreOperationUnion.class);
     }
 
     @Test
-    public void testExpressionPath() {
+    void testExpressionPath() {
         assertXPathExpression("$x/foo/bar", ExpressionPath.class);
         assertXPathExpression("(2 + 2)/foo/bar", ExpressionPath.class);
         assertXPathExpression("$x[3][2 + 2]/foo/bar", ExpressionPath.class);
     }
 
     @Test
-    public void testExtensionFunction() {
+    void testExtensionFunction() {
         assertXPathExpression("my:function(3, other.function())", 
ExtensionFunction.class);
     }
 
     @Test
-    public void testLocationPathAxisAttribute() {
+    void testLocationPathAxisAttribute() {
         assertXPathExpression("attribute::foo:bar", LocationPath.class, 
"@foo:bar");
         assertXPathExpression("@foo:bar", LocationPath.class);
         assertXPathExpression("../@foo:bar", LocationPath.class);
@@ -231,7 +231,7 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testLocationPathAxisChild() {
+    void testLocationPathAxisChild() {
         assertXPathExpression("child::foo:bar", LocationPath.class, "foo:bar");
         assertXPathExpression("foo:bar", LocationPath.class);
         assertXPathExpression("/foo:bar", LocationPath.class);
@@ -241,19 +241,19 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testLocationPathAxisDescendant() {
+    void testLocationPathAxisDescendant() {
         assertXPathExpression("descendant::foo:bar", LocationPath.class);
     }
 
     @Test
-    public void testLocationPathAxisDescendantOrSelf() {
+    void testLocationPathAxisDescendantOrSelf() {
         assertXPathExpression("descendant-or-self::foo:bar", 
LocationPath.class);
         assertXPathExpression("//foo", LocationPath.class);
         assertXPathExpression("foo//bar", LocationPath.class);
     }
 
     @Test
-    public void testLocationPathAxisOther() {
+    void testLocationPathAxisOther() {
         assertXPathExpression("ancestor::foo:bar", LocationPath.class);
         assertXPathExpression("ancestor-or-self::foo:bar", LocationPath.class);
         assertXPathExpression("namespace::foo:bar", LocationPath.class);
@@ -264,19 +264,19 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testLocationPathAxisParent() {
+    void testLocationPathAxisParent() {
         assertXPathExpression("parent::foo:bar", LocationPath.class);
         assertXPathExpression("..", LocationPath.class);
     }
 
     @Test
-    public void testLocationPathAxisSelf() {
+    void testLocationPathAxisSelf() {
         assertXPathExpression("self::foo:bar", LocationPath.class);
         assertXPathExpression(".", LocationPath.class);
     }
 
     @Test
-    public void testLocationPathNodeTest() {
+    void testLocationPathNodeTest() {
         assertXPathExpression("node()", LocationPath.class);
         assertXPathExpression("text()", LocationPath.class);
         assertXPathExpression("comment()", LocationPath.class);
@@ -285,7 +285,7 @@ public class JXPathCompiledExpressionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testVariableReference() {
+    void testVariableReference() {
         assertXPathExpression("$x", VariableReference.class);
         assertXPathExpression("$x:y", VariableReference.class);
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
 
b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
index b9ff135..371f6ca 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
@@ -26,7 +26,7 @@ public class JXPathContextReferenceImplTestCase {
      * https://issues.apache.org/jira/browse/JXPATH-166
      */
     @Test
-    public void testInit() {
+    void testInit() {
         final ContainerPointerFactory factory = new ContainerPointerFactory();
         try {
             JXPathContextReferenceImpl.addNodePointerFactory(factory);
diff --git a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
index dbf3855..ca822ea 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
@@ -54,7 +54,7 @@ public class StressTest {
     private static Throwable exception;
 
     @Test
-    public void testThreads() throws Throwable {
+    void testThreads() throws Throwable {
         context = JXPathContext.newContext(null, Double.valueOf(100));
         final Thread[] threadArray = new Thread[THREAD_COUNT];
         for (int i = 0; i < THREAD_COUNT; i++) {
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java
index 01d3375..7463d8c 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java
@@ -45,7 +45,7 @@ public class RecursiveAxesTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testInfiniteDescent() {
+    void testInfiniteDescent() {
         // Existing scalar property
         assertXPathPointer(context, "//.[name = 'three']", 
"/first/first/second");
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
index a36120a..0206b87 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreterTest.java
@@ -126,7 +126,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoPredicateIndex() {
+    void testDoPredicateIndex() {
         // Existing dynamic property + existing property + index
         assertValueAndPointer("/map[@name='Key2'][@name='strings'][2]", 
"String 2", "/map[@name='Key2']/strings[2]", "BbDdBb", "BbDdBbB");
         // existingProperty[@name=collectionProperty][index]
@@ -178,7 +178,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoPredicateName() {
+    void testDoPredicateName() {
         // existingProperty[@name=existingProperty]
         assertValueAndPointer("/nestedBean[@name='int']", Integer.valueOf(1), 
"/nestedBean/int", "BbBb", "BbBbB");
         // /self::node()[@name=existingProperty]
@@ -225,7 +225,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoPredicatesStandard() {
+    void testDoPredicatesStandard() {
         // bean/map/collection/node
         assertValueAndPointer("map[@name='Key3'][@name='fruitco']", 
context.getValue("/vendor"), "/map[@name='Key3'][3]", "BbDdCM");
         // bean/map/collection/missingNode
@@ -243,7 +243,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoStepNoPredicatesPropertyOwner() {
+    void testDoStepNoPredicatesPropertyOwner() {
         // Existing scalar property
         assertValueAndPointer("/int", Integer.valueOf(1), "/int", "Bb", "BbB");
         // self::
@@ -277,7 +277,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoStepNoPredicatesStandard() {
+    void testDoStepNoPredicatesStandard() {
         // Existing DOM node
         assertValueAndPointer("/vendor/location/address/city", "Fruit Market", 
"/vendor/location[2]/address[1]/city[1]", "BbMMMM");
         // Missing DOM node
@@ -289,7 +289,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoStepPredicatesPropertyOwner() {
+    void testDoStepPredicatesPropertyOwner() {
         // missingProperty[@name=foo]
         assertNullPointer("/foo[@name='foo']", "/foo[@name='foo']", "BnNn");
         // missingProperty[index]
@@ -297,7 +297,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testDoStepPredicatesStandard() {
+    void testDoStepPredicatesStandard() {
         // Looking for an actual XML attribute called "name"
         // nodeProperty/name[@name=value]
         assertValueAndPointer("/vendor/contact[@name='jack']", "Jack", 
"/vendor/contact[2]", "BbMM");
@@ -312,7 +312,7 @@ public class SimplePathInterpreterTest {
     }
 
     @Test
-    public void testInterpretExpressionPath() {
+    void testInterpretExpressionPath() {
         context.getVariables().declareVariable("array", new String[] { 
"Value1" });
         context.getVariables().declareVariable("testnull", new TestNull());
         assertNullPointer("$testnull/nothing[2]", "$testnull/nothing[2]", 
"VBbE");
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java
index b39ffdd..926104c 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/ContextDependencyTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class ContextDependencyTest extends AbstractJXPathTest {
 
     @Test
-    public void testContextDependency() {
+    void testContextDependency() {
         testContextDependency("1", false);
         testContextDependency("$x", false);
         testContextDependency("/foo", false);
@@ -42,7 +42,7 @@ public class ContextDependencyTest extends AbstractJXPathTest 
{
         testContextDependency("test:func(3, foo)", true);
     }
 
-    public void testContextDependency(final String xpath, final boolean 
expected) {
+    void testContextDependency(final String xpath, final boolean expected) {
         final Expression expr = (Expression) Parser.parseExpression(xpath, new 
TreeCompiler());
         assertEquals(expected, expr.isContextDependent(), "Context dependency 
<" + xpath + ">");
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java
index 95bf6b4..13afd26 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java
@@ -52,7 +52,7 @@ public class CoreFunctionTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCoreFunctions() {
+    void testCoreFunctions() {
         assertXPathValue(context, "string(2)", "2");
         assertXPathValue(context, "string($nan)", "NaN");
         assertXPathValue(context, "string(-$nan)", "NaN");
@@ -115,7 +115,7 @@ public class CoreFunctionTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testExtendedKeyFunction() {
+    void testExtendedKeyFunction() {
         context.setKeyManager(new ExtendedKeyManager() {
 
             @Override
@@ -156,7 +156,7 @@ public class CoreFunctionTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testFormatNumberFunction() {
+    void testFormatNumberFunction() {
         final DecimalFormatSymbols symbols = new DecimalFormatSymbols();
         symbols.setDigit('D');
         context.setDecimalFormatSymbols("test", symbols);
@@ -169,7 +169,7 @@ public class CoreFunctionTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIDFunction() {
+    void testIDFunction() {
         context.setIdentityManager((context, id) -> {
             NodePointer ptr = (NodePointer) context.getPointer("/document");
             ptr = ptr.getValuePointer();
@@ -180,7 +180,7 @@ public class CoreFunctionTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testKeyFunction() {
+    void testKeyFunction() {
         context.setKeyManager((context, key, value) -> 
NodePointer.newNodePointer(null, "42", null));
         assertXPathValue(context, "key('a', 'b')", "42");
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java
index d6431b0..f007588 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java
@@ -43,7 +43,7 @@ public class CoreOperationTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testEmptyNodeSetOperations() {
+    void testEmptyNodeSetOperations() {
         assertXPathValue(context, "/idonotexist = 0", Boolean.FALSE, 
Boolean.class);
         assertXPathValue(context, "/idonotexist != 0", Boolean.FALSE, 
Boolean.class);
         assertXPathValue(context, "/idonotexist < 0", Boolean.FALSE, 
Boolean.class);
@@ -59,7 +59,7 @@ public class CoreOperationTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testInfoSetTypes() {
+    void testInfoSetTypes() {
         // Numbers
         assertXPathValue(context, "1", Double.valueOf(1.0));
         assertXPathPointer(context, "1", "1");
@@ -98,7 +98,7 @@ public class CoreOperationTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testNan() {
+    void testNan() {
         assertXPathValue(context, "$nan > $nan", Boolean.FALSE, Boolean.class);
         assertXPathValue(context, "$nan < $nan", Boolean.FALSE, Boolean.class);
         assertXPathValue(context, "$nan >= $nan", Boolean.FALSE, 
Boolean.class);
@@ -123,7 +123,7 @@ public class CoreOperationTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testNodeSetOperations() {
+    void testNodeSetOperations() {
         assertXPathValue(context, "$array > 0", Boolean.TRUE, Boolean.class);
         assertXPathValue(context, "$array >= 0", Boolean.TRUE, Boolean.class);
         assertXPathValue(context, "$array = 0", Boolean.FALSE, Boolean.class);
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
index 0f2f0d7..ed3b756 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
@@ -112,7 +112,7 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAllocation() {
+    void testAllocation() {
         // Allocate new object using the default constructor
         assertXPathValue(context, "string(test:new())", "foo=0; bar=null");
         // Allocate new object using PackageFunctions and class name
@@ -128,14 +128,14 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testBCNodeSetHack() {
+    void testBCNodeSetHack() {
         TypeUtils.setTypeConverter(new JXPath11CompatibleTypeConverter());
         assertXPathValue(context, "test:isInstance(//strings, $List.class)", 
Boolean.FALSE);
         assertXPathValue(context, "test:isInstance(//strings, 
$NodeSet.class)", Boolean.TRUE);
     }
 
     @Test
-    public void testCollectionMethodCall() {
+    void testCollectionMethodCall() {
         final List list = new ArrayList();
         list.add("foo");
         context.getVariables().declareVariable("myList", list);
@@ -148,7 +148,7 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCollectionReturn() {
+    void testCollectionReturn() {
         assertXPathValueIterator(context, "test:collection()/name", 
list("foo", "bar"));
         assertXPathPointerIterator(context, "test:collection()/name", 
list("/.[1]/name", "/.[2]/name"));
         assertXPathValue(context, "test:collection()/name", "foo");
@@ -163,27 +163,27 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testConstructorLookup() {
+    void testConstructorLookup() {
         final Object[] args = { Integer.valueOf(1), "x" };
         final Function func = functions.getFunction("test", "new", args);
         assertEquals("foo=1; bar=x", func.invoke(new Context(null), 
args).toString(), "test:new(1, x)");
     }
 
     @Test
-    public void testConstructorLookupWithExpressionContext() {
+    void testConstructorLookupWithExpressionContext() {
         final Object[] args = { "baz" };
         final Function func = functions.getFunction("test", "new", args);
         assertEquals("foo=1; bar=baz", func.invoke(new 
Context(Integer.valueOf(1)), args).toString(), "test:new('baz')");
     }
 
     @Test
-    public void testEstablishNodeSetBaseline() {
+    void testEstablishNodeSetBaseline() {
         assertXPathValue(context, "test:isInstance(//strings, $List.class)", 
Boolean.TRUE);
         assertXPathValue(context, "test:isInstance(//strings, 
$NodeSet.class)", Boolean.FALSE);
     }
 
     @Test
-    public void testExpressionContext() {
+    void testExpressionContext() {
         // Execute an extension function for each node while searching
         // The function uses ExpressionContext to get to the current
         // node.
@@ -203,7 +203,7 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testMethodCall() {
+    void testMethodCall() {
         assertXPathValue(context, "length('foo')", Integer.valueOf(3));
         // We are just calling a method - prefix is ignored
         assertXPathValue(context, "call:substring('foo', 1, 2)", "o");
@@ -218,28 +218,28 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testMethodLookup() {
+    void testMethodLookup() {
         final Object[] args = { new TestFunctions() };
         final Function func = functions.getFunction("test", "getFoo", args);
         assertEquals("0", func.invoke(new Context(null), args).toString(), 
"test:getFoo($test, 1, x)");
     }
 
     @Test
-    public void testMethodLookupWithExpressionContext() {
+    void testMethodLookupWithExpressionContext() {
         final Object[] args = { new TestFunctions() };
         final Function func = functions.getFunction("test", "instancePath", 
args);
         assertEquals("1", func.invoke(new Context(Integer.valueOf(1)), args), 
"test:instancePath()");
     }
 
     @Test
-    public void testMethodLookupWithExpressionContextAndArgument() {
+    void testMethodLookupWithExpressionContextAndArgument() {
         final Object[] args = { new TestFunctions(), "*" };
         final Function func = functions.getFunction("test", "pathWithSuffix", 
args);
         assertEquals("1*", func.invoke(new Context(Integer.valueOf(1)), args), 
"test:pathWithSuffix('*')");
     }
 
     @Test
-    public void testNodeSetReturn() {
+    void testNodeSetReturn() {
         assertXPathValueIterator(context, "test:nodeSet()/name", list("Name 
1", "Name 2"));
         assertXPathValueIterator(context, "test:nodeSet()", 
list(testBean.getBeans()[0], testBean.getBeans()[1]));
         assertXPathPointerIterator(context, "test:nodeSet()/name", 
list("/beans[1]/name", "/beans[2]/name"));
@@ -250,7 +250,7 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testStaticMethodCall() {
+    void testStaticMethodCall() {
         assertXPathValue(context, "string(test:build(8, 'goober'))", "foo=8; 
bar=goober");
         // Call a static method using PackageFunctions and class name
         assertXPathValue(context, "string(jxpathtest:TestFunctions.build(8, 
'goober'))", "foo=8; bar=goober");
@@ -264,21 +264,21 @@ public class ExtensionFunctionTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testStaticMethodLookup() {
+    void testStaticMethodLookup() {
         final Object[] args = { Integer.valueOf(1), "x" };
         final Function func = functions.getFunction("test", "build", args);
         assertEquals("foo=1; bar=x", func.invoke(new Context(null), 
args).toString(), "test:build(1, x)");
     }
 
     @Test
-    public void testStaticMethodLookupWithConversion() {
+    void testStaticMethodLookupWithConversion() {
         final Object[] args = { "7", Integer.valueOf(1) };
         final Function func = functions.getFunction("test", "build", args);
         assertEquals("foo=7; bar=1", func.invoke(new Context(null), 
args).toString(), "test:build('7', 1)");
     }
 
     @Test
-    public void testStaticMethodLookupWithExpressionContext() {
+    void testStaticMethodLookupWithExpressionContext() {
         final Object[] args = {};
         final Function func = functions.getFunction("test", "path", args);
         assertEquals("1", func.invoke(new Context(Integer.valueOf(1)), args), 
"test:path()");
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/compiler/VariableTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/compiler/VariableTest.java
index 4e51400..ccb3efc 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/compiler/VariableTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/compiler/VariableTest.java
@@ -53,7 +53,7 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreateAndSetValuePathDeclareVariableSetCollectionElement() 
{
+    void testCreateAndSetValuePathDeclareVariableSetCollectionElement() {
         // Calls factory.declareVariable("stringArray").
         // The factory needs to create a collection
         assertXPathCreatePathAndSetValue(context, "$stringArray[2]", "Value2", 
"$stringArray[2]");
@@ -62,20 +62,20 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueDeclareVariable() {
+    void testCreatePathAndSetValueDeclareVariable() {
         // Calls factory.declareVariable("string")
         assertXPathCreatePathAndSetValue(context, "$string", "Value", 
"$string");
     }
 
     @Test
-    public void testCreatePathAndSetValueDeclareVariableSetProperty() {
+    void testCreatePathAndSetValueDeclareVariableSetProperty() {
         // Calls factory.declareVariable("test").
         // The factory should create a TestBean
         assertXPathCreatePathAndSetValue(context, "$test/boolean", 
Boolean.TRUE, "$test/boolean");
     }
 
     @Test
-    public void testCreatePathAndSetValueDeclVarSetCollectionElementProperty() 
{
+    void testCreatePathAndSetValueDeclVarSetCollectionElementProperty() {
         // Calls factory.declareVariable("testArray").
         // The factory should create a collection of TestBeans.
         // Then calls factory.createObject(..., collection, "testArray", 1).
@@ -85,7 +85,7 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueExpandCollection() {
+    void testCreatePathAndSetValueExpandCollection() {
         context.getVariables().declareVariable("array", new String[] { 
"Value1" });
         // Does not involve factory at all - just expands the collection
         assertXPathCreatePathAndSetValue(context, "$array[2]", "Value2", 
"$array[2]");
@@ -94,13 +94,13 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathDeclareVariable() {
+    void testCreatePathDeclareVariable() {
         // Calls factory.declareVariable("string")
         assertXPathCreatePath(context, "$string", null, "$string");
     }
 
     @Test
-    public void testCreatePathDeclareVariableSetCollectionElement() {
+    void testCreatePathDeclareVariableSetCollectionElement() {
         // Calls factory.declareVariable("stringArray").
         // The factory needs to create a collection
         assertXPathCreatePath(context, "$stringArray[2]", "", 
"$stringArray[2]");
@@ -109,7 +109,7 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathDeclareVariableSetCollectionElementProperty() {
+    void testCreatePathDeclareVariableSetCollectionElementProperty() {
         // Calls factory.declareVariable("testArray").
         // The factory should create a collection of TestBeans.
         // Then calls factory.createObject(..., collection, "testArray", 1).
@@ -119,14 +119,14 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathDeclareVariableSetProperty() {
+    void testCreatePathDeclareVariableSetProperty() {
         // Calls factory.declareVariable("test").
         // The factory should create a TestBean
         assertXPathCreatePath(context, "$test/boolean", Boolean.FALSE, 
"$test/boolean");
     }
 
     @Test
-    public void testCreatePathExpandCollection() {
+    void testCreatePathExpandCollection() {
         context.getVariables().declareVariable("array", new String[] { 
"Value1" });
         // Does not involve factory at all - just expands the collection
         assertXPathCreatePath(context, "$array[2]", "", "$array[2]");
@@ -135,26 +135,26 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testInvalidVariableName() {
+    void testInvalidVariableName() {
         assertThrows(Exception.class, () -> context.getValue("$none"), 
"Evaluating '$none', expected exception - did not get it");
         assertThrows(Exception.class, () -> context.setValue("$none", 
Integer.valueOf(1)), "Setting '$none = 1', expected exception - did not get 
it");
     }
 
     @Test
-    public void testIterateVariable() throws Exception {
+    void testIterateVariable() throws Exception {
         assertXPathValueIterator(context, "$d", list("a", "b"));
         assertXPathValue(context, "$d = 'a'", Boolean.TRUE);
         assertXPathValue(context, "$d = 'b'", Boolean.TRUE);
     }
 
     @Test
-    public void testNestedContext() {
+    void testNestedContext() {
         final JXPathContext nestedContext = JXPathContext.newContext(context, 
null);
         assertXPathValue(nestedContext, "$a", Double.valueOf(1));
     }
 
     @Test
-    public void testRemovePathArrayElement() {
+    void testRemovePathArrayElement() {
         // Remove array element - reassigns the new array to the var
         context.getVariables().declareVariable("temp", new String[] { "temp1", 
"temp2" });
         context.removePath("$temp[1]");
@@ -162,7 +162,7 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testRemovePathCollectionElement() {
+    void testRemovePathCollectionElement() {
         // Remove list element - does not create a new list
         context.getVariables().declareVariable("temp", list("temp1", "temp2"));
         context.removePath("$temp[1]");
@@ -170,7 +170,7 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testRemovePathUndeclareVariable() {
+    void testRemovePathUndeclareVariable() {
         // Undeclare variable
         context.getVariables().declareVariable("temp", "temp");
         context.removePath("$temp");
@@ -178,25 +178,25 @@ public class VariableTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testSetValue() {
+    void testSetValue() {
         assertXPathSetValue(context, "$x", Integer.valueOf(1));
     }
 
     @Test
-    public void testUnionOfVariableAndNode() throws Exception {
+    void testUnionOfVariableAndNode() throws Exception {
         assertXPathValue(context, "count($a | /document/vendor/location)", 
Double.valueOf(3));
         assertXPathValue(context, "count($a | /list)", Double.valueOf(7)); // 
$o + list which contains six discrete values (one is duped, wrapped in a
                                                                            // 
Container)
     }
 
     @Test
-    public void testVariables() {
+    void testVariables() {
         // Variables
         assertXPathValueAndPointer(context, "$a", Double.valueOf(1), "$a");
     }
 
     @Test
-    public void testVariablesInExpressions() {
+    void testVariablesInExpressions() {
         assertXPathValue(context, "$a = $b", Boolean.TRUE);
         assertXPathValue(context, "$a = $nan", Boolean.FALSE);
         assertXPathValue(context, "$a + 1", Double.valueOf(2));
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
index 16b8534..0e8c648 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
@@ -74,7 +74,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAttributeLang() {
+    void testAttributeLang() {
         assertXPathValue(context, "@xml:lang", "en-US");
         assertXPathValue(context, "count(@xml:*)", Double.valueOf(1));
         assertXPathValue(context, "lang('en')", Boolean.TRUE);
@@ -85,13 +85,13 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
      * Testing the pseudo-attribute "name" that java beans objects appear to 
have.
      */
     @Test
-    public void testAttributeName() {
+    void testAttributeName() {
         assertXPathValue(context, "nestedBean[@name = 'int']", 
Integer.valueOf(1));
         assertXPathPointer(context, "nestedBean[@name = 'int']", 
"/nestedBean/int");
     }
 
     @Test
-    public void testAxisAncestor() {
+    void testAxisAncestor() {
         // ancestor::
         assertXPathValue(context, "int/ancestor::root = /", Boolean.TRUE);
         assertXPathValue(context, 
"count(beans/name/ancestor-or-self::node())", Double.valueOf(5));
@@ -99,7 +99,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisAttribute() {
+    void testAxisAttribute() {
         // Attributes are just like children to beans
         assertXPathValue(context, "count(@*)", Double.valueOf(21.0));
         // Unknown attribute
@@ -107,7 +107,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChild() {
+    void testAxisChild() {
         assertXPathValue(context, "boolean", Boolean.FALSE);
         assertXPathPointer(context, "boolean", "/boolean");
         assertXPathPointerIterator(context, "boolean", list("/boolean"));
@@ -123,7 +123,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChildNestedBean() {
+    void testAxisChildNestedBean() {
         // Nested bean
         assertXPathValue(context, "nestedBean/name", "Name 0");
         assertXPathPointer(context, "nestedBean/name", "/nestedBean/name");
@@ -131,14 +131,14 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChildNestedCollection() {
+    void testAxisChildNestedCollection() {
         assertXPathValueIterator(context, "integers", list(Integer.valueOf(1), 
Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4)));
         assertXPathPointer(context, "integers", "/integers");
         assertXPathPointerIterator(context, "integers", list("/integers[1]", 
"/integers[2]", "/integers[3]", "/integers[4]"));
     }
 
     @Test
-    public void testAxisDescendant() {
+    void testAxisDescendant() {
         // descendant::
         assertXPathValue(context, "count(descendant::node())", 
Double.valueOf(65));
         // Should not find any descendants with name root
@@ -147,7 +147,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisDescendantOrSelf() {
+    void testAxisDescendantOrSelf() {
         // descendant-or-self::
         assertXPathValueIterator(context, "descendant-or-self::name", 
set("Name 1", "Name 2", "Name 3", "Name 6", "Name 0", "Name 5", "Name 4"));
         // Same - abbreviated syntax
@@ -163,14 +163,14 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisFollowing() {
+    void testAxisFollowing() {
         // following::
         assertXPathValue(context, 
"count(nestedBean/strings[2]/following::node())", Double.valueOf(21));
         assertXPathValue(context, 
"count(nestedBean/strings[2]/following::strings)", Double.valueOf(7));
     }
 
     @Test
-    public void testAxisFollowingSibling() {
+    void testAxisFollowingSibling() {
         // following-sibling::
         assertXPathValue(context, 
"count(/nestedBean/following-sibling::node())", Double.valueOf(8));
         assertXPathValue(context, 
"count(/nestedBean/following-sibling::object)", Double.valueOf(1));
@@ -183,7 +183,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisParent() {
+    void testAxisParent() {
         // parent::
         assertXPathValue(context, "count(/beans/..)", Double.valueOf(1));
         assertXPathValue(context, "count(//..)", Double.valueOf(9));
@@ -192,14 +192,14 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisPreceding() {
+    void testAxisPreceding() {
         // preceding::
         assertXPathValue(context, "count(beans[2]/int/preceding::node())", 
Double.valueOf(8));
         assertXPathValue(context, "count(beans[2]/int/preceding::boolean)", 
Double.valueOf(2));
     }
 
     @Test
-    public void testAxisPrecedingSibling() {
+    void testAxisPrecedingSibling() {
         // preceding-sibling::
         assertXPathValue(context, "count(/boolean/preceding-sibling::node())", 
Double.valueOf(2));
         assertXPathValue(context, 
"count(/nestedBean/int/../preceding-sibling::node())", Double.valueOf(12));
@@ -207,14 +207,14 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisSelf() {
+    void testAxisSelf() {
         // self::
         assertXPathValue(context, "self::node() = /", Boolean.TRUE);
         assertXPathValue(context, "self::root = /", Boolean.TRUE);
     }
 
     @Test
-    public void testBooleanPredicate() {
+    void testBooleanPredicate() {
         // use child axis
         // bean[1]/int = 1
         // bean[2]/int = 3
@@ -237,7 +237,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCoreFunctions() {
+    void testCoreFunctions() {
         assertXPathValue(context, "boolean(boolean)", Boolean.TRUE);
         assertXPathValue(context, "boolean(boolean = false())", Boolean.TRUE);
         assertXPathValue(context, "boolean(integers[position() < 3])", 
Boolean.TRUE);
@@ -248,7 +248,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePath() {
+    void testCreatePath() {
         context.setValue("nestedBean", null);
         // Calls factory.createObject(..., TestBean, "nestedBean")
         assertXPathCreatePath(context, "/nestedBean/int", Integer.valueOf(1), 
"/nestedBean/int");
@@ -258,14 +258,14 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValue() {
+    void testCreatePathAndSetValue() {
         context.setValue("nestedBean", null);
         // Calls factory.createObject(..., TestBean, "nestedBean")
         assertXPathCreatePathAndSetValue(context, "/nestedBean/int", 
Integer.valueOf(2), "/nestedBean/int");
     }
 
     @Test
-    public void testCreatePathAndSetValueCreateBeanExpandCollection() {
+    void testCreatePathAndSetValueCreateBeanExpandCollection() {
         context.setValue("nestedBean", null);
         // Calls factory.createObject(..., TestBean, "nestedBean")
         // Calls factory.createObject(..., nestedBean, "strings", 2)
@@ -273,13 +273,13 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueExpandExistingCollection() {
+    void testCreatePathAndSetValueExpandExistingCollection() {
         // Another, but the collection already exists
         assertXPathCreatePathAndSetValue(context, "/beans[3]/int", 
Integer.valueOf(2), "/beans[3]/int");
     }
 
     @Test
-    public void testCreatePathAndSetValueExpandNewCollection() {
+    void testCreatePathAndSetValueExpandNewCollection() {
         context.setValue("beans", null);
         // Calls factory.createObject(..., testBean, "beans", 2),
         // then factory.createObject(..., testBean, "beans", 2)
@@ -287,7 +287,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathCreateBeanExpandCollection() {
+    void testCreatePathCreateBeanExpandCollection() {
         context.setValue("nestedBean", null);
         // Calls factory.createObject(..., TestBean, "nestedBean")
         // Calls factory.createObject(..., nestedBean, "strings", 2)
@@ -295,20 +295,20 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathExpandExistingCollection() {
+    void testCreatePathExpandExistingCollection() {
         // Calls factory.createObject(..., TestBean, "integers", 5)
         // to expand collection
         assertXPathCreatePathAndSetValue(context, "/integers[5]", 
Integer.valueOf(3), "/integers[5]");
     }
 
     @Test
-    public void testCreatePathExpandExistingCollectionAndSetProperty() {
+    void testCreatePathExpandExistingCollectionAndSetProperty() {
         // Another, but the collection already exists
         assertXPathCreatePath(context, "/beans[3]/int", Integer.valueOf(1), 
"/beans[3]/int");
     }
 
     @Test
-    public void testCreatePathExpandNewCollection() {
+    void testCreatePathExpandNewCollection() {
         context.setValue("beans", null);
         // Calls factory.createObject(..., testBean, "beans", 2),
         // then factory.createObject(..., testBean, "beans", 2)
@@ -316,7 +316,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testDocumentOrder() {
+    void testDocumentOrder() {
         assertDocumentOrder(context, "boolean", "int", -1);
         assertDocumentOrder(context, "integers[1]", "integers[2]", -1);
         assertDocumentOrder(context, "integers[1]", "integers[1]", 0);
@@ -326,7 +326,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIndexPredicate() {
+    void testIndexPredicate() {
         assertXPathValue(context, "integers[2]", Integer.valueOf(2));
         assertXPathPointer(context, "integers[2]", "/integers[2]");
         assertXPathPointerIterator(context, "integers[2]", 
list("/integers[2]"));
@@ -362,7 +362,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
      * Test property iterators, the core of the graph traversal engine
      */
     @Test
-    public void testIndividualIterators() {
+    void testIndividualIterators() {
         testIndividual(+1, 0, true, false, 0);
         testIndividual(-1, 0, true, false, 4);
         testIndividual(0, -1, true, true, 4);
@@ -375,7 +375,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIterateAndSet() {
+    void testIterateAndSet() {
         final JXPathContext context = 
JXPathContext.newContext(createContextBean());
         Iterator<Pointer> it = context.iteratePointers("beans/int");
         int i = 5;
@@ -395,7 +395,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
      * Test contributed by Kate Dvortsova
      */
     @Test
-    public void testIteratePointerSetValue() {
+    void testIteratePointerSetValue() {
         final JXPathContext context = 
JXPathContext.newContext(createContextBean());
         assertXPathValue(context, "/beans[1]/name", "Name 1");
         assertXPathValue(context, "/beans[2]/name", "Name 2");
@@ -423,7 +423,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIteratePropertyArrayWithHasNext() {
+    void testIteratePropertyArrayWithHasNext() {
         final JXPathContext context = 
JXPathContext.newContext(createContextBean());
         final Iterator<Pointer> it = context.iteratePointers("/integers");
         final List<String> actual = new ArrayList<>();
@@ -434,7 +434,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIteratePropertyArrayWithoutHasNext() {
+    void testIteratePropertyArrayWithoutHasNext() {
         final JXPathContext context = 
JXPathContext.newContext(createContextBean());
         final Iterator<Pointer> it = context.iteratePointers("/integers");
         final List<String> actual = new ArrayList<>();
@@ -467,7 +467,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
      * Test property iterators with multiple properties returned
      */
     @Test
-    public void testMultipleIterators() {
+    void testMultipleIterators() {
         testMultiple(0, 0, true, false, 20);
         testMultiple(3, 0, true, false, 16);
         testMultiple(3, -1, true, true, 8);
@@ -479,75 +479,75 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testRelativeContextAbsolutePath() {
+    void testRelativeContextAbsolutePath() {
         final JXPathContext relative = 
context.getRelativeContext(context.getPointer("nestedBean"));
         assertXPathValueAndPointer(relative, "/integers[2]", 
Integer.valueOf(2), "/integers[2]");
     }
 
     @Test
-    public void testRelativeContextInheritance() {
+    void testRelativeContextInheritance() {
         context.setFunctions(new ClassFunctions(TestFunctions.class, "test"));
         final JXPathContext relative = 
context.getRelativeContext(context.getPointer("nestedBean"));
         assertXPathValue(relative, "test:countPointers(strings)", 
Integer.valueOf(3));
     }
 
     @Test
-    public void testRelativeContextParent() {
+    void testRelativeContextParent() {
         final JXPathContext relative = 
context.getRelativeContext(context.getPointer("nestedBean"));
         assertXPathValueAndPointer(relative, "../integers[2]", 
Integer.valueOf(2), "/integers[2]");
     }
 
     @Test
-    public void testRelativeContextRelativePath() {
+    void testRelativeContextRelativePath() {
         final JXPathContext relative = 
context.getRelativeContext(context.getPointer("nestedBean"));
         assertXPathValueAndPointer(relative, "int", Integer.valueOf(1), 
"/nestedBean/int");
     }
 
     @Test
-    public void testRemoveAllArrayElements() {
+    void testRemoveAllArrayElements() {
         context.removeAll("nestedBean/strings");
         assertXPathValueIterator(context, "nestedBean/strings", list());
     }
 
     @Test
-    public void testRemoveAllListElements() {
+    void testRemoveAllListElements() {
         context.removeAll("list");
         assertXPathValueIterator(context, "list", this instanceof 
DynaBeanModelTest ? list(null, null, null) : list());
     }
 
     @Test
-    public void testRemoveAllMapEntries() {
+    void testRemoveAllMapEntries() {
         context.removeAll("map/*");
         assertXPathValue(context, "map", Collections.EMPTY_MAP);
     }
 
     @Test
-    public void testRemovePathArrayElement() {
+    void testRemovePathArrayElement() {
         // Assigns a new array to the property
         context.removePath("nestedBean/strings[1]");
         assertEquals("String 2", context.getValue("nestedBean/strings[1]"), 
"Remove array element");
     }
 
     @Test
-    public void testRemovePathBeanValue() {
+    void testRemovePathBeanValue() {
         context.removePath("nestedBean");
         assertNull(context.getValue("nestedBean"), "Remove collection 
element");
     }
 
     @Test
-    public void testRemovePathPropertyValue() {
+    void testRemovePathPropertyValue() {
         // Remove property value
         context.removePath("nestedBean/int");
         assertEquals(Integer.valueOf(0), context.getValue("nestedBean/int"), 
"Remove property value");
     }
 
     @Test
-    public void testRoot() {
+    void testRoot() {
         assertXPathValueAndPointer(context, "/", context.getContextBean(), 
"/");
     }
 
     @Test
-    public void testSetCollectionElement() {
+    void testSetCollectionElement() {
         // Collection element
         assertXPathSetValue(context, "integers[2]", Integer.valueOf(5));
         // Collection element with conversion
@@ -555,7 +555,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetContextDependentNode() {
+    void testSetContextDependentNode() {
         // Find node without using SimplePathInterpreter
         assertXPathSetValue(context, "integers[position() = 1]", 
Integer.valueOf(8));
         // Find node without using SimplePathInterpreter and set its property
@@ -563,7 +563,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetNonPrimitiveValue() {
+    void testSetNonPrimitiveValue() {
         // First, let's see if we can set a collection element to null
         assertXPathSetValue(context, "beans[2]", null);
         // Now, assign it a whole bean
@@ -572,7 +572,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetPropertyValue() {
+    void testSetPropertyValue() {
         // Simple property
         assertXPathSetValue(context, "int", Integer.valueOf(2));
         // Simple property with conversion from string
@@ -584,7 +584,7 @@ public abstract class AbstractBeanModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testUnion() {
+    void testUnion() {
         // Union - note corrected document order
         assertXPathValueIterator(context, "integers | beans[1]/strings",
                 list("String 1", "String 2", "String 3", Integer.valueOf(1), 
Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4)));
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractXMLModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractXMLModelTest.java
index 2631941..47c789e 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractXMLModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractXMLModelTest.java
@@ -79,7 +79,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisAncestor() {
+    void testAxisAncestor() {
         // ancestor::
         assertXPathValue(context, "vendor/product/price:sale/saleEnds/" + 
"ancestor::price:sale/saleEnds", "never");
         // ancestor:: with a wildcard
@@ -87,13 +87,13 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisAncestorOrSelf() {
+    void testAxisAncestorOrSelf() {
         // ancestor-or-self::
         assertXPathValue(context, "vendor/product/price:sale/" + 
"ancestor-or-self::price:sale/saleEnds", "never");
     }
 
     @Test
-    public void testAxisAttribute() {
+    void testAxisAttribute() {
         // attribute::
         assertXPathValue(context, "vendor/location/@id", "100");
         // attribute:: produces the correct pointer
@@ -142,7 +142,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChild() {
+    void testAxisChild() {
         assertXPathValue(context, "vendor/location/address/street", "Orchard 
Road");
         // child:: - first child does not match, need to search
         assertXPathValue(context, "vendor/location/address/city", "Fruit 
Market");
@@ -179,12 +179,12 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChildIndexPredicate() {
+    void testAxisChildIndexPredicate() {
         assertXPathValue(context, "vendor/location[2]/address/street", 
"Tangerine Drive");
     }
 
     @Test
-    public void testAxisDescendant() {
+    void testAxisDescendant() {
         // descendant::
         assertXPathValue(context, "//street", "Orchard Road");
         // descendent:: with a namespace and wildcard
@@ -196,7 +196,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 //
 //    @Test
-//    public void testAxisDescendantDocumentOrder() {
+//    void testAxisDescendantDocumentOrder() {
 //        Iterator iter = context.iteratePointers("//*");
 //        while (iter.hasNext()) {
 //            System.err.println(iter.next());
@@ -204,7 +204,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
 //    }
 
     @Test
-    public void testAxisFollowing() {
+    void testAxisFollowing() {
         assertXPathValueIterator(context, 
"vendor/contact/following::location//street", list("Orchard Road", "Tangerine 
Drive"));
         // following:: with a namespace
         assertXPathValue(context, "//location/following::price:sale/saleEnds", 
"never");
@@ -212,7 +212,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisFollowingSibling() {
+    void testAxisFollowingSibling() {
         // following-sibling::
         assertXPathValue(context, "vendor/location[.//employeeCount = 10]/" + 
"following-sibling::location//street", "Tangerine Drive");
         // following-sibling:: produces the correct pointer
@@ -221,7 +221,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisNamespace() {
+    void testAxisNamespace() {
         // namespace::
         assertXPathValueAndPointer(context, 
"vendor/product/prix/namespace::price", "priceNS", 
"/vendor[1]/product[1]/prix[1]/namespace::price");
         // namespace::*
@@ -233,7 +233,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisParent() {
+    void testAxisParent() {
         // parent::
         assertXPathPointer(context, "//street/..", 
"/vendor[1]/location[1]/address[1]");
         // parent:: (note reverse document order)
@@ -243,7 +243,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisPreceding() {
+    void testAxisPreceding() {
         // preceding::
         assertXPathPointer(context, 
"//location[2]/preceding-sibling::location//street", 
"/vendor[1]/location[1]/address[1]/street[1]");
         assertXPathPointer(context, "//location[2]/preceding::*[1]", 
"/vendor[1]/location[1]/employeeCount[1]");
@@ -252,13 +252,13 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisPrecedingSibling() {
+    void testAxisPrecedingSibling() {
         // preceding-sibling:: produces the correct pointer
         assertXPathPointer(context, 
"//location[2]/preceding-sibling::location//street", 
"/vendor[1]/location[1]/address[1]/street[1]");
     }
 
     @Test
-    public void testAxisSelf() {
+    void testAxisSelf() {
         // self:: with a namespace
         assertXPathValue(context, "//price:sale/self::price:sale/saleEnds", 
"never");
         // self:: with an unmatching name
@@ -266,14 +266,14 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testBooleanFunction() {
+    void testBooleanFunction() {
         assertXPathValue(context, "boolean(vendor//saleEnds[../@stores = 
'all'])", Boolean.TRUE);
         assertXPathValue(context, "boolean(vendor//promotion[../@stores = 
'all'])", Boolean.TRUE);
         assertXPathValue(context, "boolean(vendor//promotion[../@stores = 
'some'])", Boolean.FALSE);
     }
 
     @Test
-    public void testContainer() {
+    void testContainer() {
         assertXPathValue(context, "$container/vendor//street", "Orchard Road");
         assertXPathValue(context, "$container//street", "Orchard Road");
         assertXPathPointer(context, "$container//street", 
"$container/vendor[1]/location[1]/address[1]/street[1]");
@@ -285,7 +285,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
      * Test JXPathContext.createPath() with various arguments
      */
     @Test
-    public void testCreatePath() {
+    void testCreatePath() {
         // Create a DOM element
         assertXPathCreatePath(context, "/vendor[1]/location[3]", "", 
"/vendor[1]/location[3]");
         // Create a DOM element with contents
@@ -303,7 +303,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
      * Test JXPath.createPathAndSetValue() with various arguments
      */
     @Test
-    public void testCreatePathAndSetValue() {
+    void testCreatePathAndSetValue() {
         // Create a XML element
         assertXPathCreatePathAndSetValue(context, "vendor/location[3]", "", 
"/vendor[1]/location[3]");
         // Create a DOM element with contents
@@ -320,26 +320,26 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testDocument() {
+    void testDocument() {
         assertXPathValue(context, "$document/vendor/location[1]//street", 
"Orchard Road");
         assertXPathPointer(context, "$document/vendor/location[1]//street", 
"$document/vendor[1]/location[1]/address[1]/street[1]");
         assertXPathValue(context, "$document/vendor//street", "Orchard Road");
     }
 
     @Test
-    public void testDocumentOrder() {
+    void testDocumentOrder() {
         assertDocumentOrder(context, "vendor/location", 
"vendor/location/address/street", -1);
         assertDocumentOrder(context, "vendor/location[@id = '100']", 
"vendor/location[@id = '101']", -1);
         assertDocumentOrder(context, "vendor//price:amount", 
"vendor/location", 1);
     }
 
     @Test
-    public void testElementInVariable() {
+    void testElementInVariable() {
         assertXPathValue(context, "$element", "Orchard Road");
     }
 
     @Test
-    public void testFunctionsLastAndPosition() {
+    void testFunctionsLastAndPosition() {
         assertXPathPointer(context, "vendor//location[last()]", 
"/vendor[1]/location[2]");
     }
 
@@ -355,7 +355,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testLang() {
+    void testLang() {
         // xml:lang built-in attribute
         assertXPathValue(context, "//product/prix/@xml:lang", "fr");
         // lang() used the built-in xml:lang attribute
@@ -365,7 +365,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testNamespaceMapping() {
+    void testNamespaceMapping() {
         context.registerNamespace("rate", "priceNS");
         context.registerNamespace("goods", "productNS");
         assertEquals("priceNS", context.getNamespaceURI("price"), "Context 
node namespace resolution");
@@ -387,19 +387,19 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testNodes() {
+    void testNodes() {
         final Pointer pointer = context.getPointer("/vendor[1]/contact[1]");
         assertNotEquals(pointer.getNode(), pointer.getValue());
     }
 
     @Test
-    public void testNodeTypeComment() {
+    void testNodeTypeComment() {
         // comment()
         assertXPathValue(context, "//product/comment()", "We are not buying 
this product, ever");
     }
 
     @Test
-    public void testNodeTypeProcessingInstruction() {
+    void testNodeTypeProcessingInstruction() {
         // processing-instruction() without an argument
         assertXPathValue(context, "//product/processing-instruction()", "do 
not show anybody");
         // processing-instruction() with an argument
@@ -411,7 +411,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testNodeTypeText() {
+    void testNodeTypeText() {
         // text()
         // Note that this is questionable as the XPath spec tells us "." is 
short for self::node() and text() is by definition _not_ a node:
         assertXPathValue(context, "//product/text()[. != '']", "We love this 
product.");
@@ -423,7 +423,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
      * Test JXPathContext.removePath() with various arguments
      */
     @Test
-    public void testRemovePath() {
+    void testRemovePath() {
         // Remove XML nodes
         context.removePath("vendor/location[@id = '101']//street/text()");
         assertEquals("", context.getValue("vendor/location[@id = 
'101']//street"), "Remove DOM text");
@@ -434,7 +434,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetValue() {
+    void testSetValue() {
         assertXPathSetValue(context, "vendor/location[@id = '100']", "New 
Text");
         assertXMLSignature(context, "vendor/location[@id = '100']", "<E>New 
Text</E>", false, false, true, false);
         assertXPathSetValue(context, "vendor/location[@id = '101']", 
"Replacement Text");
@@ -442,7 +442,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testTypeConversions() {
+    void testTypeConversions() {
         // Implicit conversion to number
         assertXPathValue(context, "vendor/location/employeeCount + 1", 
Double.valueOf(11));
         // Implicit conversion to boolean
@@ -450,7 +450,7 @@ public abstract class AbstractXMLModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testUnion() {
+    void testUnion() {
         assertXPathValue(context, "/vendor[1]/contact[1] | 
/vendor[1]/contact[4]", "John");
         assertXPathValue(context, "/vendor[1]/contact[4] | 
/vendor[1]/contact[1]", "John");
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/AliasedNamespaceIterationTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/AliasedNamespaceIterationTest.java
index a71c46f..5204ad6 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/AliasedNamespaceIterationTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/AliasedNamespaceIterationTest.java
@@ -51,12 +51,12 @@ public class AliasedNamespaceIterationTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testIterateDOM() {
+    void testIterateDOM() {
         doTestIterate(DocumentContainer.MODEL_DOM);
     }
 
     @Test
-    public void testIterateJDOM() {
+    void testIterateJDOM() {
         doTestIterate(DocumentContainer.MODEL_JDOM);
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java
index cfe5aa6..b0f0c1d 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java
@@ -42,13 +42,13 @@ public class EmbeddedColonMapKeysTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSelectNodes() throws Exception {
+    void testSelectNodes() throws Exception {
         assertXPathValueIterator(context, "/.[@name='foo:key']", 
list("value"));
         assertXPathValueIterator(context, "/foo:key", list());
     }
 
     @Test
-    public void testSelectSingleNode() throws Exception {
+    void testSelectSingleNode() throws Exception {
         assertXPathValue(context, "/.[@name='foo:key']", "value");
         assertXPathValueLenient(context, "/foo:key", null);
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java
index 8529624..331a619 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java
@@ -45,32 +45,32 @@ public class EmptyCollectionTest extends AbstractJXPathTest 
{
     }
 
     @Test
-    public void testEmptyArray() {
+    void testEmptyArray() {
         assertXPathPointerIterator(JXPathContext.newContext(new Object[0]), 
"/*", list());
     }
 
     @Test
-    public void testEmptyChildArray() {
+    void testEmptyChildArray() {
         assertXPathPointerIterator(JXPathContext.newContext(new HasChild(new 
Object[0])), "/child/*", list());
     }
 
     @Test
-    public void testEmptyChildList() {
+    void testEmptyChildList() {
         assertXPathPointerIterator(JXPathContext.newContext(new 
HasChild(Collections.EMPTY_LIST)), "/child/*", Collections.EMPTY_LIST);
     }
 
     @Test
-    public void testEmptyChildSet() {
+    void testEmptyChildSet() {
         assertXPathPointerIterator(JXPathContext.newContext(new 
HasChild(Collections.EMPTY_SET)), "/child/*", Collections.EMPTY_SET);
     }
 
     @Test
-    public void testEmptyList() {
+    void testEmptyList() {
         
assertXPathPointerIterator(JXPathContext.newContext(Collections.EMPTY_LIST), 
"/*", Collections.EMPTY_LIST);
     }
 
     @Test
-    public void testEmptySet() {
+    void testEmptySet() {
         
assertXPathPointerIterator(JXPathContext.newContext(Collections.EMPTY_SET), 
"/*", Collections.EMPTY_SET);
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java
index 81adaf2..e73bb03 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java
@@ -60,17 +60,17 @@ public class ExternalXMLNamespaceTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAttributeDOM() {
+    void testAttributeDOM() {
         doTestAttribute(DocumentContainer.MODEL_DOM);
     }
 
     @Test
-    public void testCreateAndSetAttributeDOM() {
+    void testCreateAndSetAttributeDOM() {
         doTestCreateAndSetAttribute(DocumentContainer.MODEL_DOM);
     }
 
     @Test
-    public void testElementDOM() {
+    void testElementDOM() {
         doTestElement(DocumentContainer.MODEL_DOM);
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/JXPath151Test.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/JXPath151Test.java
index bc29039..7c9a3d3 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/JXPath151Test.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/JXPath151Test.java
@@ -45,7 +45,7 @@ public class JXPath151Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testMapValueEquality() {
+    void testMapValueEquality() {
         assertXPathValue(context, "map/b != map/a", Boolean.TRUE);
         assertXPathValue(context, "map/a != map/b", Boolean.TRUE);
         assertXPathValue(context, "map/a != map/c", Boolean.FALSE);
@@ -56,7 +56,7 @@ public class JXPath151Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testMapValueEqualityUsingNameAttribute() {
+    void testMapValueEqualityUsingNameAttribute() {
         assertXPathValue(context, "map[@name = 'b'] != map[@name = 'c']", 
Boolean.TRUE);
         assertXPathValue(context, "map[@name = 'a'] != map[@name = 'b']", 
Boolean.TRUE);
         assertXPathValue(context, "map[@name = 'a'] != map[@name = 'c']", 
Boolean.FALSE);
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/JXPath154Test.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/JXPath154Test.java
index f00bb98..e0659ea 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/JXPath154Test.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/JXPath154Test.java
@@ -38,12 +38,12 @@ public class JXPath154Test extends AbstractJXPathTest {
     }
 
     @Test
-    public void testInnerEmptyNamespaceDOM() {
+    void testInnerEmptyNamespaceDOM() {
         doTest("b:foo/test", DocumentContainer.MODEL_DOM, "/b:foo[1]/test[1]");
     }
 
     @Test
-    public void testInnerEmptyNamespaceJDOM() {
+    void testInnerEmptyNamespaceJDOM() {
         doTest("b:foo/test", DocumentContainer.MODEL_JDOM, 
"/b:foo[1]/test[1]");
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
index d208027..b7f04af 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
@@ -69,37 +69,37 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testBeanBean() {
+    void testBeanBean() {
         assertXPathValueAndPointer(context, "bean/int", Integer.valueOf(1), 
"/bean/int");
     }
 
     @Test
-    public void testBeanContainer() {
+    void testBeanContainer() {
         assertXPathValueAndPointer(context, 
"container/vendor/location/address/city", "Fruit Market", 
"/container/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testBeanDocument() {
+    void testBeanDocument() {
         assertXPathValueAndPointer(context, 
"document/vendor/location/address/city", "Fruit Market", 
"/document/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testBeanElement() {
+    void testBeanElement() {
         assertXPathValueAndPointer(context, "element/location/address/city", 
"Fruit Market", "/element/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testBeanList() {
+    void testBeanList() {
         assertXPathValueAndPointer(context, "list[1]", "string", "/list[1]");
     }
 
     @Test
-    public void testBeanMap() {
+    void testBeanMap() {
         assertXPathValueAndPointer(context, "map/string", "string", 
"/map[@name='string']");
     }
 
     @Test
-    public void testBeanPrimitive() {
+    void testBeanPrimitive() {
         assertXPathValueAndPointer(context, "string", "string", "/string");
     }
 
@@ -107,7 +107,7 @@ public class MixedModelTest extends AbstractJXPathTest {
      * Scott Heaberlin's test - collection of collections
      */
     @Test
-    public void testCollectionPointer() {
+    void testCollectionPointer() {
         final List list = new ArrayList();
         final Map map = new HashMap();
         map.put("KeyOne", "SomeStringOne");
@@ -131,7 +131,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePath() {
+    void testCreatePath() {
         context = JXPathContext.newContext(new TestBean());
         context.setFactory(new TestMixedModelFactory());
         final TestBean bean = (TestBean) context.getContextBean();
@@ -142,7 +142,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueWithMatrix() {
+    void testCreatePathAndSetValueWithMatrix() {
         context.setValue("matrix", null);
         // Calls factory.createObject(..., TestMixedModelBean, "matrix")
         // Calls factory.createObject(..., nestedBean, "strings", 2)
@@ -150,7 +150,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testErrorProperty() {
+    void testErrorProperty() {
         context.getVariables().declareVariable("e", new 
ExceptionPropertyTestBean());
         assertThrows(Throwable.class, () -> assertXPathValue(context, 
"$e/errorString", null), "Legitimate exception accessing property");
         assertXPathPointer(context, "$e/errorString", "$e/errorString");
@@ -163,7 +163,7 @@ public class MixedModelTest extends AbstractJXPathTest {
      * Test JXPath.iterate() with map containing an array
      */
     @Test
-    public void testIterateArray() {
+    void testIterateArray() {
         final Map map = new HashMap();
         map.put("foo", new String[] { "a", "b", "c" });
         final JXPathContext context = JXPathContext.newContext(map);
@@ -171,7 +171,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIteratePointersArray() {
+    void testIteratePointersArray() {
         final Map map = new HashMap();
         map.put("foo", new String[] { "a", "b", "c" });
         final JXPathContext context = JXPathContext.newContext(map);
@@ -185,7 +185,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIteratePointersArrayElementWithVariable() {
+    void testIteratePointersArrayElementWithVariable() {
         final Map map = new HashMap();
         map.put("foo", new String[] { "a", "b", "c" });
         final JXPathContext context = JXPathContext.newContext(map);
@@ -200,7 +200,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testIterateVector() {
+    void testIterateVector() {
         final Map map = new HashMap();
         final Vector vec = new Vector();
         vec.add(new HashMap());
@@ -211,27 +211,27 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testListBean() {
+    void testListBean() {
         assertXPathValueAndPointer(context, "list[2]/int", Integer.valueOf(1), 
"/list[2]/int");
     }
 
     @Test
-    public void testListContainer() {
+    void testListContainer() {
         assertXPathValueAndPointer(context, 
"list[7]/vendor/location/address/city", "Fruit Market", 
"/list[7]/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testListDocument() {
+    void testListDocument() {
         assertXPathValueAndPointer(context, 
"list[5]/vendor/location/address/city", "Fruit Market", 
"/list[5]/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testListElement() {
+    void testListElement() {
         assertXPathValueAndPointer(context, "list[6]/location/address/city", 
"Fruit Market", "/list[6]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testListList() {
+    void testListList() {
         /**
          * @todo: what is this supposed to do? Should we stick to XPath, in 
which case [1] is simply ignored, or Java, in which case it is supposed to 
extract
          *        the first element from the list?
@@ -244,54 +244,54 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testListMap() {
+    void testListMap() {
         assertXPathValueAndPointer(context, "list[3]/string", "string", 
"/list[3][@name='string']");
     }
 
     @Test
-    public void testListPrimitive() {
+    void testListPrimitive() {
         assertXPathValueAndPointer(context, "list[1]", "string", "/list[1]");
     }
 
     @Test
-    public void testMapBean() {
+    void testMapBean() {
         assertXPathValueAndPointer(context, "map/bean/int", 
Integer.valueOf(1), "/map[@name='bean']/int");
     }
 
     @Test
-    public void testMapContainer() {
+    void testMapContainer() {
         assertXPathValueAndPointer(context, 
"map/container/vendor/location/address/city", "Fruit Market",
                 "/map[@name='container']" + 
"/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testMapDocument() {
+    void testMapDocument() {
         assertXPathValueAndPointer(context, 
"map/document/vendor/location/address/city", "Fruit Market",
                 "/map[@name='document']" + 
"/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testMapElement() {
+    void testMapElement() {
         assertXPathValueAndPointer(context, 
"map/element/location/address/city", "Fruit Market", 
"/map[@name='element']/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testMapList() {
+    void testMapList() {
         assertXPathValueAndPointer(context, "map/list[1]", "string", 
"/map[@name='list'][1]");
     }
 
     @Test
-    public void testMapMap() {
+    void testMapMap() {
         assertXPathValueAndPointer(context, "map/map/string", "string", 
"/map[@name='map'][@name='string']");
     }
 
     @Test
-    public void testMapPrimitive() {
+    void testMapPrimitive() {
         assertXPathValueAndPointer(context, "map/string", "string", 
"/map[@name='string']");
     }
 
     @Test
-    public void testMatrix() {
+    void testMatrix() {
         assertXPathValueAndPointer(context, "$matrix[1]/.[1]", 
Integer.valueOf(3), "$matrix[1]/.[1]");
         context.setValue("$matrix[1]/.[1]", Integer.valueOf(2));
         assertXPathValueAndPointer(context, "matrix[1]/.[1]", 
Integer.valueOf(3), "/matrix[1]/.[1]");
@@ -304,7 +304,7 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testNull() {
+    void testNull() {
         assertXPathPointerLenient(context, "$null", "$null");
         assertXPathPointerLenient(context, "$null[3]", "$null[3]");
         assertXPathPointerLenient(context, "$testnull/nothing", 
"$testnull/nothing");
@@ -320,48 +320,48 @@ public class MixedModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testRootAsCollection() {
+    void testRootAsCollection() {
         assertXPathValue(context, ".[1]/string", "string");
     }
 
     @Test
-    public void testVar() {
+    void testVar() {
         context.getVariables().declareVariable("foo:bar", "baz");
         assertXPathValueAndPointer(context, "$foo:bar", "baz", "$foo:bar");
     }
 
     @Test
-    public void testVarBean() {
+    void testVarBean() {
         assertXPathValueAndPointer(context, "$bean/int", Integer.valueOf(1), 
"$bean/int");
     }
 
     @Test
-    public void testVarContainer() {
+    void testVarContainer() {
         assertXPathValueAndPointer(context, 
"$container/vendor/location/address/city", "Fruit Market", 
"$container/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testVarDocument() {
+    void testVarDocument() {
         assertXPathValueAndPointer(context, 
"$document/vendor/location/address/city", "Fruit Market", 
"$document/vendor[1]/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testVarElement() {
+    void testVarElement() {
         assertXPathValueAndPointer(context, "$element/location/address/city", 
"Fruit Market", "$element/location[2]/address[1]/city[1]");
     }
 
     @Test
-    public void testVarList() {
+    void testVarList() {
         assertXPathValueAndPointer(context, "$list[1]", "string", "$list[1]");
     }
 
     @Test
-    public void testVarMap() {
+    void testVarMap() {
         assertXPathValueAndPointer(context, "$map/string", "string", 
"$map[@name='string']");
     }
 
     @Test
-    public void testVarPrimitive() {
+    void testVarPrimitive() {
         assertXPathValueAndPointer(context, "$string", "string", "$string");
     }
 }
\ No newline at end of file
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java
index 4fd30a4..adaa8b4 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java
@@ -46,52 +46,52 @@ public class XMLPreserveSpaceTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testDefaultDOM() {
+    void testDefaultDOM() {
         doTest("default", DocumentContainer.MODEL_DOM, "foo");
     }
 
     @Test
-    public void testDefaultJDOM() {
+    void testDefaultJDOM() {
         doTest("default", DocumentContainer.MODEL_JDOM, "foo");
     }
 
     @Test
-    public void testNestedDOM() {
+    void testNestedDOM() {
         doTest("nested", DocumentContainer.MODEL_DOM, " foo ;bar; baz ");
     }
 
     @Test
-    public void testNestedJDOM() {
+    void testNestedJDOM() {
         doTest("nested", DocumentContainer.MODEL_JDOM, " foo ;bar; baz ");
     }
 
     @Test
-    public void testNestedWithCommentsDOM() {
+    void testNestedWithCommentsDOM() {
         doTest("nested-with-comments", DocumentContainer.MODEL_DOM, " foo 
;bar; baz ");
     }
 
     @Test
-    public void testNestedWithCommentsJDOM() {
+    void testNestedWithCommentsJDOM() {
         doTest("nested-with-comments", DocumentContainer.MODEL_JDOM, " foo 
;bar; baz ");
     }
 
     @Test
-    public void testPreserveDOM() {
+    void testPreserveDOM() {
         doTest("preserve", DocumentContainer.MODEL_DOM, " foo ");
     }
 
     @Test
-    public void testPreserveJDOM() {
+    void testPreserveJDOM() {
         doTest("preserve", DocumentContainer.MODEL_JDOM, " foo ");
     }
 
     @Test
-    public void testUnspecifiedDOM() {
+    void testUnspecifiedDOM() {
         doTest("unspecified", DocumentContainer.MODEL_DOM, " foo ");
     }
 
     @Test
-    public void testUnspecifiedJDOM() {
+    void testUnspecifiedJDOM() {
         doTest("unspecified", DocumentContainer.MODEL_JDOM, " foo ");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java
index 80d087c..f525a9a 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java
@@ -46,52 +46,52 @@ public class XMLSpaceTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testDefaultDOM() {
+    void testDefaultDOM() {
         doTest("default", DocumentContainer.MODEL_DOM, "foo");
     }
 
     @Test
-    public void testDefaultJDOM() {
+    void testDefaultJDOM() {
         doTest("default", DocumentContainer.MODEL_JDOM, "foo");
     }
 
     @Test
-    public void testNestedDOM() {
+    void testNestedDOM() {
         doTest("nested", DocumentContainer.MODEL_DOM, "foo;bar; baz ");
     }
 
     @Test
-    public void testNestedJDOM() {
+    void testNestedJDOM() {
         doTest("nested", DocumentContainer.MODEL_JDOM, "foo;bar; baz ");
     }
 
     @Test
-    public void testNestedWithCommentsDOM() {
+    void testNestedWithCommentsDOM() {
         doTest("nested-with-comments", DocumentContainer.MODEL_DOM, "foo;bar; 
baz ");
     }
 
     @Test
-    public void testNestedWithCommentsJDOM() {
+    void testNestedWithCommentsJDOM() {
         doTest("nested-with-comments", DocumentContainer.MODEL_JDOM, "foo;bar; 
baz ");
     }
 
     @Test
-    public void testPreserveDOM() {
+    void testPreserveDOM() {
         doTest("preserve", DocumentContainer.MODEL_DOM, " foo ");
     }
 
     @Test
-    public void testPreserveJDOM() {
+    void testPreserveJDOM() {
         doTest("preserve", DocumentContainer.MODEL_JDOM, " foo ");
     }
 
     @Test
-    public void testUnspecifiedDOM() {
+    void testUnspecifiedDOM() {
         doTest("unspecified", DocumentContainer.MODEL_DOM, "foo");
     }
 
     @Test
-    public void testUnspecifiedJDOM() {
+    void testUnspecifiedJDOM() {
         doTest("unspecified", DocumentContainer.MODEL_JDOM, "foo");
     }
 }
\ No newline at end of file
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/XMLUpperCaseElementsTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/XMLUpperCaseElementsTest.java
index 37ffcd4..84f8cca 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/XMLUpperCaseElementsTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/XMLUpperCaseElementsTest.java
@@ -46,22 +46,22 @@ public class XMLUpperCaseElementsTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testBasicGetDOM() {
+    void testBasicGetDOM() {
         assertXPathValue(createContext(DocumentContainer.MODEL_DOM), 
"/Vendor[1]/Contact[1]", "John");
     }
 
     @Test
-    public void testBasicGetJDOM() {
+    void testBasicGetJDOM() {
         assertXPathValue(createContext(DocumentContainer.MODEL_JDOM), 
"/Vendor[1]/Contact[1]", "John");
     }
 
     @Test
-    public void testBasicIterateDOM() {
+    void testBasicIterateDOM() {
         assertXPathValueIterator(createContext(DocumentContainer.MODEL_DOM), 
"/Vendor/Contact", list("John", "Jack", "Jim", "Jack Black"));
     }
 
     @Test
-    public void testBasicIterateJDOM() {
+    void testBasicIterateJDOM() {
         assertXPathValueIterator(createContext(DocumentContainer.MODEL_JDOM), 
"/Vendor/Contact", list("John", "Jack", "Jim", "Jack Black"));
     }
 }
\ No newline at end of file
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
index 36d8cf3..ea388e0 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BadlyImplementedFactoryTest.java
@@ -52,7 +52,7 @@ public class BadlyImplementedFactoryTest {
     }
 
     @Test
-    public void testBadFactoryImplementation() {
+    void testBadFactoryImplementation() {
         final JXPathException e = assertThrows(JXPathException.class, () -> 
context.createPath("foo/bar"),
                 "should fail with JXPathException caused by 
JXPathAbstractFactoryException");
         assertInstanceOf(JXPathAbstractFactoryException.class, e.getCause());
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java
index af01f7c..f48e9f0 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/beans/BeanModelTest.java
@@ -40,7 +40,7 @@ public class BeanModelTest extends AbstractBeanModelTest {
     }
 
     @Test
-    public void testIndexedProperty() {
+    void testIndexedProperty() {
         final JXPathContext context = JXPathContext.newContext(null, new 
TestIndexedPropertyBean());
         assertXPathValueAndPointer(context, "indexed[1]", Integer.valueOf(0), 
"/indexed[1]");
     }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java
index 1333447..7315240 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/container/ContainerModelTest.java
@@ -82,7 +82,7 @@ public class ContainerModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testContainerMapWithCollection() {
+    void testContainerMapWithCollection() {
         final ListContainer container = new ListContainer();
         final List list = (List) container.getValue();
         final Map map = new HashMap();
@@ -96,7 +96,7 @@ public class ContainerModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testContainerPropertyWithCollection() {
+    void testContainerPropertyWithCollection() {
         final Bean bean = new Bean();
         final List list = (List) bean.getContainer().getValue();
         final JXPathContext context = JXPathContext.newContext(bean);
@@ -108,7 +108,7 @@ public class ContainerModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testContainerRootWithCollection() {
+    void testContainerRootWithCollection() {
         final ArrayContainer container = new ArrayContainer();
         final String[] array = (String[]) container.getValue();
         final JXPathContext context = JXPathContext.newContext(container);
@@ -121,7 +121,7 @@ public class ContainerModelTest extends AbstractJXPathTest {
     }
 
     @Test
-    public void testContainerVariableWithCollection() {
+    void testContainerVariableWithCollection() {
         final ArrayContainer container = new ArrayContainer();
         final String[] array = (String[]) container.getValue();
         final JXPathContext context = JXPathContext.newContext(null);
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
index e3380b0..bef5e7f 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
@@ -91,14 +91,14 @@ public class DOMModelTest extends AbstractXMLModelTest {
     }
 
     @Test
-    public void testGetElementDescendantOrSelf() {
+    void testGetElementDescendantOrSelf() {
         final JXPathContext childContext = 
context.getRelativeContext(context.getPointer("/vendor"));
         assertInstanceOf(Element.class, childContext.getContextBean());
         assertXPathNodeType(childContext, "//vendor", Element.class);
     }
 
     @Test
-    public void testGetNode() {
+    void testGetNode() {
         assertXPathNodeType(context, "/", Document.class);
         assertXPathNodeType(context, "/vendor/location", Element.class);
         assertXPathNodeType(context, "//location/@name", Attr.class);
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/dynabeans/LazyDynaBeanTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/dynabeans/LazyDynaBeanTest.java
index 25b83c4..b9a6eff 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/dynabeans/LazyDynaBeanTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/dynabeans/LazyDynaBeanTest.java
@@ -31,14 +31,14 @@ import org.junit.jupiter.api.Test;
 public class LazyDynaBeanTest extends AbstractJXPathTest {
 
     @Test
-    public void testLazyProperty() throws JXPathNotFoundException {
+    void testLazyProperty() throws JXPathNotFoundException {
         final LazyDynaBean bean = new LazyDynaBean();
         final JXPathContext context = JXPathContext.newContext(bean);
         context.getValue("nosuch");
     }
 
     @Test
-    public void testStrictLazyDynaBeanPropertyFactory() {
+    void testStrictLazyDynaBeanPropertyFactory() {
         final StrictLazyDynaBeanPointerFactory factory = new 
StrictLazyDynaBeanPointerFactory();
         JXPathContextReferenceImpl.addNodePointerFactory(factory);
         assertThrows(JXPathNotFoundException.class, this::testLazyProperty);
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java
 
b/src/test/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java
index 90df3c4..3bc3743 100644
--- 
a/src/test/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java
@@ -51,7 +51,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
      * Testing the pseudo-attribute "name" that dynamic property objects 
appear to have.
      */
     @Test
-    public void testAttributeName() {
+    void testAttributeName() {
         assertXPathValue(context, "map[@name = 'Key1']", "Value 1");
         assertXPathPointer(context, "map[@name = 'Key1']", 
"/map[@name='Key1']");
         assertXPathPointerLenient(context, "map[@name = 
'Key&quot;&apos;&quot;&apos;1']", "/map[@name='Key&quot;&apos;&quot;&apos;1']");
@@ -69,7 +69,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisChild() {
+    void testAxisChild() {
         assertXPathValue(context, "map/Key1", "Value 1");
         assertXPathPointer(context, "map/Key1", "/map[@name='Key1']");
         assertXPathValue(context, "map/Key2/name", "Name 6");
@@ -77,12 +77,12 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testAxisDescendant() {
+    void testAxisDescendant() {
         assertXPathValue(context, "//Key1", "Value 1");
     }
 
     @Test
-    public void testCollectionOfMaps() {
+    void testCollectionOfMaps() {
         final TestBean bean = (TestBean) context.getContextBean();
         final List list = new ArrayList();
         bean.getMap().put("stuff", list);
@@ -100,7 +100,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePath() {
+    void testCreatePath() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Calls factory.createObject(..., testBean, "map"), then
@@ -109,7 +109,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValue() {
+    void testCreatePathAndSetValue() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Calls factory.createObject(..., testBean, "map"), then
@@ -118,7 +118,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueCollectionElement() {
+    void testCreatePathAndSetValueCollectionElement() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         assertXPathCreatePathAndSetValue(context, "/map/TestKey3[2]", "Test1", 
"/map[@name='TestKey3'][2]");
@@ -127,7 +127,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueCreateBean() {
+    void testCreatePathAndSetValueCreateBean() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Calls factory.createObject(..., testBean, "map"), then
@@ -137,7 +137,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathAndSetValueNewCollectionElement() {
+    void testCreatePathAndSetValueNewCollectionElement() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Create an element of a dynamic map element, which is a collection
@@ -148,7 +148,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathCollectionElement() {
+    void testCreatePathCollectionElement() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         assertXPathCreatePath(context, "/map/TestKey3[2]", null, 
"/map[@name='TestKey3'][2]");
@@ -157,7 +157,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathCreateBean() {
+    void testCreatePathCreateBean() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Calls factory.createObject(..., testBean, "map"), then
@@ -167,7 +167,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testCreatePathNewCollectionElement() {
+    void testCreatePathNewCollectionElement() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.setMap(null);
         // Create an element of a dynamic map element, which is a collection
@@ -178,7 +178,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testMapOfMaps() {
+    void testMapOfMaps() {
         final TestBean bean = (TestBean) context.getContextBean();
         final Map fruit = new HashMap();
         fruit.put("apple", "green");
@@ -197,7 +197,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testRemovePath() {
+    void testRemovePath() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.getMap().put("TestKey1", "test");
         // Remove dynamic property
@@ -206,7 +206,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testRemovePathArrayElement() {
+    void testRemovePathArrayElement() {
         final TestBean bean = (TestBean) context.getContextBean();
         bean.getMap().put("TestKey2", new String[] { "temp1", "temp2" });
         context.removePath("map[@name = 'TestKey2'][1]");
@@ -214,7 +214,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetCollection() {
+    void testSetCollection() {
         // See if we can assign a whole collection
         context.setValue("map/Key1", new Integer[] { Integer.valueOf(7), 
Integer.valueOf(8) });
         // And then an element in that collection
@@ -225,7 +225,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
      * The key does not exist, but the assignment should succeed anyway, 
because you should always be able to store anything in a Map.
      */
     @Test
-    public void testSetNewKey() {
+    void testSetNewKey() {
         // Using a "simple" path
         assertXPathSetValue(context, "map/Key4", Integer.valueOf(7));
         // Using a "non-simple" path
@@ -234,7 +234,7 @@ public class DynamicPropertiesModelTest extends 
AbstractJXPathTest {
     }
 
     @Test
-    public void testSetPrimitiveValue() {
+    void testSetPrimitiveValue() {
         assertXPathSetValue(context, "map/Key1", Integer.valueOf(6));
     }
 }
diff --git 
a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java 
b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
index b3a58f1..5f6ffb5 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
@@ -85,14 +85,14 @@ public class JDOMModelTest extends AbstractXMLModelTest {
     }
 
     @Test
-    public void testGetElementDescendantOrSelf() {
+    void testGetElementDescendantOrSelf() {
         final JXPathContext childContext = 
context.getRelativeContext(context.getPointer("/vendor"));
         assertInstanceOf(Element.class, childContext.getContextBean());
         assertXPathNodeType(childContext, "//vendor", Element.class);
     }
 
     @Test
-    public void testGetNode() {
+    void testGetNode() {
         assertXPathNodeType(context, "/", Document.class);
         assertXPathNodeType(context, "/vendor/location", Element.class);
         assertXPathNodeType(context, "//location/@name", Attribute.class);
diff --git 
a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java 
b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
index 48edf43..3cd0e82 100644
--- 
a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
+++ 
b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
@@ -60,7 +60,7 @@ public class JXPathServletContextTest {
     }
 
     @Test
-    public void testPageContext() {
+    void testPageContext() {
         final MockServletContext servletContext = new MockServletContext();
         servletContext.setAttribute("app", "app");
         final MockServletConfig servletConfig = new MockServletConfig();
@@ -101,7 +101,7 @@ public class JXPathServletContextTest {
     }
 
     @Test
-    public void testServletContext() {
+    void testServletContext() {
         final ServletContext context = getServletContext();
         final JXPathContext appContext = 
JXPathServletContexts.getApplicationContext(context);
         assertSame(appContext, 
JXPathServletContexts.getApplicationContext(context), "Cached context not 
property returned");
@@ -117,7 +117,7 @@ public class JXPathServletContextTest {
     }
 
     @Test
-    public void testServletRequest() {
+    void testServletRequest() {
         final ServletContext context = getServletContext();
         final MockHttpSession session = new MockHttpSession();
         session.setupServletContext(context);
@@ -153,7 +153,7 @@ public class JXPathServletContextTest {
     }
 
     @Test
-    public void testServletRequestWithoutSession() {
+    void testServletRequestWithoutSession() {
         final ServletContext context = getServletContext();
         final MockHttpServletRequest request = new MockHttpServletRequest();
         final JXPathContext reqContext = 
JXPathServletContexts.getRequestContext(request, context);
diff --git 
a/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java 
b/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
index 0f866c2..c7cbb26 100644
--- a/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
+++ b/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java
@@ -53,34 +53,34 @@ public class BasicTypeConverterTest {
     }
 
     @Test
-    public void testArrayToArray() {
+    void testArrayToArray() {
         assertConversion(new int[] { 1, 2 }, String[].class, Arrays.asList(new 
String[] { "1", "2" }));
     }
 
     @Test
-    public void testArrayToList() {
+    void testArrayToList() {
         assertConversion(new int[] { 1, 2 }, List.class, Arrays.asList(new 
Object[] { Integer.valueOf(1), Integer.valueOf(2) }));
     }
 
     @Test
-    public void testBeanUtilsConverter() {
+    void testBeanUtilsConverter() {
         assertConversion("12", BigDecimal.class, new BigDecimal(12));
     }
 
     @Test
-    public void testInvalidConversion() {
+    void testInvalidConversion() {
         assertThrows(Exception.class, () -> TypeUtils.convert("'foo'", 
Date.class), "Type conversion exception");
     }
 
     @Test
-    public void testListToArray() {
+    void testListToArray() {
         assertConversion(Arrays.asList(new Integer[] { Integer.valueOf(1), 
Integer.valueOf(2) }), String[].class, Arrays.asList(new String[] { "1", "2" 
}));
         assertConversion(Arrays.asList(new String[] { "1", "2" }), 
int[].class, Arrays.asList(new Integer[] { Integer.valueOf(1), 
Integer.valueOf(2) }));
     }
 
     // succeeds in current version
     @Test
-    public void testNodeSetToInteger() {
+    void testNodeSetToInteger() {
         assertConversion(new NodeSet() {
 
             @Override
@@ -101,7 +101,7 @@ public class BasicTypeConverterTest {
     }
 
     @Test
-    public void testNodeSetToString() {
+    void testNodeSetToString() {
         assertConversion(new NodeSet() {
 
             @Override
@@ -125,7 +125,7 @@ public class BasicTypeConverterTest {
     }
 
     @Test
-    public void testPointerToString() {
+    void testPointerToString() {
         assertConversion(new Pointer() {
 
             private static final long serialVersionUID = 1L;
@@ -167,17 +167,17 @@ public class BasicTypeConverterTest {
     }
 
     @Test
-    public void testPrimitiveToString() {
+    void testPrimitiveToString() {
         assertConversion(Integer.valueOf(1), String.class, "1");
     }
 
     @Test
-    public void testSingletonArrayToString() {
+    void testSingletonArrayToString() {
         assertConversion(new String[] { "Earth" }, String.class, "Earth");
     }
 
     @Test
-    public void testSingletonCollectionToString() {
+    void testSingletonCollectionToString() {
         assertConversion(Collections.singleton("Earth"), String.class, 
"Earth");
     }
 }
\ No newline at end of file
diff --git 
a/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java 
b/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java
index edcd354..220e2a0 100644
--- a/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java
+++ b/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java
@@ -142,7 +142,7 @@ public class ClassLoaderUtilTest {
      * @throws ReflectiveOperationException on test failures.
      */
     @Test
-    public void testClassLoadFailWithoutContextClassLoader() throws 
ReflectiveOperationException {
+    void testClassLoadFailWithoutContextClassLoader() throws 
ReflectiveOperationException {
         Thread.currentThread().setContextClassLoader(null);
         final ClassLoader cl = new 
TestClassLoader(getClass().getClassLoader());
         executeTestMethodUnderClassLoader(cl, 
"callExampleMessageMethodAndAssertClassNotFoundJXPathException");
@@ -154,7 +154,7 @@ public class ClassLoaderUtilTest {
      * @throws ReflectiveOperationException on test failures.
      */
     @Test
-    public void testClassLoadSuccessWithContextClassLoader() throws 
ReflectiveOperationException {
+    void testClassLoadSuccessWithContextClassLoader() throws 
ReflectiveOperationException {
         
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
         final ClassLoader cl = new 
TestClassLoader(getClass().getClassLoader());
         executeTestMethodUnderClassLoader(cl, 
"callExampleMessageMethodAndAssertSuccess");
@@ -164,7 +164,7 @@ public class ClassLoaderUtilTest {
      * Tests that JXPath can dynamically load a class, which is visible to its 
class loader, when there is no context class loader set.
      */
     @Test
-    public void testClassLoadSuccessWithoutContextClassLoader() {
+    void testClassLoadSuccessWithoutContextClassLoader() {
         Thread.currentThread().setContextClassLoader(null);
         callExampleMessageMethodAndAssertSuccess();
     }
@@ -173,7 +173,7 @@ public class ClassLoaderUtilTest {
      * Tests that JXPath will use its class loader to dynamically load a 
requested class when the context class loader is set but unable to load the 
class.
      */
     @Test
-    public void testCurrentClassLoaderFallback() {
+    void testCurrentClassLoaderFallback() {
         final ClassLoader cl = new 
TestClassLoader(getClass().getClassLoader());
         Thread.currentThread().setContextClassLoader(cl);
         callExampleMessageMethodAndAssertSuccess();
diff --git a/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java 
b/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
index 03fafa3..be4923b 100644
--- a/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
+++ b/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java
@@ -30,42 +30,42 @@ import org.junit.jupiter.api.Test;
 public class ValueUtilsTest {
 
     @Test
-    public void testGetValueFromArray() {
+    void testGetValueFromArray() {
         final Object data = new Object();
         assertSame(data, ValueUtils.getValue(new Object[] { data }, 0));
     }
 
     @Test
-    public void testGetValueFromArrayNegativeIndex() {
+    void testGetValueFromArrayNegativeIndex() {
         final Object data = new Object();
         assertNull(ValueUtils.getValue(new Object[] { data }, -1));
     }
 
     @Test
-    public void testGetValueFromArrayTooSmall() {
+    void testGetValueFromArrayTooSmall() {
         assertNull(ValueUtils.getValue(new Object[0], 2));
     }
 
     @Test
-    public void testGetValueFromList() {
+    void testGetValueFromList() {
         final Object data = new Object();
         assertSame(data, ValueUtils.getValue(Arrays.asList(data), 0));
     }
 
     @Test
-    public void testGetValueFromListNegativeIndex() {
+    void testGetValueFromListNegativeIndex() {
         final Object data = new Object();
         final Object res = ValueUtils.getValue(Arrays.asList(data), -1);
         assertNull(res, "Expected null, is " + res);
     }
 
     @Test
-    public void testGetValueFromListTooSmall() {
+    void testGetValueFromListTooSmall() {
         assertNull(ValueUtils.getValue(Collections.EMPTY_LIST, 2));
     }
 
     @Test
-    public void testGetValueFromSet() {
+    void testGetValueFromSet() {
         final Object data = new Object();
         final Set dataSet = new HashSet();
         dataSet.add(data);
@@ -73,7 +73,7 @@ public class ValueUtilsTest {
     }
 
     @Test
-    public void testGetValueFromSetNegativeIndex() {
+    void testGetValueFromSetNegativeIndex() {
         final Object data = new Object();
         final Set dataSet = new HashSet();
         dataSet.add(data);
@@ -84,7 +84,7 @@ public class ValueUtilsTest {
      * This test would break without the patch and an NoSuchElementException 
being thrown instead.
      */
     @Test
-    public void testGetValueFromSetTooSmall() {
+    void testGetValueFromSetTooSmall() {
         assertNull(ValueUtils.getValue(Collections.EMPTY_SET, 2));
     }
 }

Reply via email to