Author: thomas.heute(a)jboss.com Date: 2008-03-26 17:11:35 -0400 (Wed, 26 Mar 2008) New Revision: 10379 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java Log: Don't know how i removed this... Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2008-03-26 14:56:09 UTC (rev 10378) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2008-03-26 21:11:35 UTC (rev 10379) @@ -29,25 +29,23 @@ */ package org.jboss.portal.test.core.model.instance; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; + 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.jboss.portal.Mode; -import org.jboss.portal.WindowState; import org.jboss.portal.common.junit.TransactionAssert; import org.jboss.portal.common.util.CollectionBuilder; -import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.core.controller.Controller; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; 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.model.portal.WindowImpl; 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; @@ -57,15 +55,11 @@ import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.impl.info.ContainerMetaInfo; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.state.AbstractPropertyContext; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyContext; @@ -74,18 +68,10 @@ import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.server.impl.ServerInvocationContextImpl; -import org.jboss.portal.test.core.HttpServletRequestWrapperImpl; import org.jboss.portal.test.framework.AbstractPortalTestCase; import org.jboss.portal.test.framework.embedded.HibernateSupport; import org.jboss.portal.test.framework.mc.TestRuntimeContext; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; - /** * Test Case that tests the authorization for instances via the instance container * <p/> @@ -442,6 +428,7 @@ return TestCloneBeforeWrite.this.execute(this); } }); + internalPortlet.addPreference("_abc", new StringValue("_def")); String popId = getSinglePOP().getContext().getId(); // @@ -875,7 +862,7 @@ try { instanceContainer.createDefinition("MyInstance", "MyPortlet"); - fail("Was expecting a NoSuchPortletException"); + fail("Was expecting a DuplicateInstanceException"); } catch (DuplicateInstanceException expected) {