weaver 2004/05/27 12:55:19
Modified: portal/src/test/org/apache/jetspeed/aggregator
TestAggregator.java TestRenderer.java
Log:
JS2-59 <http://nagoya.apache.org/jira/browse/JS2-59>
Revision Changes Path
1.9 +11 -18
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
Index: TestAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestAggregator.java 25 Mar 2004 21:42:32 -0000 1.8
+++ TestAggregator.java 27 May 2004 19:55:18 -0000 1.9
@@ -16,10 +16,10 @@
package org.apache.jetspeed.aggregator;
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.aggregator.impl.PageAggregatorImpl;
+import org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl;
/**
* <P>Test the aggregation service</P>
@@ -28,9 +28,8 @@
* @version $Id$
*
*/
-public class TestAggregator extends AbstractComponentAwareTestCase
+public class TestAggregator extends TestRenderer
{
- private MutablePicoContainer container;
private PortletAggregator portletAggregator;
private PageAggregator pageAggregator;
@@ -57,22 +56,16 @@
protected void setUp() throws Exception
{
super.setUp();
- container = (MutablePicoContainer) getContainer();
- pageAggregator = (PageAggregator)
container.getComponentInstance(PageAggregator.class);
- portletAggregator = (PortletAggregator)
container.getComponentInstance(PortletAggregator.class);
+
+ pageAggregator = new PageAggregatorImpl(renderer);
+ portletAggregator = new PortletAggregatorImpl(renderer);
+
}
- /**
- * 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(TestAggregator.class);
-
suite.setScript("org/apache/jetspeed/containers/test-aggregator-container.groovy");
- return suite;
+ // All methods starting with "test" will be executed in the test suite.
+ return new TestSuite(TestAggregator.class);
}
public void testBasic() throws Exception
1.2 +10 -14
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java
Index: TestRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRenderer.java 17 Mar 2004 22:23:06 -0000 1.1
+++ TestRenderer.java 27 May 2004 19:55:18 -0000 1.2
@@ -16,12 +16,10 @@
package org.apache.jetspeed.aggregator;
import junit.framework.Test;
+import junit.framework.TestSuite;
-import org.apache.jetspeed.aggregator.PortletRenderer;
-import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
-import org.apache.jetspeed.components.ComponentAwareTestSuite;
-import org.apache.jetspeed.container.TestPortletContainer;
-import org.picocontainer.MutablePicoContainer;
+import org.apache.jetspeed.AbstractPortalContainerTestCase;
+import org.apache.jetspeed.aggregator.impl.PortletRendererImpl;
/**
* TestPortletRenderer
@@ -29,10 +27,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class TestRenderer extends AbstractComponentAwareTestCase
+public class TestRenderer extends AbstractPortalContainerTestCase
{
- private MutablePicoContainer container;
- private PortletRenderer renderer;
+ protected PortletRenderer renderer;
/**
* Defines the testcase name for JUnit.
@@ -57,8 +54,8 @@
protected void setUp() throws Exception
{
super.setUp();
- container = (MutablePicoContainer) getContainer();
- renderer = (PortletRenderer)
container.getComponentInstance(PortletRenderer.class);
+
+ renderer = new PortletRendererImpl(portletContainer, windowAccessor);
}
/**
@@ -69,9 +66,8 @@
*/
public static Test suite()
{
- ComponentAwareTestSuite suite = new
ComponentAwareTestSuite(TestPortletContainer.class);
-
suite.setScript("org/apache/jetspeed/containers/test-renderer-container.groovy");
- return suite;
+ // All methods starting with "test" will be executed in the test suite.
+ return new TestSuite(TestRenderer.class);
}
public void testBasic() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
