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
commit fcb63039d7dbe0819b63421490fbaa98556b4529 Author: Gary D. Gregory <[email protected]> AuthorDate: Sun Mar 16 13:23:36 2025 -0400 Sort imports --- .../org/apache/commons/jxpath/AbstractJXPathTest.java | 6 +++--- .../org/apache/commons/jxpath/BasicNodeSetTest.java | 4 ++-- .../org/apache/commons/jxpath/issues/JXPath113Test.java | 8 ++++---- .../org/apache/commons/jxpath/issues/JXPath118Test.java | 5 ++--- .../org/apache/commons/jxpath/issues/JXPath149Test.java | 2 +- .../commons/jxpath/issues/JXPath172DynamicTest.java | 11 +++++------ .../org/apache/commons/jxpath/issues/JXPath172Test.java | 13 ++++++------- .../org/apache/commons/jxpath/issues/JXPath177Test.java | 7 +++---- .../apache/commons/jxpath/ri/ExceptionHandlerTest.java | 8 ++++---- .../commons/jxpath/ri/JXPathCompiledExpressionTest.java | 6 +++--- .../jxpath/ri/JXPathContextReferenceImplTestCase.java | 1 - .../java/org/apache/commons/jxpath/ri/StressTest.java | 7 +++---- .../commons/jxpath/ri/axes/RecursiveAxesTest.java | 2 +- .../jxpath/ri/axes/SimplePathInterpreterTest.java | 9 ++++----- .../jxpath/ri/compiler/ContextDependencyTest.java | 4 ++-- .../commons/jxpath/ri/compiler/CoreFunctionTest.java | 2 +- .../commons/jxpath/ri/compiler/CoreOperationTest.java | 2 +- .../jxpath/ri/compiler/ExtensionFunctionTest.java | 8 ++++---- .../apache/commons/jxpath/ri/compiler/VariableTest.java | 10 +++++----- .../commons/jxpath/ri/model/AbstractBeanModelTest.java | 10 +++++----- .../commons/jxpath/ri/model/AbstractXMLModelTest.java | 10 +++++----- .../jxpath/ri/model/AliasedNamespaceIterationTest.java | 2 +- .../jxpath/ri/model/EmbeddedColonMapKeysTest.java | 2 +- .../commons/jxpath/ri/model/EmptyCollectionTest.java | 2 +- .../jxpath/ri/model/ExternalXMLNamespaceTest.java | 2 +- .../apache/commons/jxpath/ri/model/JXPath151Test.java | 2 +- .../apache/commons/jxpath/ri/model/JXPath154Test.java | 6 +++--- .../apache/commons/jxpath/ri/model/MixedModelTest.java | 8 ++++---- .../commons/jxpath/ri/model/XMLPreserveSpaceTest.java | 6 +++--- .../apache/commons/jxpath/ri/model/XMLSpaceTest.java | 6 +++--- .../jxpath/ri/model/XMLUpperCaseElementsTest.java | 6 +++--- .../ri/model/beans/BadlyImplementedFactoryTest.java | 7 +++---- .../jxpath/ri/model/container/ContainerModelTest.java | 6 +++--- .../commons/jxpath/ri/model/dom/DOMModelTest.java | 4 ++-- .../jxpath/ri/model/dynabeans/LazyDynaBeanTest.java | 6 +++--- .../ri/model/dynamic/DynamicPropertiesModelTest.java | 8 ++++---- .../commons/jxpath/ri/model/jdom/JDOMModelTest.java | 4 ++-- .../jxpath/servlet/JXPathServletContextTest.java | 17 ++++++++--------- .../commons/jxpath/util/BasicTypeConverterTest.java | 9 ++++----- .../apache/commons/jxpath/util/ClassLoaderUtilTest.java | 9 ++++----- .../org/apache/commons/jxpath/util/ValueUtilsTest.java | 6 +++--- 41 files changed, 121 insertions(+), 132 deletions(-) diff --git a/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java index 1725896..dc33742 100644 --- a/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java +++ b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java @@ -16,6 +16,9 @@ */ package org.apache.commons.jxpath; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -28,9 +31,6 @@ import java.util.Set; import org.apache.commons.jxpath.ri.model.NodePointer; import org.junit.jupiter.api.BeforeEach; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Abstract superclass for various JXPath tests. */ diff --git a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java index 14565ba..50a6d93 100644 --- a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java +++ b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java @@ -16,6 +16,8 @@ */ package org.apache.commons.jxpath; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Iterator; import java.util.List; @@ -23,8 +25,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.w3c.dom.Element; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Test BasicNodeSet */ 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 397fc4a..849a197 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java @@ -16,6 +16,9 @@ */ package org.apache.commons.jxpath.issues; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.StringReader; import java.util.List; @@ -23,15 +26,12 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class JXPath113Test extends AbstractJXPathTest { 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 fb75561..d7ac25a 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java @@ -16,15 +16,14 @@ */ package org.apache.commons.jxpath.issues; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Iterator; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Testcase proving JXPATH-118 issue with asPath() returning wrong names. */ 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 35086e8..f6d3953 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java @@ -16,8 +16,8 @@ */ package org.apache.commons.jxpath.issues; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.Test; public class JXPath149Test extends AbstractJXPathTest { 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 95a6c82..3b47431 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java @@ -16,19 +16,18 @@ */ package org.apache.commons.jxpath.issues; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.HashMap; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - public class JXPath172DynamicTest extends AbstractJXPathTest { 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 66c3767..5e6e20d 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java @@ -16,20 +16,19 @@ */ package org.apache.commons.jxpath.issues; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathNotFoundException; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.ri.model.beans.BeanPropertyPointer; import org.apache.commons.jxpath.ri.model.beans.NullPropertyPointer; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class JXPath172Test extends AbstractJXPathTest { 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 419f722..236af32 100644 --- a/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java +++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath177Test.java @@ -16,18 +16,17 @@ */ package org.apache.commons.jxpath.issues; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.HashMap; import java.util.Map; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.Variables; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class JXPath177Test { private static final class JXPathVariablesResolver implements Variables 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 792652c..21c4b35 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java +++ b/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java @@ -16,14 +16,14 @@ */ package org.apache.commons.jxpath.ri; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; - /** * Test simple ExceptionHandler. */ 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 7289740..36b1a04 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java +++ b/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java @@ -16,8 +16,10 @@ */ package org.apache.commons.jxpath.ri; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.compiler.Constant; import org.apache.commons.jxpath.ri.compiler.CoreFunction; import org.apache.commons.jxpath.ri.compiler.CoreOperationAdd; @@ -42,8 +44,6 @@ import org.apache.commons.jxpath.ri.compiler.NameAttributeTest; import org.apache.commons.jxpath.ri.compiler.VariableReference; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Test compiler. */ 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 f10bc72..48587b7 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java +++ b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java @@ -18,7 +18,6 @@ package org.apache.commons.jxpath.ri; import org.apache.commons.jxpath.ri.model.container.ContainerPointerFactory; - import org.junit.jupiter.api.Test; public class JXPathContextReferenceImplTestCase { 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 003069e..f2f192e 100644 --- a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java +++ b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java @@ -16,13 +16,12 @@ */ package org.apache.commons.jxpath.ri; -import org.apache.commons.jxpath.JXPathContext; - -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +import org.apache.commons.jxpath.JXPathContext; +import org.junit.jupiter.api.Test; + /** * Test thread safety. */ 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 14c032d..041d09a 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 @@ -16,8 +16,8 @@ */ package org.apache.commons.jxpath.ri.axes; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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 a21a04c..f1749d3 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 @@ -16,6 +16,10 @@ */ package org.apache.commons.jxpath.ri.axes; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.HashMap; import org.apache.commons.jxpath.JXPathContext; @@ -34,14 +38,9 @@ import org.apache.commons.jxpath.ri.model.beans.TestBeanFactory; import org.apache.commons.jxpath.ri.model.dom.DOMNodePointer; import org.apache.commons.jxpath.ri.model.dynamic.DynamicPointer; import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class SimplePathInterpreterTest { private TestBeanWithNode bean; 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 daad916..347a7d3 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 @@ -16,12 +16,12 @@ */ package org.apache.commons.jxpath.ri.compiler; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.ri.Parser; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Tests the determination of whether an expression is context dependent. */ 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 0ea6c81..b1a43bf 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 @@ -20,9 +20,9 @@ import java.text.DecimalFormatSymbols; import java.util.Arrays; import java.util.List; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.ExtendedKeyManager; import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.NodeSet; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.TestMixedModelBean; 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 bb5186f..3f69280 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 @@ -16,8 +16,8 @@ */ package org.apache.commons.jxpath.ri.compiler; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Variables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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 36befa1..bc03739 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 @@ -16,18 +16,21 @@ */ package org.apache.commons.jxpath.ri.compiler; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Locale; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.ClassFunctions; import org.apache.commons.jxpath.ExpressionContext; import org.apache.commons.jxpath.Function; import org.apache.commons.jxpath.FunctionLibrary; import org.apache.commons.jxpath.Functions; import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.NodeSet; import org.apache.commons.jxpath.PackageFunctions; import org.apache.commons.jxpath.Pointer; @@ -41,9 +44,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - /** * Test extension functions. */ 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 77666b6..89dd78e 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 @@ -16,17 +16,17 @@ */ package org.apache.commons.jxpath.ri.compiler; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.TestMixedModelBean; import org.apache.commons.jxpath.Variables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Test basic functionality of JXPath - infoset types, * operations. 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 9e60737..15d0ffd 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 @@ -16,6 +16,10 @@ */ package org.apache.commons.jxpath.ri.model; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -23,9 +27,9 @@ import java.util.List; import java.util.Locale; import org.apache.commons.jxpath.AbstractFactory; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.ClassFunctions; import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.NestedTestBean; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.ri.QName; @@ -37,10 +41,6 @@ import org.apache.commons.jxpath.ri.model.dynabeans.DynaBeanModelTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Abstract superclass for Bean access with JXPath. */ 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 30b14ec..e9d4b14 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 @@ -16,20 +16,20 @@ */ package org.apache.commons.jxpath.ri.model; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.commons.jxpath.AbstractFactory; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathException; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.Variables; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Abstract superclass for pure XPath 1.0. Subclasses * apply the same XPaths to contexts using different models: 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 1e1c529..0a513b4 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 @@ -18,8 +18,8 @@ package org.apache.commons.jxpath.ri.model; import java.util.Collection; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; 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 b2601e8..e07cbfb 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 @@ -18,8 +18,8 @@ package org.apache.commons.jxpath.ri.model; import java.util.HashMap; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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 6446ada..b7f749d 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 @@ -18,8 +18,8 @@ package org.apache.commons.jxpath.ri.model; import java.util.Collections; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.junit.jupiter.api.Test; /** 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 6bb186f..7237d56 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 @@ -16,8 +16,8 @@ */ package org.apache.commons.jxpath.ri.model; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; 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 b452e25..45b017e 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 @@ -19,8 +19,8 @@ package org.apache.commons.jxpath.ri.model; import java.util.HashMap; import java.util.Locale; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.TestBean; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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 c133e0d..460ceba 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 @@ -17,13 +17,13 @@ package org.apache.commons.jxpath.ri.model; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class JXPath154Test extends AbstractJXPathTest { protected JXPathContext context; 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 3677185..2e0ca5d 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 @@ -16,6 +16,9 @@ */ package org.apache.commons.jxpath.ri.model; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -25,8 +28,8 @@ import java.util.Locale; import java.util.Map; import java.util.Vector; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.TestBean; import org.apache.commons.jxpath.TestMixedModelBean; @@ -35,9 +38,6 @@ import org.apache.commons.jxpath.Variables; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Tests JXPath with mixed model: beans, maps, DOM etc. */ 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 60a2266..3d995a5 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 @@ -16,13 +16,13 @@ */ package org.apache.commons.jxpath.ri.model; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Test for text trimming from JXPATH-83. */ 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 9f5a74b..0d26e8b 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 @@ -16,13 +16,13 @@ */ package org.apache.commons.jxpath.ri.model; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Test for text trimming from JXPATH-83. */ 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 4bd4052..1f09ee3 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 @@ -16,13 +16,13 @@ */ package org.apache.commons.jxpath.ri.model; -import org.apache.commons.jxpath.JXPathContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.xml.DocumentContainer; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Test for uppercase element matching, etc. showing JXPATH-136 is not reproducible. */ 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 6b7f726..2012778 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 @@ -16,6 +16,9 @@ */ package org.apache.commons.jxpath.ri.model.beans; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.HashMap; import java.util.Map; @@ -24,13 +27,9 @@ import org.apache.commons.jxpath.JXPathAbstractFactoryException; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathException; import org.apache.commons.jxpath.Pointer; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * Badly-implemented Factory test. From JIRA JXPATH-68. */ 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 439272b..f041994 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 @@ -16,18 +16,18 @@ */ package org.apache.commons.jxpath.ri.model.container; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.Container; import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - /** * Tests JXPath with containers as root or value of a variable, property, etc. */ 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 500ab15..938eb4e 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 @@ -16,6 +16,8 @@ */ package org.apache.commons.jxpath.ri.model.dom; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + import org.apache.commons.jxpath.AbstractFactory; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.ri.model.AbstractXMLModelTest; @@ -27,8 +29,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - /** * Tests JXPath with DOM */ 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 f3e1338..44e81a3 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 @@ -16,15 +16,15 @@ */ package org.apache.commons.jxpath.ri.model.dynabeans; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.commons.beanutils.LazyDynaBean; +import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathNotFoundException; -import org.apache.commons.jxpath.AbstractJXPathTest; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** */ public class LazyDynaBeanTest extends AbstractJXPathTest { 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 f5dbf66..805e84b 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 @@ -16,20 +16,20 @@ */ package org.apache.commons.jxpath.ri.model.dynamic; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.AbstractJXPathTest; +import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.TestBean; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - /** * TODO more iterator testing with maps */ 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 b5ab068..849d6b0 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 @@ -16,6 +16,8 @@ */ package org.apache.commons.jxpath.ri.model.jdom; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + import java.util.List; import org.apache.commons.jxpath.AbstractFactory; @@ -30,8 +32,6 @@ import org.jdom.Text; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; - /** * Tests JXPath with JDOM */ 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 710a51f..ce9a0f7 100644 --- a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java +++ b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java @@ -17,6 +17,13 @@ package org.apache.commons.jxpath.servlet; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Iterator; import javax.servlet.ServletContext; @@ -24,6 +31,7 @@ import javax.servlet.ServletContext; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.Pointer; import org.apache.commons.jxpath.Variables; +import org.junit.jupiter.api.Test; import com.mockrunner.mock.web.MockHttpServletRequest; import com.mockrunner.mock.web.MockHttpSession; @@ -31,15 +39,6 @@ import com.mockrunner.mock.web.MockPageContext; import com.mockrunner.mock.web.MockServletConfig; import com.mockrunner.mock.web.MockServletContext; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** */ public class JXPathServletContextTest { 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 ac42883..9257700 100644 --- a/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java +++ b/src/test/java/org/apache/commons/jxpath/util/BasicTypeConverterTest.java @@ -16,6 +16,10 @@ */ package org.apache.commons.jxpath.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.lang.reflect.Array; import java.math.BigDecimal; import java.util.ArrayList; @@ -26,13 +30,8 @@ import java.util.List; import org.apache.commons.jxpath.NodeSet; import org.apache.commons.jxpath.Pointer; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - /** * Tests BasicTypeConverter */ 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 323cdfb..75c9cf0 100644 --- a/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java +++ b/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java @@ -16,6 +16,10 @@ */ package org.apache.commons.jxpath.util; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -25,15 +29,10 @@ import java.net.URL; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathException; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; - /** * Tests org.apache.commons.jxpath.util.ClassLoaderUtil. */ 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 b2405c4..65827a7 100644 --- a/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java +++ b/src/test/java/org/apache/commons/jxpath/util/ValueUtilsTest.java @@ -16,6 +16,9 @@ */ package org.apache.commons.jxpath.util; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -23,9 +26,6 @@ import java.util.Set; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; - public class ValueUtilsTest { @Test
