Author: chris.laprun(a)jboss.com Date: 2007-07-09 19:50:46 -0400 (Mon, 09 Jul 2007) New Revision: 7698 Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java Log: - JBPORTAL-1541: Added regression test. - Fixed output file for PortalNodeTestCase. Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-09 23:47:09 UTC (rev 7697) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-09 23:50:46 UTC (rev 7698) @@ -113,8 +113,8 @@ <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> - <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <!-- jbpm integration --> + <path refid="jbpm.jaronly.classpath"/> </path> <!-- Configure modules --> @@ -161,11 +161,11 @@ <path refid="ehcache.ehcache.classpath"/> <path refid="hibernate.hibernate.classpath"/> </path> - + <path id="aop.classpath"> <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> - <path refid="javassist.javassist.classpath"/> + <path refid="javassist.javassist.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> @@ -179,7 +179,7 @@ classpathref="explode.task.classpath"/> </target> - + <target name="configure-explode"> <path id="explode.task.classpath"> <pathelement location="${project.tools}/lib/explode.jar"/> @@ -190,7 +190,7 @@ classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/> </target> - + <target name="configure-jbossaop"> <path id="jbossaop.task.classpath"> <path refid="jboss.aop.classpath"/> @@ -224,7 +224,7 @@ <path id="bilto"> <path refid="sun.servlet.classpath"/> <path refid="apache.log4j.classpath"/> - <path refid="jbossas/core.libs.classpath"/> + <path refid="jbossas/core.libs.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.serialization.classpath"/> <path refid="beanshell.beanshell.classpath"/> @@ -249,7 +249,7 @@ <aoppath path="${source.etc}/jboss-aop/base-aop.xml"/> <include name="org/jboss/portal/core/aspects/server/TransactionInterceptor.class"/> <include name="org/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer.class"/> - <include name="org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class"/> + <include name="org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class"/> <include name="org/jboss/portal/core/deployment/jboss/ObjectDeployment.class"/> <include name="org/jboss/portal/core/deployment/jboss/PortletAppDeployment.class"/> <include name="org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.class"/> @@ -350,8 +350,8 @@ </copy> </target> - - + + <target name="explode" depends="init"> <explode file="${build.lib}/jboss-portal.sar" @@ -365,37 +365,37 @@ <copy todir="${build.resources}/jboss-portal-ha.sar"> <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> </copy> - + <copy todir="${build.resources}/jboss-portal-ha.sar"> <filterset> <filtersfile file="../build/etc/clustered.properties"/> </filterset> <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> - </copy> - + </copy> + <implode dir="${build.resources}/jboss-portal-ha.sar" tofile="${build.lib}/jboss-portal-ha.sar"/> - + </target> <!-- Build the jboss-portal.sar --> - <target name="output" depends="artifacts"> + <target name="output" depends="artifacts"> <!-- Build configurations --> - <copy todir="${build.resources}/jboss-portal.sar"> + <copy todir="${build.resources}/jboss-portal.sar"> <fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/> </copy> - + <copy todir="${build.resources}/jboss-portal.sar"> <filterset> <filtersfile file="../build/etc/single.properties"/> </filterset> <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> </copy> - <!-- Build archives --> - <implode - dir="${build.resources}/jboss-portal.sar" - tofile="${build.lib}/jboss-portal.sar"/> + <!-- Build archives --> + <implode + dir="${build.resources}/jboss-portal.sar" + tofile="${build.lib}/jboss-portal.sar"/> </target> <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> @@ -508,7 +508,7 @@ <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="${build.lib}/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> - + <target name="deploy-ha" description="Deploy high availability." depends="output-ha"> @@ -525,7 +525,7 @@ <require file="${jboss.home}/server/${portal.deploy.dir}"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> </target> - + <target name="undeploy-ha" description="Undeploy." depends="init"> @@ -556,29 +556,29 @@ </x-sysproperty> <x-test> <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase" - outfile="TEST-PortalObjectContainerTestCase"> + outfile="TEST-PortalNodeTestCase"> <parameter name="CacheNaturalId" value="true"/> <parameter name="Config" value="persistent-jboss-beans.xml"/> </zest> -<!-- - <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase" - outfile="TEST-PortalObjectContainerTestCase"> - <parameter name="CacheNaturalId" value="true"/> - <parameter name="Config" value="transient-jboss-beans.xml"/> - </zest> ---> + <!-- + <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase" + outfile="TEST-PortalObjectContainerTestCase"> + <parameter name="CacheNaturalId" value="true"/> + <parameter name="Config" value="transient-jboss-beans.xml"/> + </zest> + --> <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase" outfile="TEST-PortalObjectContainerTestCase"> <parameter name="CacheNaturalId" value="true"/> <parameter name="Config" value="persistent-jboss-beans.xml"/> </zest> -<!-- - <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase" - outfile="TEST-PortalObjectContainerTestCase"> - <parameter name="CacheNaturalId" value="true"/> - <parameter name="Config" value="transient-jboss-beans.xml"/> - </zest> ---> + <!-- + <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase" + outfile="TEST-PortalObjectContainerTestCase"> + <parameter name="CacheNaturalId" value="true"/> + <parameter name="Config" value="transient-jboss-beans.xml"/> + </zest> + --> <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase" outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase"> <parameter name="PersistLocally" value="true"/> @@ -608,15 +608,15 @@ <parameter name="Config" value="persistent-jboss-beans.xml"/> </zest> -<!-- - <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase" - outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase"> - <parameter name="PersistLocally" value="true"/> - <parameter name="CloneOnCreate" value="true"/> - <parameter name="CacheNaturalId" value="true"/> - <parameter name="Config" value="transient-jboss-beans.xml"/> - </zest> ---> + <!-- + <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase" + outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase"> + <parameter name="PersistLocally" value="true"/> + <parameter name="CloneOnCreate" value="true"/> + <parameter name="CacheNaturalId" value="true"/> + <parameter name="Config" value="transient-jboss-beans.xml"/> + </zest> + --> <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase" outfile="TEST-ProducerTestCase-WithoutRegistration"> <parameter name="UseRegistration" value="false"/> @@ -674,16 +674,16 @@ ant -Dtest=org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase one-test --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> - <property name="build.testlog" value="${module.output}/log"/> + <property name="build.testlog" value="${module.output}/log"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - - <junit printsummary="yes" showoutput="yes" dir="${module.output}"> + + <junit printsummary="yes" showoutput="yes" dir="${module.output}"> <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /--> <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="build.resources" value="${build.resources}"/> + <sysproperty key="build.resources" value="${build.resources}"/> <classpath> <path refid="apache.xerces.classpath"/> @@ -708,7 +708,7 @@ </classpath> - <formatter type="plain" usefile="true"/> + <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> <test todir="${test.reports}" name="${test}" fork="true"/> @@ -728,21 +728,21 @@ </target> <!-- - Some convenience build targets to help deployment during development + Some convenience build targets to help deployment during development --> - <target name="deploy-explode" depends="output,explode"> + <target name="deploy-explode" depends="output,explode"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar" overwrite="true"> <fileset dir="${build.lib}/jboss-portal-exploded.sar"/> </copy> - </target> + </target> <target name="explode-ha" depends="init"> <explode - file="${build.lib}/jboss-portal-ha.sar" - todir="${build.lib}" - name="jboss-portal-ha-exploded.sar" - /> - </target> + file="${build.lib}/jboss-portal-ha.sar" + todir="${build.lib}" + name="jboss-portal-ha-exploded.sar" + /> + </target> <target name="deploy-ha-explode" description="Deploy high availability." depends="output-ha,explode-ha"> <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true"> Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-09 23:47:09 UTC (rev 7697) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-09 23:50:46 UTC (rev 7698) @@ -29,6 +29,7 @@ import org.jboss.portal.common.util.CollectionBuilder; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.handler.ContentState; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalContainer; @@ -39,7 +40,11 @@ import org.jboss.portal.test.core.model.content.SimpleContent; import org.jboss.portal.test.framework.AbstractPortalTestCase; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; /** * Portal Object Container Test Cases based on the microcontainer architecture @@ -65,100 +70,104 @@ TransactionAssert.commitTransaction(); } - /** - * - */ public void testPropertyUpdateCascadeToDescendantsWhenTheyDoNotDeclareIt() throws Exception { - TransactionAssert.beginTransaction(); - PortalContainer ctx = container.getContext(); - Portal n1 = ctx.createPortal("default"); - Page n2 = n1.createPage("default"); - Page n3 = n2.createPage("default"); - Map p1 = n1.getProperties(); - Map p2 = n2.getProperties(); - Map p3 = n3.getProperties(); + TransactionAssert.beginTransaction(); + PortalContainer ctx = container.getContext(); + Portal n1 = ctx.createPortal("default"); + Page n2 = n1.createPage("default"); + Page n3 = n2.createPage("default"); + Map p1 = n1.getProperties(); + Map p2 = n2.getProperties(); + Map p3 = n3.getProperties(); - // - n1.setDeclaredProperty("foo", "bar1"); - assertEquals("bar1", p1.get("foo")); - assertEquals("bar1", p2.get("foo")); - assertEquals("bar1", p3.get("foo")); + // + n1.setDeclaredProperty("foo", "bar1"); + assertEquals("bar1", p1.get("foo")); + assertEquals("bar1", p2.get("foo")); + assertEquals("bar1", p3.get("foo")); - // - n2.setDeclaredProperty("foo", "bar2"); - assertEquals("bar1", p1.get("foo")); - assertEquals("bar2", p2.get("foo")); - assertEquals("bar2", p3.get("foo")); + // + n2.setDeclaredProperty("foo", "bar2"); + assertEquals("bar1", p1.get("foo")); + assertEquals("bar2", p2.get("foo")); + assertEquals("bar2", p3.get("foo")); - TransactionAssert.commitTransaction(); + TransactionAssert.commitTransaction(); } - /** - * - */ - public void testPropertyUpdateDoesNotCascadeToDescendantsWhenTheyDeclareIt() throws Exception - { - TransactionAssert.beginTransaction(); - PortalContainer ctx = container.getContext(); - Portal n1 = ctx.createPortal("default"); - Page n2 = n1.createPage("default"); - Page n3 = n2.createPage("default"); - Map p1 = n1.getProperties(); - Map p2 = n2.getProperties(); - Map p3 = n3.getProperties(); + public void testPropertyUpdateDoesNotCascadeToDescendantsWhenTheyDeclareIt() throws Exception + { + TransactionAssert.beginTransaction(); + PortalContainer ctx = container.getContext(); + Portal n1 = ctx.createPortal("default"); + Page n2 = n1.createPage("default"); + Page n3 = n2.createPage("default"); + Map p1 = n1.getProperties(); + Map p2 = n2.getProperties(); + Map p3 = n3.getProperties(); - // - n2.setDeclaredProperty("foo", "bar1"); - assertEquals(null, p1.get("foo")); - assertEquals("bar1", p2.get("foo")); - assertEquals("bar1", p3.get("foo")); + // + n2.setDeclaredProperty("foo", "bar1"); + assertEquals(null, p1.get("foo")); + assertEquals("bar1", p2.get("foo")); + assertEquals("bar1", p3.get("foo")); - // - n1.setDeclaredProperty("foo", "bar2"); - assertEquals("bar2", p1.get("foo")); - assertEquals("bar1", p2.get("foo")); - assertEquals("bar1", p3.get("foo")); + // + n1.setDeclaredProperty("foo", "bar2"); + assertEquals("bar2", p1.get("foo")); + assertEquals("bar1", p2.get("foo")); + assertEquals("bar1", p3.get("foo")); - // - TransactionAssert.commitTransaction(); - } + // + TransactionAssert.commitTransaction(); + } - /** - * - */ - public void testOverridenPropertyRemovalPropagateParentValueToDescendants() throws Exception - { - TransactionAssert.beginTransaction(); - PortalContainer ctx = container.getContext(); - Portal n1 = ctx.createPortal("default"); - Page n2 = n1.createPage("default"); - Page n3 = n2.createPage("default"); - Map p1 = n1.getProperties(); - Map p2 = n2.getProperties(); - Map p3 = n3.getProperties(); + public void testOverridenPropertyRemovalPropagateParentValueToDescendants() throws Exception + { + TransactionAssert.beginTransaction(); + PortalContainer ctx = container.getContext(); + Portal n1 = ctx.createPortal("default"); + Page n2 = n1.createPage("default"); + Page n3 = n2.createPage("default"); + Map p1 = n1.getProperties(); + Map p2 = n2.getProperties(); + Map p3 = n3.getProperties(); - // - n1.setDeclaredProperty("foo", "bar1"); - n2.setDeclaredProperty("foo", "bar2"); - assertEquals("bar1", p1.get("foo")); - assertEquals("bar2", p2.get("foo")); - assertEquals("bar2", p3.get("foo")); + // + n1.setDeclaredProperty("foo", "bar1"); + n2.setDeclaredProperty("foo", "bar2"); + assertEquals("bar1", p1.get("foo")); + assertEquals("bar2", p2.get("foo")); + assertEquals("bar2", p3.get("foo")); - // - n2.setDeclaredProperty("foo", null); - assertEquals("bar1", p1.get("foo")); - assertEquals("bar1", p2.get("foo")); - assertEquals("bar1", p3.get("foo")); + // + n2.setDeclaredProperty("foo", null); + assertEquals("bar1", p1.get("foo")); + assertEquals("bar1", p2.get("foo")); + assertEquals("bar1", p3.get("foo")); - // - TransactionAssert.commitTransaction(); - } + // + TransactionAssert.commitTransaction(); + } + /** + * Regression test for JBPORTAL-1541... + * + * @throws DuplicatePortalObjectException + */ + public void testSetDeclaredPropertyWithoutParent() throws DuplicatePortalObjectException + { + TransactionAssert.beginTransaction(); + PortalContainer ctx = container.createContext("test"); + ctx.setDeclaredProperty("name", null); + TransactionAssert.commitTransaction(); + } + public void testCRUD() throws Exception { TransactionAssert.beginTransaction(); - PortalContainer ctx = (PortalContainer)container.getContext(); + PortalContainer ctx = container.getContext(); Portal portal = ctx.createPortal("default"); PortalObjectId portalId = portal.getId(); assertNotNull(portalId); @@ -215,7 +224,7 @@ // TransactionAssert.beginTransaction(); - ctx = (PortalContainer)container.getContext(); + ctx = container.getContext(); assertNotNull(ctx); portal = ctx.getPortal("default"); assertNotNull(portal); @@ -230,7 +239,7 @@ // TransactionAssert.beginTransaction(); - ctx = (PortalContainer)container.getContext(); + ctx = container.getContext(); assertNotNull(ctx); ctx.destroyChild("default"); portal = ctx.getPortal("default"); @@ -248,7 +257,7 @@ public void testGetChildren() throws Exception { TransactionAssert.beginTransaction(); - PortalContainer ctx = (PortalContainer)container.getContext(); + PortalContainer ctx = container.getContext(); Portal portal_1 = ctx.createPortal("1"); Page page_1_1 = portal_1.createPage("1"); Page page_1_2 = portal_1.createPage("2"); @@ -296,7 +305,7 @@ // TransactionAssert.beginTransaction(); - PortalContainer ctx = (PortalContainer)container.getContext(); + PortalContainer ctx = container.getContext(); Portal portal = ctx.createPortal("default"); assertNotNull(portal); @@ -326,7 +335,7 @@ // TransactionAssert.beginTransaction(); - PortalContainer ctx = (PortalContainer)container.getContext(); + PortalContainer ctx = container.getContext(); Portal portal = ctx.createPortal("portal"); portal.setDeclaredProperty("portalname", "portalvalue"); portal.getSupportedWindowStates().add(WindowState.NORMAL); @@ -344,7 +353,7 @@ // TransactionAssert.beginTransaction(); - ctx = (PortalContainer)container.getContext(); + ctx = container.getContext(); portal = (Portal)container.getObject(defaultId); portal = (Portal)portal.copy(ctx, "copy", true); assertNotNull(portal); @@ -386,4 +395,4 @@ return po1.getId().compareTo(po2.getId()); } } -} +} \ No newline at end of file