Author: chris.laprun(a)jboss.com Date: 2007-07-09 19:47:09 -0400 (Mon, 09 Jul 2007) New Revision: 7697 Modified: trunk/core/build.xml trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java Log: - JBPORTAL-1541: Added regression test. - Fixed output file for PortalNodeTestCase. Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-07-09 21:13:28 UTC (rev 7696) +++ trunk/core/build.xml 2007-07-09 23:47:09 UTC (rev 7697) @@ -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 --> @@ -380,9 +380,9 @@ </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> @@ -392,10 +392,10 @@ </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 --> @@ -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"/> @@ -730,7 +730,7 @@ <!-- 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"/> @@ -738,10 +738,10 @@ </target> <target name="explode-ha" depends="init"> <explode - file="${build.lib}/jboss-portal-ha.sar" - todir="${build.lib}" - name="jboss-portal-ha-exploded.sar" - /> + 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}"/> Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java =================================================================== --- trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-09 21:13:28 UTC (rev 7696) +++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-09 23:47:09 UTC (rev 7697) @@ -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,9 +70,6 @@ TransactionAssert.commitTransaction(); } - /** - * - */ public void testPropertyUpdateCascadeToDescendantsWhenTheyDoNotDeclareIt() throws Exception { TransactionAssert.beginTransaction(); @@ -94,9 +96,6 @@ TransactionAssert.commitTransaction(); } - /** - * - */ public void testPropertyUpdateDoesNotCascadeToDescendantsWhenTheyDeclareIt() throws Exception { TransactionAssert.beginTransaction(); @@ -124,9 +123,6 @@ TransactionAssert.commitTransaction(); } - /** - * - */ public void testOverridenPropertyRemovalPropagateParentValueToDescendants() throws Exception { TransactionAssert.beginTransaction(); @@ -155,10 +151,23 @@ 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);