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 vm...@apache.org on 2003/07/12 19:19:28 UTC
cvs commit: jakarta-cactus/framework/src/java/share/org/apache/cactus/server ServletTestCaller.java JspTestCaller.java AbstractWebTestCaller.java
vmassol 2003/07/12 10:19:28
Modified: framework/src/java/j2ee13/org/apache/cactus/server
FilterTestCaller.java
framework/src/java/share/org/apache/cactus/server
ServletTestCaller.java JspTestCaller.java
AbstractWebTestCaller.java
Log:
Fixed bug in during the last refactoring. Pure junit tests can now be executed again successfully on the server side. Still one bug to go...
Revision Changes Path
1.13 +6 -1 jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java
Index: FilterTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestCaller.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FilterTestCaller.java 12 Jul 2003 16:08:13 -0000 1.12
+++ FilterTestCaller.java 12 Jul 2003 17:19:28 -0000 1.13
@@ -92,6 +92,11 @@
protected void setTestCaseFields(TestCase theTestInstance)
throws Exception
{
+ if (!(theTestInstance instanceof FilterTestCase))
+ {
+ return;
+ }
+
FilterTestCase filterInstance = (FilterTestCase) theTestInstance;
FilterImplicitObjects filterImplicitObjects =
(FilterImplicitObjects) this.webImplicitObjects;
1.12 +6 -1 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestCaller.java
Index: ServletTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestCaller.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServletTestCaller.java 12 Jul 2003 16:08:13 -0000 1.11
+++ ServletTestCaller.java 12 Jul 2003 17:19:28 -0000 1.12
@@ -93,6 +93,11 @@
protected void setTestCaseFields(TestCase theTestInstance)
throws Exception
{
+ if (!(theTestInstance instanceof ServletTestCase))
+ {
+ return;
+ }
+
ServletTestCase servletInstance = (ServletTestCase) theTestInstance;
ServletImplicitObjects servletImplicitObjects =
(ServletImplicitObjects) this.webImplicitObjects;
1.12 +6 -1 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestCaller.java
Index: JspTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestCaller.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspTestCaller.java 12 Jul 2003 16:08:13 -0000 1.11
+++ JspTestCaller.java 12 Jul 2003 17:19:28 -0000 1.12
@@ -92,6 +92,11 @@
protected void setTestCaseFields(TestCase theTestInstance)
throws Exception
{
+ if (!(theTestInstance instanceof JspTestCase))
+ {
+ return;
+ }
+
JspTestCase jspInstance = (JspTestCase) theTestInstance;
JspImplicitObjects jspImplicitObjects =
(JspImplicitObjects) this.webImplicitObjects;
1.22 +8 -15 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestCaller.java
Index: AbstractWebTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestCaller.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- AbstractWebTestCaller.java 12 Jul 2003 16:08:13 -0000 1.21
+++ AbstractWebTestCaller.java 12 Jul 2003 17:19:28 -0000 1.22
@@ -63,7 +63,6 @@
import javax.servlet.ServletException;
-import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.cactus.HttpServiceDefinition;
@@ -433,25 +432,19 @@
Constructor wrappedConstructor =
getTestClassConstructor(wrappedTestClass);
- Test wrappedTestInstance;
if (wrappedConstructor.getParameterTypes().length == 0)
{
- wrappedTestInstance =
- (Test) wrappedConstructor.newInstance(
- new Object[0]);
+ testInstance =
+ (TestCase) wrappedConstructor.newInstance(
+ new Object[0]);
+ testInstance.setName(theTestCaseName);
}
else
{
- wrappedTestInstance =
- (Test) wrappedConstructor.newInstance(
+ testInstance =
+ (TestCase) wrappedConstructor.newInstance(
new Object[] {theTestCaseName});
- }
-
- constructor = testClass.getConstructor(
- new Class[] {String.class, Test.class});
-
- testInstance = (TestCase) constructor.newInstance(
- new Object[] {theTestCaseName, wrappedTestInstance});
+ }
}
}
catch (Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org