You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/26 15:27:20 UTC
cvs commit: jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container TestContainerRunner.java TestAll.java
cmlenz 2003/05/26 06:27:20
Modified: integration/ant/src/test/org/apache/cactus/integration/ant
TestCactusTask.java AntTestCase.java TestAll.java
TestRunServerTestsTask.java TestContainerSet.java
TestCactifyWarTask.java
integration/ant/src/test/org/apache/cactus/integration/ant/deployment
TestWebXmlVersion.java TestAll.java TestWebXml.java
TestApplicationXml.java TestJarArchive.java
TestApplicationXmlVersion.java
TestWebXmlMerger.java
integration/ant/src/test/org/apache/cactus/integration/ant/container
TestContainerRunner.java TestAll.java
Log:
Migration to JUnit 3.8 style test classes (no more need to pass the test name up in the constructor)
Revision Changes Path
1.10 +4 -5 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactusTask.java
Index: TestCactusTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactusTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestCactusTask.java 16 May 2003 14:10:04 -0000 1.9
+++ TestCactusTask.java 26 May 2003 13:27:18 -0000 1.10
@@ -71,12 +71,11 @@
// Constructors ------------------------------------------------------------
/**
- * @see TestCase#TestCase(String)
+ * @see AntTestCase#AntTestCase
*/
- public TestCactusTask(String theTestName)
+ public TestCactusTask()
{
- super(theTestName,
- "org/apache/cactus/integration/ant/test-cactus.xml");
+ super("org/apache/cactus/integration/ant/test-cactus.xml");
}
// TestCase Implementation -------------------------------------------------
1.5 +2 -4 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/AntTestCase.java
Index: AntTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/AntTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AntTestCase.java 12 May 2003 22:47:31 -0000 1.4
+++ AntTestCase.java 26 May 2003 13:27:18 -0000 1.5
@@ -105,12 +105,10 @@
/**
* Constructor
*
- * @param theName The name of the test
* @param theBuildFile The Ant build file corresponding to the test fixture
*/
- public AntTestCase(String theName, String theBuildFile)
+ public AntTestCase(String theBuildFile)
{
- super(theName);
this.buildFile = theBuildFile;
}
1.6 +1 -10 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestAll.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestAll.java 14 May 2003 10:56:45 -0000 1.5
+++ TestAll.java 26 May 2003 13:27:18 -0000 1.6
@@ -69,15 +69,6 @@
*/
public final class TestAll extends TestCase
{
- /**
- * Defines the testcase name for JUnit.
- *
- * @param theName the testcase's name.
- */
- public TestAll(String theName)
- {
- super(theName);
- }
/**
* Start the tests.
1.3 +4 -5 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestRunServerTestsTask.java
Index: TestRunServerTestsTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestRunServerTestsTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRunServerTestsTask.java 12 May 2003 22:48:22 -0000 1.2
+++ TestRunServerTestsTask.java 26 May 2003 13:27:18 -0000 1.3
@@ -71,12 +71,11 @@
// Constructors ------------------------------------------------------------
/**
- * @see TestCase#TestCase(String)
+ * @see AntTestCase#AntTestCase
*/
- public TestRunServerTestsTask(String theTestName)
+ public TestRunServerTestsTask()
{
- super(theTestName,
- "org/apache/cactus/integration/ant/test-runservertests.xml");
+ super("org/apache/cactus/integration/ant/test-runservertests.xml");
}
// TestCase Implementation -------------------------------------------------
1.3 +4 -5 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestContainerSet.java
Index: TestContainerSet.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestContainerSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestContainerSet.java 26 May 2003 09:41:15 -0000 1.2
+++ TestContainerSet.java 26 May 2003 13:27:18 -0000 1.3
@@ -71,12 +71,11 @@
// Constructors ------------------------------------------------------------
/**
- * @see TestCase#TestCase(String)
+ * @see AntTestCase#AntTestCase
*/
- public TestContainerSet(String theTestName)
+ public TestContainerSet()
{
- super(theTestName,
- "org/apache/cactus/integration/ant/test-containerset.xml");
+ super("org/apache/cactus/integration/ant/test-containerset.xml");
}
// TestCase Implementation -------------------------------------------------
1.7 +4 -5 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactifyWarTask.java
Index: TestCactifyWarTask.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestCactifyWarTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestCactifyWarTask.java 14 May 2003 13:09:42 -0000 1.6
+++ TestCactifyWarTask.java 26 May 2003 13:27:18 -0000 1.7
@@ -84,12 +84,11 @@
// Constructors ------------------------------------------------------------
/**
- * @see TestCase#TestCase(String)
+ * @see AntTestCase#AntTestCase
*/
- public TestCactifyWarTask(String theTestName)
+ public TestCactifyWarTask()
{
- super(theTestName,
- "org/apache/cactus/integration/ant/test-cactifywar.xml");
+ super("org/apache/cactus/integration/ant/test-cactifywar.xml");
}
// TestCase Implementation -------------------------------------------------
1.2 +1 -9 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXmlVersion.java
Index: TestWebXmlVersion.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXmlVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWebXmlVersion.java 14 May 2003 10:46:20 -0000 1.1
+++ TestWebXmlVersion.java 26 May 2003 13:27:19 -0000 1.2
@@ -80,14 +80,6 @@
private DOMImplementation domImpl;
/**
- * @see TestCase#TestCase(String)
- */
- public TestWebXmlVersion(String theTestName)
- {
- super(theTestName);
- }
-
- /**
* @see TestCase#setUp
*/
public void setUp() throws ParserConfigurationException
1.3 +3 -11 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestAll.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestAll.java 14 May 2003 10:58:20 -0000 1.2
+++ TestAll.java 26 May 2003 13:27:19 -0000 1.3
@@ -61,7 +61,7 @@
import junit.framework.TestSuite;
/**
- * Run all the unit tests for the web.xml support classes.
+ * Run all the unit tests for the deployment support classes.
*
* @author <a href="mailto:cmlenz@apache.org">Christopher Lenz</a>
*
@@ -69,15 +69,6 @@
*/
public final class TestAll extends TestCase
{
- /**
- * Defines the testcase name for JUnit.
- *
- * @param theName the testcase's name.
- */
- public TestAll(String theName)
- {
- super(theName);
- }
/**
* Start the tests.
@@ -100,6 +91,7 @@
suite.addTestSuite(TestApplicationXml.class);
suite.addTestSuite(TestApplicationXmlVersion.class);
+ suite.addTestSuite(TestJarArchive.class);
suite.addTestSuite(TestWebXml.class);
suite.addTestSuite(TestWebXmlMerger.class);
suite.addTestSuite(TestWebXmlVersion.class);
1.2 +1 -9 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXml.java
Index: TestWebXml.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXml.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWebXml.java 14 May 2003 10:46:20 -0000 1.1
+++ TestWebXml.java 26 May 2003 13:27:19 -0000 1.2
@@ -93,14 +93,6 @@
private DocumentBuilder builder;
/**
- * @see TestCase#TestCase(String)
- */
- public TestWebXml(String theTestName)
- {
- super(theTestName);
- }
-
- /**
* @see TestCase#setUp
*/
public void setUp() throws ParserConfigurationException
1.2 +1 -9 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestApplicationXml.java
Index: TestApplicationXml.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestApplicationXml.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestApplicationXml.java 14 May 2003 10:45:57 -0000 1.1
+++ TestApplicationXml.java 26 May 2003 13:27:19 -0000 1.2
@@ -91,14 +91,6 @@
private DocumentBuilder builder;
/**
- * @see TestCase#TestCase(String)
- */
- public TestApplicationXml(String theTestName)
- {
- super(theTestName);
- }
-
- /**
* @see TestCase#setUp
*/
public void setUp() throws ParserConfigurationException
1.2 +1 -11 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestJarArchive.java
Index: TestJarArchive.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestJarArchive.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestJarArchive.java 21 May 2003 12:40:32 -0000 1.1
+++ TestJarArchive.java 26 May 2003 13:27:19 -0000 1.2
@@ -75,16 +75,6 @@
public final class TestJarArchive extends TestCase
{
- // Constructors ------------------------------------------------------------
-
- /**
- * @see TestCase#TestCase(String)
- */
- public TestJarArchive(String theTestName)
- {
- super(theTestName);
- }
-
// Test Methods ------------------------------------------------------------
/**
1.2 +1 -9 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestApplicationXmlVersion.java
Index: TestApplicationXmlVersion.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestApplicationXmlVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestApplicationXmlVersion.java 14 May 2003 10:58:20 -0000 1.1
+++ TestApplicationXmlVersion.java 26 May 2003 13:27:19 -0000 1.2
@@ -80,14 +80,6 @@
private DOMImplementation domImpl;
/**
- * @see TestCase#TestCase(String)
- */
- public TestApplicationXmlVersion(String theTestName)
- {
- super(theTestName);
- }
-
- /**
* @see TestCase#setUp
*/
public void setUp() throws ParserConfigurationException
1.3 +1 -9 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXmlMerger.java
Index: TestWebXmlMerger.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/deployment/TestWebXmlMerger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWebXmlMerger.java 15 May 2003 20:22:43 -0000 1.2
+++ TestWebXmlMerger.java 26 May 2003 13:27:19 -0000 1.3
@@ -89,14 +89,6 @@
private DocumentBuilder builder;
/**
- * @see TestCase#TestCase(String)
- */
- public TestWebXmlMerger(String theTestName)
- {
- super(theTestName);
- }
-
- /**
* @see TestCase#setUp
*/
public void setUp() throws ParserConfigurationException
1.3 +1 -11 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestContainerRunner.java
Index: TestContainerRunner.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestContainerRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestContainerRunner.java 12 May 2003 09:04:51 -0000 1.2
+++ TestContainerRunner.java 26 May 2003 13:27:20 -0000 1.3
@@ -80,16 +80,6 @@
*/
private MockHttpServer server;
- // Constructors ------------------------------------------------------------
-
- /**
- * @see TestCase#TestCase(String)
- */
- public TestContainerRunner(String theTestName)
- {
- super(theTestName);
- }
-
// TestCase Implementation -------------------------------------------------
/**
1.3 +2 -11 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/container/TestAll.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestAll.java 12 May 2003 09:04:51 -0000 1.2
+++ TestAll.java 26 May 2003 13:27:20 -0000 1.3
@@ -61,7 +61,7 @@
import junit.framework.TestSuite;
/**
- * Run all the unit tests for the web.xml support classes.
+ * Run all the unit tests for the container support classes.
*
* @author <a href="mailto:cmlenz@apache.org">Christopher Lenz</a>
*
@@ -69,15 +69,6 @@
*/
public final class TestAll extends TestCase
{
- /**
- * Defines the testcase name for JUnit.
- *
- * @param theName the testcase's name.
- */
- public TestAll(String theName)
- {
- super(theName);
- }
/**
* Start the tests.
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org