You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/07/20 15:56:34 UTC
cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine TestSpringEngine.java AbstractEngineTest.java TestEngine.java
weaver 2004/07/20 06:56:34
Modified: portal/src/test/org/apache/jetspeed/engine TestEngine.java
Added: portal/src/test/org/apache/jetspeed/engine
TestSpringEngine.java AbstractEngineTest.java
Log:
Multiple Engine tests.
Revision Changes Path
1.5 +11 -45 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestEngine.java 23 Jun 2004 18:43:15 -0000 1.4
+++ TestEngine.java 20 Jul 2004 13:56:34 -0000 1.5
@@ -6,32 +6,23 @@
*/
package org.apache.jetspeed.engine;
-import java.io.FileInputStream;
-
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.jetspeed.Jetspeed;
-import org.picocontainer.PicoContainer;
/**
* @author <a href="mailto:sweaver@einnovation.com">Scott T. Weaver</a>
*
*/
-public class TestEngine extends TestCase
+public class TestEngine extends AbstractEngineTest
{
- protected Engine engine;
-
/**
*
*/
public TestEngine()
{
super();
- // TODO Auto-generated constructor stub
}
/**
@@ -40,7 +31,6 @@
public TestEngine( String arg0 )
{
super(arg0);
- // TODO Auto-generated constructor stub
}
public static Test suite()
@@ -48,41 +38,17 @@
// All methods starting with "test" will be executed in the test suite.
return new TestSuite(TestEngine.class);
}
-
- public void testEngine() throws Exception
- {
- assertNotNull(engine.getComponentManager());
- assertNotNull(engine.getComponentManager().getRootContainer());
- }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- // need to flag internal JNDI on...
- System.setProperty("portal.use.internal.jndi", "true");
- PropertiesConfiguration config = new PropertiesConfiguration();
- config.load(new FileInputStream("./src/webapp/WEB-INF/conf/jetspeed.properties"));
- engine = Jetspeed.createEngine(config, "./src/webapp", null);
-
- }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
+ /**
+ * <p>
+ * getEngineClass
+ * </p>
+ *
+ * @see org.apache.jetspeed.engine.AbstractEngineTest#getEngineClass()
+ * @return
*/
- protected void tearDown() throws Exception
- {
-
- 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]));
- }
+ protected Class getEngineClass()
+ {
+ return PicoEngine.class;
}
}
1.1 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/TestSpringEngine.java
Index: TestSpringEngine.java
===================================================================
/*
* Created on Jul 16, 2004
*
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.jetspeed.engine;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.jetspeed.aggregator.PageAggregator;
import org.apache.jetspeed.aggregator.PortletAggregator;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.capabilities.Capabilities;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.prefs.PreferencesProvider;
import org.apache.jetspeed.prefs.PropertyManager;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContextComponent;
import org.apache.jetspeed.security.GroupManager;
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityProvider;
import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.security.impl.RdbmsPolicy;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.userinfo.UserInfoManager;
/**
* <p>
* TestSpringEngine
* </p>
* <p>
*
* </p>
*
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
* @version $Id: TestSpringEngine.java,v 1.1 2004/07/20 13:56:34 weaver Exp $
*
*/
public class TestSpringEngine extends AbstractEngineTest
{
public TestSpringEngine()
{
System.out.println(System.getProperty("org.apache.jetspeed.database.user"));
keysToCheck = new Object[] {"IdGenerator", "DecorationLocator", "TemplateLocator", "IdGenerator", "PageFileCache", PageManager.class,
PersistenceStore.class, PortletRegistryComponent.class, PortletEntityAccessComponent.class, "PortalServices",
Profiler.class, Capabilities.class, PropertyManager.class, PreferencesProvider.class, UserManager.class,
GroupManager.class, RoleManager.class, PermissionManager.class, RdbmsPolicy.class, SecurityProvider.class,
UserInfoManager.class, NavigationalStateComponent.class, RequestContextComponent.class, PortletWindowAccessor.class,
PortletRenderer.class, PageAggregator.class, PortletAggregator.class, ApplicationServerManager.class, "PAM",
"deploymentManager"};
}
public static Test suite()
{
// All methods starting with "test" will be executed in the test suite.
return new TestSuite(TestSpringEngine.class);
}
/**
* <p>
* getEngineClass
* </p>
*
* @see org.apache.jetspeed.engine.AbstractEngineTest#getEngineClass()
* @return
*/
protected Class getEngineClass()
{
return SpringEngine.class;
}
}
1.1 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/AbstractEngineTest.java
Index: AbstractEngineTest.java
===================================================================
/*
* Created on Jul 16, 2004
*
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.jetspeed.engine;
import java.io.FileInputStream;
import junit.framework.TestCase;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.ComponentManagement;
/**
* <p>
* AbstractEngineTest
* </p>
* <p>
*
* </p>
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
* @version $Id: AbstractEngineTest.java,v 1.1 2004/07/20 13:56:34 weaver Exp $
*
*/
public abstract class AbstractEngineTest extends TestCase
{
/**
*
*/
public AbstractEngineTest()
{
super();
}
/**
* @param arg0
*/
public AbstractEngineTest( String arg0 )
{
super(arg0);
}
protected Engine engine;
protected Object[] keysToCheck;
public void testEngine() throws Exception
{
assertNotNull(engine.getComponentManager());
assertNotNull(engine.getComponentManager().getRootContainer());
if(keysToCheck != null)
{
verifyComponents(keysToCheck);
}
}
protected void setUp() throws Exception
{
super.setUp();
// need to flag internal JNDI on...
System.setProperty("portal.use.internal.jndi", "true");
PropertiesConfiguration config = new PropertiesConfiguration();
config.load(new FileInputStream("./src/webapp/WEB-INF/conf/jetspeed.properties"));
engine = Jetspeed.createEngine(config, "./src/webapp", null, getEngineClass());
}
protected void tearDown() throws Exception
{
super.tearDown();
}
protected void verifyComponents( Object[] keys )
{
ComponentManagement cm = engine.getComponentManager();
for(int i=0; i < keys.length; i++)
{
assertNotNull("Could not get component insatance "+keys[i], cm.getComponent(keys[i]));
System.out.println("Load componenet "+cm.getComponent(keys[i]).getClass()+" for key "+keys[i]);
}
}
protected abstract Class getEngineClass();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org