You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/11/16 14:55:30 UTC
(commons-jxpath) 02/03: Rename abstract test class
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 7b7189787f1541d7cbca93b3b2ccbee4ccd37604
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 16 09:52:59 2024 -0500
Rename abstract test class
---
.../commons/jxpath/{JXPathTestCase.java => AbstractJXPathTest.java} | 4 ++--
src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java | 2 +-
src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java | 4 ++--
src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java | 4 ++--
.../java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java | 4 ++--
src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/axes/RecursiveAxesTest.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/axes/TestBeanWithNode.java | 4 ++--
.../apache/commons/jxpath/ri/compiler/ContextDependencyTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/compiler/CoreOperationTest.java | 4 ++--
.../apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/compiler/VariableTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java | 4 ++--
.../commons/jxpath/ri/model/AliasedNamespaceIterationTest.java | 6 +++---
.../apache/commons/jxpath/ri/model/EmbeddedColonMapKeysTest.java | 4 ++--
.../org/apache/commons/jxpath/ri/model/EmptyCollectionTest.java | 4 ++--
.../apache/commons/jxpath/ri/model/ExternalXMLNamespaceTest.java | 6 +++---
src/test/java/org/apache/commons/jxpath/ri/model/JXPath151Test.java | 4 ++--
src/test/java/org/apache/commons/jxpath/ri/model/JXPath154Test.java | 6 +++---
.../java/org/apache/commons/jxpath/ri/model/MixedModelTest.java | 4 ++--
.../java/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java | 6 +++---
.../org/apache/commons/jxpath/ri/model/XMLPreserveSpaceTest.java | 6 +++---
src/test/java/org/apache/commons/jxpath/ri/model/XMLSpaceTest.java | 6 +++---
.../apache/commons/jxpath/ri/model/XMLUpperCaseElementsTest.java | 6 +++---
.../commons/jxpath/ri/model/container/ContainerModelTest.java | 4 ++--
.../apache/commons/jxpath/ri/model/dynabeans/LazyDynaBeanTest.java | 4 ++--
.../commons/jxpath/ri/model/dynamic/DynamicPropertiesModelTest.java | 4 ++--
30 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
rename to src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
index 9df8df5..6ebd641 100644
--- a/src/test/java/org/apache/commons/jxpath/JXPathTestCase.java
+++ b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
@@ -32,12 +32,12 @@ import junit.framework.TestCase;
/**
* Abstract superclass for various JXPath tests.
*/
-public abstract class JXPathTestCase extends TestCase {
+public abstract class AbstractJXPathTest extends TestCase {
/**
* Constructs a new instance of this test case.
*/
- public JXPathTestCase() {
+ public AbstractJXPathTest() {
Locale.setDefault(Locale.US);
}
diff --git a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
index 710c172..f711133 100644
--- a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
+++ b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
/**
* Test BasicNodeSet
*/
-public class BasicNodeSetTest extends JXPathTestCase {
+public class BasicNodeSetTest extends AbstractJXPathTest {
/** JXPathContext */
protected JXPathContext context;
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 57f894c..78aaf19 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath113Test.java
@@ -23,11 +23,11 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
-public class JXPath113Test extends JXPathTestCase
+public class JXPath113Test extends AbstractJXPathTest
{
public void testIssue113() throws Exception
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 dc4558f..385b695 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath149Test.java
@@ -17,9 +17,9 @@
package org.apache.commons.jxpath.issues;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
-public class JXPath149Test extends JXPathTestCase {
+public class JXPath149Test extends AbstractJXPathTest {
public void testComplexOperationWithVariables() {
final JXPathContext context = JXPathContext.newContext(null);
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 866e574..fc2dc27 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172DynamicTest.java
@@ -19,13 +19,13 @@ package org.apache.commons.jxpath.issues;
import java.util.HashMap;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer;
import junit.framework.TestSuite;
-public class JXPath172DynamicTest extends JXPathTestCase
+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 e8ba867..a0d3ed2 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath172Test.java
@@ -18,14 +18,14 @@ package org.apache.commons.jxpath.issues;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
-import org.apache.commons.jxpath.JXPathTestCase;
+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 junit.framework.TestSuite;
-public class JXPath172Test extends JXPathTestCase
+public class JXPath172Test extends AbstractJXPathTest
{
/**
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 b4e6626..d6264ab 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/ExceptionHandlerTest.java
@@ -17,12 +17,12 @@
package org.apache.commons.jxpath.ri;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
/**
* Test simple ExceptionHandler.
*/
-public class ExceptionHandlerTest extends JXPathTestCase {
+public class ExceptionHandlerTest extends AbstractJXPathTest {
public static class Bar {
public Object getBaz() {
throw new IllegalStateException("baz unavailable");
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 6e5a934..064244e 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/JXPathCompiledExpressionTest.java
@@ -17,7 +17,7 @@
package org.apache.commons.jxpath.ri;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.ri.compiler.Constant;
import org.apache.commons.jxpath.ri.compiler.CoreFunction;
import org.apache.commons.jxpath.ri.compiler.CoreOperationAdd;
@@ -45,7 +45,7 @@ import org.apache.commons.jxpath.ri.compiler.VariableReference;
* Test compiler.
*/
-public class JXPathCompiledExpressionTest extends JXPathTestCase {
+public class JXPathCompiledExpressionTest extends AbstractJXPathTest {
public void testConstant() {
assertXPathExpression("1", Constant.class);
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 cae611a..74dea97 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
@@ -17,13 +17,13 @@
package org.apache.commons.jxpath.ri.axes;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
/**
* Test for the protection mechanism that stops infinite recursion
* in descent down a recursive graph.
*/
-public class RecursiveAxesTest extends JXPathTestCase {
+public class RecursiveAxesTest extends AbstractJXPathTest {
private RecursiveBean bean;
private JXPathContext context;
diff --git a/src/test/java/org/apache/commons/jxpath/ri/axes/TestBeanWithNode.java b/src/test/java/org/apache/commons/jxpath/ri/axes/TestBeanWithNode.java
index 58f938f..8a224dc 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/axes/TestBeanWithNode.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/axes/TestBeanWithNode.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.jxpath.ri.axes;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.TestBean;
import org.apache.commons.jxpath.xml.DocumentContainer;
import org.w3c.dom.Document;
@@ -52,7 +52,7 @@ public class TestBeanWithNode extends TestBean {
public static TestBeanWithNode createTestBeanWithDOM() {
final DocumentContainer docCtr =
new DocumentContainer(
- JXPathTestCase.class.getResource("Vendor.xml"));
+ AbstractJXPathTest.class.getResource("Vendor.xml"));
final Document doc = (Document) docCtr.getValue();
final TestBeanWithNode tbwdom = new TestBeanWithNode();
tbwdom.setVendor(doc.getDocumentElement());
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 f9a4be1..17f700b 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,13 +16,13 @@
*/
package org.apache.commons.jxpath.ri.compiler;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.ri.Parser;
/**
* Tests the determination of whether an expression is context dependent.
*/
-public class ContextDependencyTest extends JXPathTestCase {
+public class ContextDependencyTest extends AbstractJXPathTest {
public void testContextDependency() {
testContextDependency("1", false);
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 1901097..7d434fa 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
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.jxpath.ExtendedKeyManager;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.NodeSet;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.TestMixedModelBean;
@@ -32,7 +32,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer;
/**
* Test basic functionality of JXPath - core functions.
*/
-public class CoreFunctionTest extends JXPathTestCase {
+public class CoreFunctionTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
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 3760ba6..e470da6 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
@@ -17,14 +17,14 @@
package org.apache.commons.jxpath.ri.compiler;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.Variables;
/**
* Test basic functionality of JXPath - infoset types,
* operations.
*/
-public class CoreOperationTest extends JXPathTestCase {
+public class CoreOperationTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
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 4486d82..ece64c1 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
@@ -27,7 +27,7 @@ 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.JXPathTestCase;
+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,7 +41,7 @@ import org.apache.commons.jxpath.util.TypeUtils;
/**
* Test extension functions.
*/
-public class ExtensionFunctionTest extends JXPathTestCase {
+public class ExtensionFunctionTest extends AbstractJXPathTest {
private Functions functions;
private JXPathContext context;
private TestBean testBean;
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 86dc3f8..ccd57a6 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
@@ -17,7 +17,7 @@
package org.apache.commons.jxpath.ri.compiler;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.TestMixedModelBean;
import org.apache.commons.jxpath.Variables;
@@ -25,7 +25,7 @@ import org.apache.commons.jxpath.Variables;
* Test basic functionality of JXPath - infoset types,
* operations.
*/
-public class VariableTest extends JXPathTestCase {
+public class VariableTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
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 ff54717..6d3d39e 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
@@ -25,7 +25,7 @@ import java.util.Locale;
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.ClassFunctions;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+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;
@@ -38,7 +38,7 @@ import org.apache.commons.jxpath.ri.model.dynabeans.DynaBeanModelTest;
/**
* Abstract superclass for Bean access with JXPath.
*/
-public abstract class AbstractBeanModelTest extends JXPathTestCase {
+public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
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 1e9a08a..9e4b08c 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
@@ -19,17 +19,17 @@ package org.apache.commons.jxpath.ri.model;
import java.util.Collection;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
/**
* Test aliased/doubled XML namespace iteration; JXPATH-125.
*/
-public class AliasedNamespaceIterationTest extends JXPathTestCase {
+public class AliasedNamespaceIterationTest extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- final DocumentContainer result = new DocumentContainer(JXPathTestCase.class
+ final DocumentContainer result = new DocumentContainer(AbstractJXPathTest.class
.getResource("IterateAliasedNS.xml"), model);
return result;
}
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 7014d11..987963d 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
@@ -19,12 +19,12 @@ package org.apache.commons.jxpath.ri.model;
import java.util.HashMap;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
/**
* JXPATH-104 test.
*/
-public class EmbeddedColonMapKeysTest extends JXPathTestCase {
+public class EmbeddedColonMapKeysTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
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 d8fc17b..7c63342 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
@@ -19,12 +19,12 @@ package org.apache.commons.jxpath.ri.model;
import java.util.Collections;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
/**
* Be sure empty lists/sets/arrays work.
*/
-public class EmptyCollectionTest extends JXPathTestCase {
+public class EmptyCollectionTest extends AbstractJXPathTest {
public static class HasChild {
private final Object child;
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 84833b5..e0ff850 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
@@ -17,17 +17,17 @@
package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
/**
* Test externally registered XML namespaces; JXPATH-97.
*/
-public class ExternalXMLNamespaceTest extends JXPathTestCase {
+public class ExternalXMLNamespaceTest extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- final DocumentContainer result = new DocumentContainer(JXPathTestCase.class
+ final DocumentContainer result = new DocumentContainer(AbstractJXPathTest.class
.getResource("ExternalNS.xml"), model);
// this setting only works for DOM, so no JDOM tests :|
result.setNamespaceAware(false);
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 ed566bc..f572184 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
@@ -20,10 +20,10 @@ import java.util.HashMap;
import java.util.Locale;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.TestBean;
-public class JXPath151Test extends JXPathTestCase {
+public class JXPath151Test extends AbstractJXPathTest {
private JXPathContext context;
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 eff6253..7843d61 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
@@ -18,15 +18,15 @@
package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
-public class JXPath154Test extends JXPathTestCase {
+public class JXPath154Test extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- return new DocumentContainer(JXPathTestCase.class.getResource("InnerEmptyNamespace.xml"), model);
+ return new DocumentContainer(AbstractJXPathTest.class.getResource("InnerEmptyNamespace.xml"), model);
}
protected void doTest(final String path, final String model, final String expectedValue) {
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 de007c3..faf8d66 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
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Vector;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.TestBean;
import org.apache.commons.jxpath.TestMixedModelBean;
@@ -36,7 +36,7 @@ import org.apache.commons.jxpath.Variables;
/**
* Tests JXPath with mixed model: beans, maps, DOM etc.
*/
-public class MixedModelTest extends JXPathTestCase {
+public class MixedModelTest extends AbstractJXPathTest {
private JXPathContext context;
@Override
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java b/src/test/java/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java
index 2cfe0c5..46a72de 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java
@@ -19,7 +19,7 @@ package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
-import org.apache.commons.jxpath.JXPathTestCase;
+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;
@@ -30,7 +30,7 @@ import org.apache.commons.jxpath.xml.DocumentContainer;
* DOM, JDOM etc.
*/
-public abstract class XMLModelTestCase extends JXPathTestCase {
+public abstract class XMLModelTestCase extends AbstractJXPathTest {
protected JXPathContext context;
@Override
@@ -49,7 +49,7 @@ public abstract class XMLModelTestCase extends JXPathTestCase {
protected DocumentContainer createDocumentContainer() {
return new DocumentContainer(
- JXPathTestCase.class.getResource("Vendor.xml"),
+ AbstractJXPathTest.class.getResource("Vendor.xml"),
getModel());
}
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 5deff55..b33df7d 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
@@ -17,17 +17,17 @@
package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
/**
* Test for text trimming from JXPATH-83.
*/
-public class XMLPreserveSpaceTest extends JXPathTestCase {
+public class XMLPreserveSpaceTest extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- return new DocumentContainer(JXPathTestCase.class
+ return new DocumentContainer(AbstractJXPathTest.class
.getResource("XmlPreserveSpace.xml"), model);
}
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 bdbe0ab..d6c7601 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
@@ -17,17 +17,17 @@
package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
/**
* Test for text trimming from JXPATH-83.
*/
-public class XMLSpaceTest extends JXPathTestCase {
+public class XMLSpaceTest extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- return new DocumentContainer(JXPathTestCase.class
+ return new DocumentContainer(AbstractJXPathTest.class
.getResource("XmlSpace.xml"), model);
}
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 5e14d2b..e5426b1 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
@@ -17,17 +17,17 @@
package org.apache.commons.jxpath.ri.model;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
/**
* Test for uppercase element matching, etc. showing JXPATH-136 is not reproducible.
*/
-public class XMLUpperCaseElementsTest extends JXPathTestCase {
+public class XMLUpperCaseElementsTest extends AbstractJXPathTest {
protected JXPathContext context;
protected DocumentContainer createDocumentContainer(final String model) {
- return new DocumentContainer(JXPathTestCase.class.getResource("VendorUpper.xml"), model);
+ return new DocumentContainer(AbstractJXPathTest.class.getResource("VendorUpper.xml"), model);
}
protected JXPathContext createContext(final String model) {
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 5cbffe4..47371b5 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
@@ -23,13 +23,13 @@ import java.util.Map;
import org.apache.commons.jxpath.Container;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
/**
* Tests JXPath with containers as root or value of a variable, property, etc.
*/
-public class ContainerModelTest extends JXPathTestCase {
+public class ContainerModelTest extends AbstractJXPathTest {
private static final class ArrayContainer implements Container
{
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 13b77bb..e280e9e 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
@@ -19,12 +19,12 @@ package org.apache.commons.jxpath.ri.model.dynabeans;
import org.apache.commons.beanutils.LazyDynaBean;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
/**
*/
-public class LazyDynaBeanTest extends JXPathTestCase {
+public class LazyDynaBeanTest extends AbstractJXPathTest {
public void testLazyProperty() throws JXPathNotFoundException {
final LazyDynaBean bean = new LazyDynaBean();
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 dbc7837..99cbf84 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
@@ -22,14 +22,14 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathTestCase;
+import org.apache.commons.jxpath.AbstractJXPathTest;
import org.apache.commons.jxpath.TestBean;
/**
* TODO more iterator testing with maps
*/
-public class DynamicPropertiesModelTest extends JXPathTestCase {
+public class DynamicPropertiesModelTest extends AbstractJXPathTest {
private JXPathContext context;
@Override