Author: ptahchiev
Date: Sat Apr 12 04:18:08 2008
New Revision: 647427
URL: http://svn.apache.org/viewvc?rev=647427&view=rev
Log:
Committed changes in the WebappTestSuiteLoader.java to make it work with JUNit4.
Modified:
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java
Modified:
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java?rev=647427&r1=647426&r2=647427&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java
(original)
+++
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestRunner.java
Sat Apr 12 04:18:08 2008
@@ -23,7 +23,6 @@
import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.runner.BaseTestRunner;
-import junit.runner.TestSuiteLoader;
/**
* JUnit Test Runner that can load test cases that are in the classpath of
@@ -46,9 +45,18 @@
* @return a loader that loads classes using the context class loader or
* the webapp class loader.
*/
- public TestSuiteLoader getLoader()
+ //public TestSuiteLoader getLoader()
+ //{
+ // return new WebappTestSuiteLoader();
+ //}
+ /**
+ * Returns the loaded Class for a suite name.
+ */
+ public Class loadSuiteClass(String theSuiteClassName)
+ throws ClassNotFoundException
{
- return new WebappTestSuiteLoader();
+ WebappTestSuiteLoader loader = new WebappTestSuiteLoader();
+ return loader.load(theSuiteClassName);
}
/**
Modified:
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java?rev=647427&r1=647426&r2=647427&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java
(original)
+++
jakarta/cactus/trunk/framework/framework-12-13-14/src/main/java/org/apache/cactus/internal/server/runner/WebappTestSuiteLoader.java
Sat Apr 12 04:18:08 2008
@@ -20,8 +20,6 @@
*/
package org.apache.cactus.internal.server.runner;
-import junit.runner.TestSuiteLoader;
-
import org.apache.cactus.internal.util.ClassLoaderUtils;
/**
@@ -29,7 +27,7 @@
*
* @version $Id: WebappTestSuiteLoader.java 238991 2004-05-22 11:34:50Z
vmassol $
*/
-public class WebappTestSuiteLoader implements TestSuiteLoader
+public class WebappTestSuiteLoader
{
/**
* Try to load the test suite class using both the context class loader
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
