weaver 2004/06/23 11:43:15
Modified: portal/src/test/org/apache/jetspeed/engine TestEngine.java
Log:
changed due to refactoring of the component manager
Revision Changes Path
1.4 +8 -15
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/TestEngine.java
Index: TestEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/TestEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestEngine.java 21 Jun 2004 19:05:26 -0000 1.3
+++ TestEngine.java 23 Jun 2004 18:43:15 -0000 1.4
@@ -6,7 +6,6 @@
*/
package org.apache.jetspeed.engine;
-import java.io.File;
import java.io.FileInputStream;
import junit.framework.Test;
@@ -15,11 +14,7 @@
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.Jetspeed;
-import org.nanocontainer.NanoContainer;
-import org.nanocontainer.script.ScriptedContainerBuilder;
import org.picocontainer.PicoContainer;
-import org.picocontainer.defaults.ObjectReference;
-import org.picocontainer.defaults.SimpleReference;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
@@ -28,8 +23,8 @@
public class TestEngine extends TestCase
{
- protected ScriptedContainerBuilder scriptBuilder;
- protected PicoContainer container;
+ protected Engine engine;
+
/**
*
*/
@@ -56,7 +51,8 @@
public void testEngine() throws Exception
{
- assertNotNull(container);
+ assertNotNull(engine.getComponentManager());
+ assertNotNull(engine.getComponentManager().getRootContainer());
}
/* (non-Javadoc)
@@ -69,24 +65,21 @@
System.setProperty("portal.use.internal.jndi", "true");
PropertiesConfiguration config = new PropertiesConfiguration();
config.load(new
FileInputStream("./src/webapp/WEB-INF/conf/jetspeed.properties"));
- Jetspeed.createEngine(config, "./src/webapp", null);
- NanoContainer nano = new NanoContainer(new
File("./src/webapp/WEB-INF/assembly/jetspeed.groovy"));
- scriptBuilder = nano.getContainerBuilder();
- ObjectReference containerRef = new SimpleReference();
- scriptBuilder.buildContainer(containerRef, null, "jetspeed");
- container = (PicoContainer) containerRef.get();
+ engine = Jetspeed.createEngine(config, "./src/webapp", null);
+
}
/* (non-Javadoc)
* @see junit.framework.TestCase#tearDown()
*/
protected void tearDown() throws Exception
{
- container.stop();
+
super.tearDown();
}
protected void verifyComponents(Object[] keys)
{
+ PicoContainer container = engine.getComponentManager().getRootContainer();
for(int i=0; i < keys.length; i++)
{
assertNotNull("Could not get component insatance "+keys[i],
container.getComponentInstance(keys[i]));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
