[jboss-svn-commits] JBoss Portal SVN: r5295 - in trunk: common/src/main/org/jboss/portal/common core core/src/main/org/jboss/portal/test/core/model/instance core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-09-29 18:00:38 -0400 (Fri, 29 Sep 2006)
New Revision: 5295

Removed:
   trunk/common/src/main/org/jboss/portal/common/plugin/
Modified:
   trunk/core/build.xml
   trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
   trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
Log:
- make InstanceContainer test case run with additional parameter cloneOnCreate={true,false}
- remove obsolete code

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2006-09-29 20:03:39 UTC (rev 5294)
+++ trunk/core/build.xml	2006-09-29 22:00:38 UTC (rev 5295)
@@ -538,21 +538,36 @@
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
 -->
 
-            <sysproperty key="jboss.aop.path"
-                         value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
-            <sysproperty key="jboss.aop.class.path" value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+            <sysproperty
+               key="jboss.aop.path"
+               value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
+            <sysproperty
+               key="jboss.aop.class.path"
+               value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+
          </x-sysproperty>
          <x-test>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-LocalInstanceContainerTestCase">
+               outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="true"/>
+               <parameter name="CloneOnCreate" value="true"/>
             </zest>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-RemoteInstanceContainerTestCase">
+               outfile="TEST-NotPersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="false"/>
+               <parameter name="CloneOnCreate" value="true"/>
             </zest>
-            <!--<test todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase"/>-->
-            <!--<test todir="${test.reports}" name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>-->
+            <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+               outfile="TEST-PersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+               <parameter name="PersistLocally" value="true"/>
+               <parameter name="CloneOnCreate" value="false"/>
+            </zest>
+            <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+               outfile="TEST-NotPersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+               <parameter name="PersistLocally" value="false"/>
+               <parameter name="CloneOnCreate" value="false"/>
+            </zest>
+            <test todir="${test.reports}" name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.lib}/portal-core-lib.jar"/>

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	2006-09-29 20:03:39 UTC (rev 5294)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-09-29 22:00:38 UTC (rev 5295)
@@ -58,7 +58,6 @@
  * Test Case that tests the authorization for instances
  * via the instance container
  *
- * todo : test InstanceContainer with cloneOnCreate=true
  * todo : configure instance with POP
  * todo : configure instance with CCP
  * todo : duplicate instance name
@@ -131,12 +130,16 @@
    {
       dataSourceConfig = (DataSourceSupport.Config)parametrization.get("DataSourceConfig");
       persistLocally = Boolean.valueOf((String)parametrization.get("PersistLocally")).booleanValue();
+      cloneOnCreate = Boolean.valueOf((String)parametrization.get("CloneOnCreate")).booleanValue();
    }
 
    /** . */
    private boolean persistLocally;
 
    /** . */
+   private boolean cloneOnCreate;
+
+   /** . */
    private TestRuntimeContext runtimeContext;
 
    /** . */
@@ -165,14 +168,14 @@
       return super.getName() + ",persistLocally=" + persistLocally + ",ds=" + dataSourceConfig.getDisplayName();
    }
 
-   public boolean getPersistLocally()
+   public boolean getCloneOnCreate()
    {
-      return persistLocally;
+      return cloneOnCreate;
    }
 
-   public void setPersistLocally(boolean persistLocally)
+   public boolean getPersistLocally()
    {
-      this.persistLocally = persistLocally;
+      return persistLocally;
    }
 
    public DataSourceSupport.Config getDataSourceConfig()
@@ -180,11 +183,6 @@
       return dataSourceConfig;
    }
 
-   public void setDataSourceConfig(DataSourceSupport.Config dataSourceConfig)
-   {
-      this.dataSourceConfig = dataSourceConfig;
-   }
-
    public HibernateSupport getInstanceHibernateSupport()
    {
       return instanceHibernateSupport;

Modified: trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
===================================================================
--- trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-09-29 20:03:39 UTC (rev 5294)
+++ trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-09-29 22:00:38 UTC (rev 5295)
@@ -74,7 +74,7 @@
    <bean name="StackFactory" class="org.jboss.portal.common.invocation.EmptyInterceptorStackFactory">
    </bean>
    <bean name="InstanceContainer" class="org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer">
-      <property name="cloneOnCreate">false</property>
+      <property name="cloneOnCreate"><inject bean="TestCaseConfig" property="cloneOnCreate"/></property>
       <property name="portletInvoker"><inject bean="Producer"/></property>
       <property name="sessionFactoryJNDIName">java:/InstanceSessionFactory</property>
       <property name="stackFactory"><inject bean="StackFactory"/></property>