Author: chris.laprun(a)jboss.com Date: 2007-06-08 09:50:21 -0400 (Fri, 08 Jun 2007) New Revision: 7394 Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java trunk/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java Log: - Improved AbstractPortalTestCase setUp (to be more flexible) and tearDown (to properly end any still living transactions) methods. - InstanceContainerTestCase now extends AbstractPortalTestCase. Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-06-08 09:26:42 UTC (rev 7393) +++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-06-08 13:50:21 UTC (rev 7394) @@ -29,30 +29,23 @@ */ package org.jboss.portal.test.core.model.instance; -import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.log4j.Appender; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import org.hibernate.Session; import org.jboss.portal.Mode; -import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.common.junit.TransactionAssert; import org.jboss.portal.common.util.CollectionBuilder; import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.test.junit.POJOJUnitTest; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl; -import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; import org.jboss.portal.core.impl.model.instance.AbstractInstanceCustomization; +import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; +import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl; import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; +import org.jboss.portal.core.model.instance.DuplicateInstanceException; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceDefinition; -import org.jboss.portal.core.model.instance.DuplicateInstanceException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; @@ -64,23 +57,24 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.AbstractPropertyContext; import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.portlet.test.ActionContextImpl; import org.jboss.portal.portlet.test.UserContextImpl; import org.jboss.portal.portlet.test.ValueMapAssert; import org.jboss.portal.portlet.test.support.PortletInvokerSupport; import org.jboss.portal.portlet.test.support.PortletSupport; +import org.jboss.portal.security.RoleSecurityBinding; +import org.jboss.portal.security.spi.provider.DomainConfigurator; +import org.jboss.portal.test.framework.AbstractPortalTestCase; import org.jboss.portal.test.framework.TestRuntimeContext; -import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; -import java.net.URL; -import java.util.Set; -import java.util.Collections; import java.util.Collection; +import java.util.Collections; +import java.util.Set; /** * Test Case that tests the authorization for instances via the instance container @@ -93,7 +87,7 @@ * @version $Revision$ * @since Apr 4, 2006 */ -public class InstanceContainerTestCase extends TestCase +public class InstanceContainerTestCase extends AbstractPortalTestCase { static @@ -106,14 +100,7 @@ public static TestSuite suite() throws Exception { - TestParametrization parametrization = JUnitAdapter.getParametrization(); - URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml"); - parametrization.setParameterValue("DataSourceConfig", DataSourceSupport.Config.fromXML2(configsURL)); - POJOJUnitTest abc = new POJOJUnitTest(InstanceContainerTestCase.class); - JUnitAdapter adapter = new JUnitAdapter(abc, parametrization); - TestSuite suite = new TestSuite(); - suite.addTest(adapter); - return suite; + return AbstractPortalTestCase.suite(InstanceContainerTestCase.class); } private class TestPortletSupport extends PortletSupport @@ -161,12 +148,6 @@ private boolean cacheNaturalId; /** . */ - private DataSourceSupport.Config dataSourceConfigParameter; - - /** . */ - private TestRuntimeContext runtimeContext; - - /** . */ private HibernateSupport instanceHibernateSupport; /** . */ @@ -189,7 +170,7 @@ public String getName() { - return super.getName() + ",persistLocally=" + persistLocally + ",cacheNaturalId=" + cacheNaturalId + ",cloneOnCreate=" + cloneOnCreate + ",ds=" + dataSourceConfigParameter.getName() + ",config=" + config; + return super.getName() + ",persistLocally=" + persistLocally + ",cacheNaturalId=" + cacheNaturalId + ",cloneOnCreate=" + cloneOnCreate; } public String getPersistLocallyParameter() @@ -222,16 +203,6 @@ this.cacheNaturalId = Boolean.valueOf(cacheNaturalIdParameter).booleanValue(); } - public DataSourceSupport.Config getDataSourceConfigParameter() - { - return dataSourceConfigParameter; - } - - public void setDataSourceConfigParameter(DataSourceSupport.Config dataSourceConfigParameter) - { - this.dataSourceConfigParameter = dataSourceConfigParameter; - } - public String getConfigParameter() { return config; @@ -257,16 +228,6 @@ return cacheNaturalId; } - public TestRuntimeContext getRuntimeContext() - { - return runtimeContext; - } - - public void setRuntimeContext(TestRuntimeContext runtimeContext) - { - this.runtimeContext = runtimeContext; - } - public HibernateSupport getInstanceHibernateSupport() { return instanceHibernateSupport; @@ -327,23 +288,14 @@ this.portletContainer = portletContainer; } - public void setUp() throws Exception + protected void configureRuntimeContext(TestRuntimeContext runtimeContext) { - runtimeContext = new TestRuntimeContext("org/jboss/portal/test/core/model/instance/" + config); runtimeContext.addBean("TestCaseConfig", this); - runtimeContext.addBean("TestBean", this); - runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter); - runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName())); - runtimeContext.start(); } - public void tearDown() throws Exception + protected String getConfigLocationPrefix() { - // Cleanup any pending transaction - TransactionAssert.endTransaction(); - - // - runtimeContext.stop(); + return "org/jboss/portal/test/core/model/instance/"; } public void testConfigureInstance() throws Exception Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java 2007-06-08 09:26:42 UTC (rev 7393) +++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java 2007-06-08 13:50:21 UTC (rev 7394) @@ -23,9 +23,6 @@ package org.jboss.portal.test.core.model.portal; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.common.test.TestParameterValue; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; @@ -47,19 +44,11 @@ /** . */ protected PortalAuthorizationManagerFactory authorizationManagerFactory; - public String getName() + protected String getConfigLocationPrefix() { - TestParametrization parametrization = JUnitAdapter.getParametrization(); - return super.getName() + ",ds=" + dataSourceConfigParameter.getName() + ",Config=" + parametrization.getParameterValue("Config").get(); + return "org/jboss/portal/test/core/model/portal/"; } - protected String getConfigLocation() - { - TestParametrization parametrization = JUnitAdapter.getParametrization(); - TestParameterValue paramValue = parametrization.getParameterValue("Config"); - return "org/jboss/portal/test/core/model/portal/" + paramValue.get(); - } - public PortalObjectContainer getPortalObjectContainer() { return container; Modified: trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-06-08 09:26:42 UTC (rev 7393) +++ trunk/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-06-08 13:50:21 UTC (rev 7394) @@ -30,6 +30,8 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; +import org.jboss.portal.common.junit.TransactionAssert; +import org.jboss.portal.common.test.TestParameterValue; import org.jboss.portal.common.test.TestParametrization; import org.jboss.portal.common.test.junit.JUnitAdapter; import org.jboss.portal.common.test.junit.POJOJUnitTest; @@ -83,7 +85,7 @@ public String getName() { - return super.getName() + ",ds=" + dataSourceConfigParameter.getName(); + return super.getName() + ",ds=" + dataSourceConfigParameter.getName() + ",Config=" + getConfigParamValue(); } protected void setUp() throws Exception @@ -92,17 +94,41 @@ runtimeContext.addBean("TestBean", this); runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter); runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName())); + configureRuntimeContext(runtimeContext); runtimeContext.start(); } + /** + * Allows sub-classes to further configure the TestRuntimeContext created in setUp. Default implementation doesn't do + * anything. + * + * @param runtimeContext + */ + protected void configureRuntimeContext(TestRuntimeContext runtimeContext) + { + // null implementation + } + protected void tearDown() throws Exception { + // clean up any pending transaction + TransactionAssert.endTransaction(); + runtimeContext.stop(); } - /** Override to provide the location of the microcontainer xml */ - protected abstract String getConfigLocation(); + protected String getConfigLocation() + { + return getConfigLocationPrefix() + getConfigParamValue(); + } + protected Object getConfigParamValue() + { + TestParametrization parametrization = JUnitAdapter.getParametrization(); + TestParameterValue paramValue = parametrization.getParameterValue("Config"); + return paramValue.get(); + } + public static TestSuite suite(Class testClass) throws Exception { TestParametrization parametrization = JUnitAdapter.getParametrization(); @@ -114,4 +140,6 @@ suite.addTest(adapter); return suite; } + + protected abstract String getConfigLocationPrefix(); } Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2007-06-08 09:26:42 UTC (rev 7393) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ConsumerRegistryTestCase.java 2007-06-08 13:50:21 UTC (rev 7394) @@ -25,9 +25,6 @@ import junit.framework.TestSuite; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.common.test.TestParameterValue; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; import org.jboss.portal.test.framework.AbstractPortalTestCase; import org.jboss.portal.wsrp.WSRPConsumer; import org.jboss.portal.wsrp.consumer.ConsumerException; @@ -51,11 +48,9 @@ return AbstractPortalTestCase.suite(ConsumerRegistryTestCase.class); } - protected String getConfigLocation() + protected String getConfigLocationPrefix() { - TestParametrization parametrization = JUnitAdapter.getParametrization(); - TestParameterValue paramValue = parametrization.getParameterValue("Config"); - return "org/jboss/portal/test/wsrp/consumer/" + paramValue.get(); + return "org/jboss/portal/test/wsrp/consumer/"; } public ConsumerRegistry getRegistry() @@ -116,6 +111,10 @@ assertEquals(1, consumers.size()); assertTrue(consumers.contains(consumer)); TransactionAssert.commitTransaction(); + } + public void testPersist() + { +// registry.persistConsumer(); } }