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 2023/08/19 12:09:46 UTC
[commons-jelly] branch master updated: Better test class name
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-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new cd9444d8 Better test class name
cd9444d8 is described below
commit cd9444d8272775cc5a2aa9f78a7b5726a6391b93
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 19 08:09:41 2023 -0400
Better test class name
---
core/src/test/java/org/apache/commons/jelly/TestJelly.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/core/TestCatchTag.java | 4 ++--
.../java/org/apache/commons/jelly/core/TestNestedExceptions.java | 4 ++--
.../apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java | 8 ++++----
.../ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/bean/TestJelly.java | 4 ++--
.../java/org/apache/commons/jelly/tags/beanshell/TestJelly.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/define/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/mock/TestJUnit.java | 4 ++--
.../java/org/apache/commons/jelly/tags/dynabean/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/fmt/TestFMTSuite.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/html/TestJelly.java | 4 ++--
.../org/apache/commons/jelly/tags/jaxme/ExecutionTestCase.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/jmx/TestJelly.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java | 4 ++--
.../apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java | 8 ++++----
.../test/java/org/apache/commons/jelly/tags/junit/TestJUnit.java | 2 +-
.../test/java/org/apache/commons/jelly/tags/log/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/sql/TestJUnit.java | 4 ++--
.../src/test/java/org/apache/commons/jelly/threads/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/util/TestJelly.java | 4 ++--
.../java/org/apache/commons/jelly/tags/validate/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/tags/xml/TestJelly.java | 4 ++--
.../java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java | 4 ++--
26 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/core/src/test/java/org/apache/commons/jelly/TestJelly.java b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
index f879ce47..8aa2a3ad 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestJelly.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.jelly;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@@ -26,7 +26,7 @@ import junit.textui.TestRunner;
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
index 8bdb484c..cfe58ac8 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.commons.jelly.core;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@@ -28,7 +28,7 @@ import junit.textui.TestRunner;
* @author mde
* @version 0.0
*/
-public class TestCatchTag extends JellyTestSuite {
+public class TestCatchTag extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
index 20f31897..f36b27d5 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
@@ -17,12 +17,12 @@
package org.apache.commons.jelly.core;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-public class TestNestedExceptions extends JellyTestSuite {
+public class TestNestedExceptions extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/core/src/test/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
similarity index 95%
rename from jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
rename to core/src/test/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
index 94bddd4f..80a648b0 100644
--- a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
@@ -18,22 +18,22 @@ package org.apache.commons.jelly.tags.junit;
import java.net.URL;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import junit.framework.TestSuite;
+
/**
* An abstract base class for creating a TestSuite via a Jelly script.
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public abstract class JellyTestSuite {
+public abstract class AbstractJellyTestSuite {
/** The Log to which logging calls will be made. */
- private static final Log log = LogFactory.getLog(JellyTestSuite.class);
+ private static final Log log = LogFactory.getLog(AbstractJellyTestSuite.class);
/**
diff --git a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
index 0e43d841..9e171d5b 100644
--- a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
+++ b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.ant;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
index b185c348..8c79e5f5 100644
--- a/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
+++ b/jelly-tags/ant/src/test/java/org/apache/commons/jelly/ant/tag/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.ant.tag;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/TestJelly.java b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/TestJelly.java
index cd5ac011..d76136bf 100644
--- a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/TestJelly.java
+++ b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.bean;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
index bd2f19e2..1960f391 100644
--- a/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
+++ b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.beanshell;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java
index 860629b4..8e6e91ce 100644
--- a/jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java
+++ b/jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.betwixt;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/TestJelly.java b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/TestJelly.java
index dc3238a3..7cc0f040 100644
--- a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/TestJelly.java
+++ b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/define/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.define;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/mock/TestJUnit.java b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/mock/TestJUnit.java
index e1d0e2ef..9e0c80a5 100644
--- a/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/mock/TestJUnit.java
+++ b/jelly-tags/define/src/test/java/org/apache/commons/jelly/tags/mock/TestJUnit.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.mock;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJUnit extends JellyTestSuite {
+public class TestJUnit extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/dynabean/src/test/java/org/apache/commons/jelly/tags/dynabean/TestJelly.java b/jelly-tags/dynabean/src/test/java/org/apache/commons/jelly/tags/dynabean/TestJelly.java
index af8e8e04..0d16904e 100644
--- a/jelly-tags/dynabean/src/test/java/org/apache/commons/jelly/tags/dynabean/TestJelly.java
+++ b/jelly-tags/dynabean/src/test/java/org/apache/commons/jelly/tags/dynabean/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.dynabean;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/fmt/src/test/java/org/apache/commons/jelly/tags/fmt/TestFMTSuite.java b/jelly-tags/fmt/src/test/java/org/apache/commons/jelly/tags/fmt/TestFMTSuite.java
index 38974732..968e4b5c 100644
--- a/jelly-tags/fmt/src/test/java/org/apache/commons/jelly/tags/fmt/TestFMTSuite.java
+++ b/jelly-tags/fmt/src/test/java/org/apache/commons/jelly/tags/fmt/TestFMTSuite.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly.tags.fmt;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
@@ -27,7 +27,7 @@ import org.apache.commons.jelly.tags.junit.JellyTestSuite;
* @author <a href="mailto:willievu@yahoo.com">Willie Vu</a>
* @version 1.1
*/
-public class TestFMTSuite extends JellyTestSuite {
+public class TestFMTSuite extends AbstractJellyTestSuite {
public static void main(String[] args) throws Exception {
TestRunner.run(suite());
diff --git a/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java b/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java
index a5247131..b8106c70 100644
--- a/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java
+++ b/jelly-tags/html/src/test/java/org/apache/commons/jelly/html/TestJelly.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly.html;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
@@ -27,7 +27,7 @@ import org.apache.commons.jelly.tags.junit.JellyTestSuite;
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version 1.1
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/jaxme/src/test/java/org/apache/commons/jelly/tags/jaxme/ExecutionTestCase.java b/jelly-tags/jaxme/src/test/java/org/apache/commons/jelly/tags/jaxme/ExecutionTestCase.java
index 5e1531f1..75d1afa4 100644
--- a/jelly-tags/jaxme/src/test/java/org/apache/commons/jelly/tags/jaxme/ExecutionTestCase.java
+++ b/jelly-tags/jaxme/src/test/java/org/apache/commons/jelly/tags/jaxme/ExecutionTestCase.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.jelly.tags.jaxme;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
import junit.framework.TestSuite;
/**
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
*
* @author <a href="mailto:dev at commons.apache.org">Apache Commons Development Team</a>
*/
-public class ExecutionTestCase extends JellyTestSuite {
+public class ExecutionTestCase extends AbstractJellyTestSuite {
public static TestSuite suite() throws Exception {
diff --git a/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/TestJelly.java b/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/TestJelly.java
index c4f0b69f..544e2c65 100644
--- a/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/TestJelly.java
+++ b/jelly-tags/jmx/src/test/java/org/apache/commons/jelly/tags/jmx/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.jmx;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java b/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java
index c9226cbd..f2c3ef01 100644
--- a/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java
+++ b/jelly-tags/jsl/src/test/java/org/apache/commons/jelly/jsl/TestJSLSuite.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.jsl;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:dion@apache.org">dIon Gillard</a>
*/
-public class TestJSLSuite extends JellyTestSuite {
+public class TestJSLSuite extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
similarity index 95%
rename from core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
rename to jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
index e9eacc76..c00d6dc4 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AbstractJellyTestSuite.java
@@ -18,22 +18,22 @@ package org.apache.commons.jelly.tags.junit;
import java.net.URL;
+import junit.framework.TestSuite;
+
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.TestSuite;
-
/**
* An abstract base class for creating a TestSuite via a Jelly script.
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public abstract class JellyTestSuite {
+public abstract class AbstractJellyTestSuite {
/** The Log to which logging calls will be made. */
- private static final Log log = LogFactory.getLog(JellyTestSuite.class);
+ private static final Log log = LogFactory.getLog(AbstractJellyTestSuite.class);
/**
diff --git a/jelly-tags/junit/src/test/java/org/apache/commons/jelly/tags/junit/TestJUnit.java b/jelly-tags/junit/src/test/java/org/apache/commons/jelly/tags/junit/TestJUnit.java
index c6b180ae..0c78ff00 100644
--- a/jelly-tags/junit/src/test/java/org/apache/commons/jelly/tags/junit/TestJUnit.java
+++ b/jelly-tags/junit/src/test/java/org/apache/commons/jelly/tags/junit/TestJUnit.java
@@ -25,7 +25,7 @@ import junit.textui.TestRunner;
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version 1.1
*/
-public class TestJUnit extends JellyTestSuite {
+public class TestJUnit extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/TestJelly.java b/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/TestJelly.java
index 9d4c7086..14c38a01 100644
--- a/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/TestJelly.java
+++ b/jelly-tags/log/src/test/java/org/apache/commons/jelly/tags/log/TestJelly.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly.tags.log;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
@@ -27,7 +27,7 @@ import org.apache.commons.jelly.tags.junit.JellyTestSuite;
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version 1.1
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/sql/src/test/java/org/apache/commons/jelly/tags/sql/TestJUnit.java b/jelly-tags/sql/src/test/java/org/apache/commons/jelly/tags/sql/TestJUnit.java
index 38cfcaec..df4ecbdc 100644
--- a/jelly-tags/sql/src/test/java/org/apache/commons/jelly/tags/sql/TestJUnit.java
+++ b/jelly-tags/sql/src/test/java/org/apache/commons/jelly/tags/sql/TestJUnit.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.sql;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJUnit extends JellyTestSuite {
+public class TestJUnit extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/threads/src/test/java/org/apache/commons/jelly/threads/TestJelly.java b/jelly-tags/threads/src/test/java/org/apache/commons/jelly/threads/TestJelly.java
index 4f6e14cd..3f352b0b 100644
--- a/jelly-tags/threads/src/test/java/org/apache/commons/jelly/threads/TestJelly.java
+++ b/jelly-tags/threads/src/test/java/org/apache/commons/jelly/threads/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.threads;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java b/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java
index cc854760..b6763451 100644
--- a/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java
+++ b/jelly-tags/util/src/test/java/org/apache/commons/jelly/tags/util/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.util;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java b/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java
index e0623f53..980358cc 100644
--- a/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java
+++ b/jelly-tags/validate/src/test/java/org/apache/commons/jelly/tags/validate/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.validate;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java
index 55ce6b61..523e2555 100644
--- a/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java
+++ b/jelly-tags/xml/src/test/java/org/apache/commons/jelly/tags/xml/TestJelly.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.tags.xml;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
diff --git a/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java b/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
index 72cc588d..f0206553 100644
--- a/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
+++ b/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
@@ -20,9 +20,9 @@ package org.apache.commons.jelly.tags.xmlunit;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+import org.apache.commons.jelly.tags.junit.AbstractJellyTestSuite;
-public class TestJelly extends JellyTestSuite {
+public class TestJelly extends AbstractJellyTestSuite {
public static void main(String[] args) throws Exception {
TestRunner.run(suite());