weaver 2004/05/27 12:55:39
Modified: portal/src/test/org/apache/jetspeed/capabilities
TestCapability.java
Log:
JS2-59 <http://nagoya.apache.org/jira/browse/JS2-59>
Revision Changes Path
1.2 +10 -26
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/capabilities/TestCapability.java
Index: TestCapability.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/capabilities/TestCapability.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCapability.java 25 May 2004 01:37:12 -0000 1.1
+++ TestCapability.java 27 May 2004 19:55:39 -0000 1.2
@@ -19,10 +19,10 @@
import java.util.Iterator;
import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
-import org.picocontainer.MutablePicoContainer;
+import org.apache.jetspeed.capabilities.impl.JetspeedCapabilities;
+import
org.apache.jetspeed.components.persistence.store.util.PersistenceSupportedTestCase;
/**
* Test Capability Service
@@ -30,19 +30,10 @@
* @author <a href="[EMAIL PROTECTED]">Roger Ruttimann</a>
* @version $Id$
*/
-public class TestCapability extends AbstractComponentAwareTestCase
+public class TestCapability extends PersistenceSupportedTestCase
{
private Capabilities capabilities = null;
- private MutablePicoContainer container;
-
- /**
- * @see
org.apache.jetspeed.test.JetspeedTest#overrideProperties(org.apache.commons.configuration.Configuration)
- */
-// public void overrideProperties(Configuration properties)
-// {
-// super.overrideProperties(properties);
-// }
-
+
/**
* Defines the testcase name for JUnit.
*
@@ -68,21 +59,14 @@
protected void setUp() throws Exception
{
super.setUp();
- container = (MutablePicoContainer) getContainer();
- capabilities = (Capabilities)
container.getComponentInstance(Capabilities.class);
+
+ capabilities = new JetspeedCapabilities(persistenceStore);
}
- /**
- * Creates the test suite.
- *
- * @return a test suite (<code>TestSuite</code>) that includes all methods
- * starting with "test"
- */
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestCapability.class);
-
suite.setScript("org/apache/jetspeed/capabilities/containers/capability-container.groovy");
- return suite;
+ // All methods starting with "test" will be executed in the test suite.
+ return new TestSuite(TestCapability.class);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
