JBoss Portal SVN: r10379 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance.
by portal-commits＠lists.jboss.org
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)
{
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10378 - in modules/portlet/trunk/portlet/src/test/java/org/jboss/portal: test/portlet/jsr168/ext/neverexpiringcache and 16 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-03-26 10:56:09 -0400 (Wed, 26 Mar 2008)
New Revision: 10378
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/InlineBundleWithEmptyTitleTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/HTTPSessionInvalidationInvalidesPortletSessionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/PortletScopedAttributesAreApplicationScopedAttributesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/DefineObjectsTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/NamespaceTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/RenderURLTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/GetRequestURITestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/IncludeMarkupFileTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/RequestHeaderAccessTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/event/EventPayloadTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopeEvictionTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/FilterConfigTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/RepeatedFilterTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletinterface/UnavailablePortletTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadCookieTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadTransportHeaderTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterOnStateAwareResponseTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterWithPortletURLTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ResourceRequestParametersTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/SetContentTypeAfterStreamIsObtainedTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
Log:
- Ext tests annotations
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -26,13 +26,16 @@
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_1
+ })
public class ActionInvalidatesExpiringCacheTestCase extends AbstractActionInvalidatesTestCase
{
public ActionInvalidatesExpiringCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,12 +27,15 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_2
+ })
public class DisableDuringRenderExpiringCacheTestCase extends AbstractDisableDuringRenderTestCase
{
public DisableDuringRenderExpiringCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP10;
import org.jboss.portal.test.portlet.framework.UTP11;
@@ -49,7 +50,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_3
+ })
public class ExpiringCacheTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,13 +27,16 @@
import org.jboss.portal.test.portlet.framework.UTP8;
import org.jboss.portal.test.portlet.framework.UTP9;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_4
+ })
public class ExpiringCacheWithPortletModeTestCase extends AbstractCacheMarkupTestCase
{
public ExpiringCacheWithPortletModeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,12 +29,15 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_5
+ })
public class ExpiringCacheWithRenderParametersTestCase extends AbstractCacheMarkupTestCase
{
public ExpiringCacheWithRenderParametersTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,13 +27,16 @@
import org.jboss.portal.test.portlet.framework.UTP6;
import org.jboss.portal.test.portlet.framework.UTP7;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EXPIRING_CACHE_6
+ })
public class ExpiringCacheWithWindowStateTestCase extends AbstractCacheMarkupTestCase
{
public ExpiringCacheWithWindowStateTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -26,13 +26,16 @@
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NEVER_EXPIRING_CACHE_1
+ })
public class ActionInvalidatesNeverExpiringCacheTestCase extends AbstractActionInvalidatesTestCase
{
public ActionInvalidatesNeverExpiringCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,12 +27,15 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NEVER_EXPIRING_CACHE_2
+ })
public class DisableDuringRenderNeverExpiringCacheTestCase extends AbstractDisableDuringRenderTestCase
{
public DisableDuringRenderNeverExpiringCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,12 +29,15 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NEVER_EXPIRING_CACHE_3
+ })
public class NeverExpiringCacheWithPortletModeTestCase extends AbstractCacheMarkupTestCase
{
public NeverExpiringCacheWithPortletModeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,13 +27,16 @@
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.test.portlet.framework.UTP5;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NEVER_EXPIRING_CACHE_4
+ })
public class NeverExpiringCacheWithRenderParametersTestCase extends AbstractCacheMarkupTestCase
{
public NeverExpiringCacheWithRenderParametersTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,12 +29,15 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NEVER_EXPIRING_CACHE_5
+ })
public class NeverExpiringCacheWithWindowStateTestCase extends AbstractCacheMarkupTestCase
{
public NeverExpiringCacheWithWindowStateTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -23,6 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
@@ -31,7 +32,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NO_CACHE_1
+ })
public class ExplicitNoCacheTestCase extends AbstractNoCacheTestCase
{
public ExplicitNoCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -27,12 +27,15 @@
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_NO_CACHE_1
+ })
public class ImplicitNoCacheTestCase extends AbstractNoCacheTestCase
{
public ImplicitNoCacheTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
import org.jboss.portal.unit.annotations.TestCase;
@@ -42,7 +43,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_CONFIG_1
+ })
public class GetResourceBundleDuringInitTestCase
{
public GetResourceBundleDuringInitTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/InlineBundleWithEmptyTitleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/InlineBundleWithEmptyTitleTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/InlineBundleWithEmptyTitleTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -45,7 +46,9 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_CONFIG_2
+ })
public class InlineBundleWithEmptyTitleTestCase
{
public InlineBundleWithEmptyTitleTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet;
@@ -45,7 +46,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_CONFIG_3
+ })
public class ResourceBundleCascadeTestCase
{
public ResourceBundleCascadeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_CONFIG_4
+ })
public class ResourceBundleTestCase
{
public ResourceBundleTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -47,7 +48,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_MODE_1
+ })
public class TestActionWithPortletModeTestCase
{
public TestActionWithPortletModeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -44,6 +44,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
+//Assertion.EXT_PORTLET_MODE_2
public class TestDuringActionTestCase
{
public TestDuringActionTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
@@ -42,7 +43,12 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_MODE_3,
+ Assertion.EXT_PORTLET_MODE_4,
+ Assertion.EXT_PORTLET_MODE_5,
+ Assertion.EXT_PORTLET_MODE_6
+ })
public class TestDuringRenderTestCase
{
public TestDuringRenderTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -50,7 +51,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_1
+ })
public class ActionRequestUseFormTestCase
{
public ActionRequestUseFormTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -53,7 +54,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_2
+ })
public class ActionRequestUseInputStreamTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -30,6 +30,7 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokePostResponse;
@@ -51,7 +52,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_3
+ })
public class ActionRequestUseReaderTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_4
+ })
public class RequestAttributeScopingTestCase
{
public RequestAttributeScopingTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
@@ -47,7 +48,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_5
+ })
public class RequestAttributeTestCase
{
public RequestAttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -30,6 +30,7 @@
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertFalse;
@@ -52,7 +53,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_6
+ })
public class RequestHeaderAccessTestCase
{
public RequestHeaderAccessTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -30,6 +30,7 @@
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -50,7 +51,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_7
+ })
public class RequestParameterTestCase
{
public RequestParameterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -40,7 +41,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_RESPONSES_1
+ })
public class ContentTypeTestCase
{
public ContentTypeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
@@ -47,7 +48,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PREFERENCES_1
+ })
public class IsReadOnlyTestCase
{
public IsReadOnlyTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
@@ -47,7 +48,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PREFERENCES_2
+ })
public class MapTestCase
{
public MapTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -30,6 +30,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -50,7 +51,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PREFERENCES_3
+ })
public class StoreMustPersistAllChangesTestCase
{
public StoreMustPersistAllChangesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -30,6 +30,7 @@
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -56,7 +57,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_SESSION_1
+ })
public class CrossContextSessionAttributeTestCase
{
public CrossContextSessionAttributeTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/HTTPSessionInvalidationInvalidesPortletSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/HTTPSessionInvalidationInvalidesPortletSessionTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/HTTPSessionInvalidationInvalidesPortletSessionTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -45,7 +46,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_SESSION_2
+ })
public class HTTPSessionInvalidationInvalidesPortletSessionTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -29,6 +29,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
@@ -49,7 +50,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_SESSION_3
+ })
public class ObtainNonNullSessionUsingCreateEqualsFalseTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/PortletScopedAttributesAreApplicationScopedAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/PortletScopedAttributesAreApplicationScopedAttributesTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/PortletScopedAttributesAreApplicationScopedAttributesTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
@@ -44,7 +45,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_SESSION_4
+ })
public class PortletScopedAttributesAreApplicationScopedAttributesTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -28,6 +28,7 @@
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.Assertion;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_SESSION_5
+ })
public class SessionDoesNotExistBeforeItIsRequestedTestCase
{
public SessionDoesNotExistBeforeItIsRequestedTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
@@ -50,7 +51,9 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_TAGLIB_1
+ })
public class ActionURLTestCase extends TaglibTestCase
{
public ActionURLTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/DefineObjectsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/DefineObjectsTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/DefineObjectsTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -57,7 +57,8 @@
* @version : 0.1 $
*/
@TestCase({
- Assertion.JSR286_113
+ Assertion.JSR286_113,
+ Assertion.EXT_TAGLIB_2
})
public class DefineObjectsTestCase extends TaglibTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/NamespaceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/NamespaceTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/NamespaceTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
@@ -49,7 +50,10 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_TAGLIB_3
+ })
+
public class NamespaceTestCase extends TaglibTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/RenderURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/RenderURLTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/RenderURLTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
@@ -48,7 +49,10 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_TAGLIB_4
+ })
+
public class RenderURLTestCase extends TaglibTestCase
{
public RenderURLTestCase(PortletTestCase seq)
@@ -90,18 +94,6 @@
include(dispatcher, request, response);
-// <portlet:renderURL windowState="normal" portletMode="edit" secure="true"/>
-//
-//<test_result_separator/>
-//
-//<portlet:renderURL windowState="normal" portletMode="edit" secure="true"/>
-//<%
-// //Put url placed as page variable
-// out.print(pageContext.getAttribute("testVar"));
-//%>
-//
-//<test_result_separator/>
-
return new InvokeGetResponse(response.createRenderURL().toString());
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -33,7 +34,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_1
+ })
public class ApplicationScopeDispatchedSessionTestCase extends AbstractDispatchedSessionTestCase
{
public ApplicationScopeDispatchedSessionTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/ContentTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
@@ -45,7 +46,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_2
+ })
public class ContentTestCase
{
public ContentTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -43,7 +44,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_3
+ })
public class DispatchingFilterTestCase
{
public DispatchingFilterTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/FiltersTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
@@ -46,7 +47,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_4
+ })
public class FiltersTestCase
{
public FiltersTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/GetRequestURITestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/GetRequestURITestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/GetRequestURITestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.ServletServiceTestAction;
@@ -49,7 +50,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_5
+ })
public class GetRequestURITestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/IncludeMarkupFileTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/IncludeMarkupFileTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/IncludeMarkupFileTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
@@ -47,7 +48,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_6
+ })
public class IncludeMarkupFileTestCase
{
public IncludeMarkupFileTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -34,7 +35,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_7
+ })
public class PortletScopeDispatchedSessionTestCase extends AbstractDispatchedSessionTestCase
{
public PortletScopeDispatchedSessionTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/RequestHeaderAccessTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/RequestHeaderAccessTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/dispatcher/RequestHeaderAccessTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.ServletServiceTestAction;
@@ -55,7 +56,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_DISPATCHER_8
+ })
public class RequestHeaderAccessTestCase
{
public RequestHeaderAccessTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/event/EventPayloadTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/event/EventPayloadTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/event/EventPayloadTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
@@ -51,7 +52,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_EVENT_1
+ })
public class EventPayloadTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopeEvictionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopeEvictionTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopeEvictionTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.unit.actions.PortletEventTestAction;
@@ -51,7 +52,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_CONTEXT_1
+ })
public class ScopeEvictionTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/FilterConfigTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/FilterConfigTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/FilterConfigTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.MapBuilder;
@@ -44,7 +45,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase()
+@TestCase({
+ Assertion.EXT_PORTLET_FILTER_1
+ })
public class FilterConfigTestCase
{
public FilterConfigTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/RepeatedFilterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/RepeatedFilterTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletfilter/RepeatedFilterTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
@@ -48,7 +49,9 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase()
+@TestCase({
+ Assertion.EXT_PORTLET_FILTER_2
+ })
public class RepeatedFilterTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletinterface/UnavailablePortletTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletinterface/UnavailablePortletTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletinterface/UnavailablePortletTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
@@ -46,7 +47,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_INTERFACE_1
+ })
public class UnavailablePortletTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadCookieTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadCookieTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadCookieTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
@@ -53,7 +54,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_8
+ })
public class ReadCookieTestCase
{
public ReadCookieTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadTransportHeaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadTransportHeaderTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ReadTransportHeaderTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.unit.actions.PortletEventTestAction;
@@ -61,7 +62,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_9
+ })
public class ReadTransportHeaderTestCase
{
public ReadTransportHeaderTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterOnStateAwareResponseTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterOnStateAwareResponseTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterOnStateAwareResponseTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.unit.actions.PortletEventTestAction;
@@ -54,7 +55,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_10
+ })
public class RemovePublicRenderParameterOnStateAwareResponseTestCase
{
public RemovePublicRenderParameterOnStateAwareResponseTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterWithPortletURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterWithPortletURLTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/RemovePublicRenderParameterWithPortletURLTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -52,7 +53,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_11
+ })
public class RemovePublicRenderParameterWithPortletURLTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ResourceRequestParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ResourceRequestParametersTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletrequests/ResourceRequestParametersTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -25,6 +25,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletResourceTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
@@ -57,7 +58,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_REQUESTS_12
+ })
public class ResourceRequestParametersTestCase
{
public ResourceRequestParametersTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/SetContentTypeAfterStreamIsObtainedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/SetContentTypeAfterStreamIsObtainedTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/SetContentTypeAfterStreamIsObtainedTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletResourceTestAction;
@@ -48,7 +49,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_RESPONSES_2
+ })
public class SetContentTypeAfterStreamIsObtainedTestCase
{
public SetContentTypeAfterStreamIsObtainedTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteCookiesTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
@@ -53,7 +54,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_RESPONSES_3
+ })
public class WriteCookiesTestCase
{
public WriteCookiesTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletresponses/WriteTransportHeaderTestCase.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -24,6 +24,7 @@
import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.actions.PortletActionTestAction;
@@ -54,7 +55,9 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-@TestCase
+@TestCase({
+ Assertion.EXT_PORTLET_RESPONSES_4
+ })
public class WriteTransportHeaderTestCase
{
public WriteTransportHeaderTestCase(PortletTestCase seq)
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-03-26 07:13:12 UTC (rev 10377)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-03-26 14:56:09 UTC (rev 10378)
@@ -1842,6 +1842,105 @@
API286_RESOURCE_RESPONSE_WRAPPER_20(new API(ResourceResponseWrapper.class), "setLocale()"),
API286_RESOURCE_RESPONSE_WRAPPER_21(new API(ResourceResponseWrapper.class), "setResponse()"),
+
+
+ // Ext tests
+
+
+
+ EXT_EXPIRING_CACHE_1(new EXT("Expiring cache"), "Action URL invalidates expiring cache"),
+ EXT_EXPIRING_CACHE_2(new EXT("Expiring cache"), "Overriding the expiration cache to 0 disable the cache on a render or an action/render."),
+ EXT_EXPIRING_CACHE_3(new EXT("Expiring cache"), "Cache expiriation time"),
+ EXT_EXPIRING_CACHE_4(new EXT("Expiring cache"), "Calling portlet with different portlet mode invalidates the cache"),
+ EXT_EXPIRING_CACHE_5(new EXT("Expiring cache"), "Calling portlet with different render parameters invalidates the cache"),
+ EXT_EXPIRING_CACHE_6(new EXT("Expiring cache"), "Calling portlet with different window state invalidates the cache"),
+
+ EXT_NEVER_EXPIRING_CACHE_1(new EXT("Never expiring cache"), "Action URL invalidates never expiring cache"),
+ EXT_NEVER_EXPIRING_CACHE_2(new EXT("Never expiring cache"), "Overriding the expiration cache to 0 disable the cache on a render or an action/render"),
+ EXT_NEVER_EXPIRING_CACHE_3(new EXT("Never expiring cache"), "Calling portlet with different portlet mode invalidates the cache"),
+ EXT_NEVER_EXPIRING_CACHE_4(new EXT("Never expiring cache"), "Calling portlet with different render parameters invalidates the cache"),
+ EXT_NEVER_EXPIRING_CACHE_5(new EXT("Never expiring cache"), "Calling portlet with different window state invalidates the cache"),
+
+ EXT_NO_CACHE_1(new EXT("No Cache"), "Caching behaviour with explicit no cache setting in portlet.xml"),
+ EXT_NO_CACHE_2(new EXT("No Cache"), "Caching behaviour with implicit no cache setting in portlet.xml"),
+
+ EXT_PORTLET_CONFIG_1(new EXT("PortletConfig"), "Obtain resource bundle during portlet init()"),
+ EXT_PORTLET_CONFIG_2(new EXT("PortletConfig"), "Portlet with no resource bundle and empty <title></title> tag"),
+ EXT_PORTLET_CONFIG_3(new EXT("PortletConfig"), "Cascade and fallback mechanisms for resource bundle"),
+ EXT_PORTLET_CONFIG_4(new EXT("PortletConfig"), "Simple resource bundle test case with empty <title/> tag."),
+
+ EXT_PORTLET_MODE_1(new EXT("PortletMode"), "Check portlet mode during action phase"),
+ EXT_PORTLET_MODE_2(new EXT("PortletMode"), "Null portlet mode can be set during action phase"),
+ EXT_PORTLET_MODE_3(new EXT("PortletMode"), "RenderRequest.isPortletModeAllowed(null) returns false"),
+ EXT_PORTLET_MODE_4(new EXT("PortletMode"), "Can set the portlet mode on render URL before having set the content type on the response"),
+ EXT_PORTLET_MODE_5(new EXT("PortletMode"), "Can set null portlet mode during render phase"),
+ EXT_PORTLET_MODE_6(new EXT("PortletMode"), "Can use set the portlet mode on action URL before having set the content type on the response"),
+
+ EXT_PORTLET_REQUESTS_1(new EXT("PortletRequest"), "Test that a POST request having a content type set to x-www-form-urlencoded will make the body content unavailable " +
+ " as an input stream or a reader and the parameters are decoded."),
+ EXT_PORTLET_REQUESTS_2(new EXT("PortletRequest"), "Test that a POST request having a content type not set to x-www-form-urlencoded will make the body content " +
+ " available as a input stream."),
+ EXT_PORTLET_REQUESTS_3(new EXT("PortletRequest"), "Test that a POST request having a content type not set to x-www-form-urlencoded will make the body content " +
+ " available as a reader."),
+ EXT_PORTLET_REQUESTS_4(new EXT("PortletRequest"), "Test request attribute scoping"),
+ EXT_PORTLET_REQUESTS_5(new EXT("PortletRequest"), "Test manipulating request attributes"),
+ EXT_PORTLET_REQUESTS_6(new EXT("PortletRequest"), "Show that we can access request headers from the portlet request properties."),
+ EXT_PORTLET_REQUESTS_7(new EXT("PortletRequest"), "Test request parameters"),
+ EXT_PORTLET_REQUESTS_8(new EXT("PortletRequest"), "Test access to cookies in headers"),
+ EXT_PORTLET_REQUESTS_9(new EXT("PortletRequest"), "Show that we can access request headers from the portlet request properties."),
+ EXT_PORTLET_REQUESTS_10(new EXT("PortletRequest"), "If a portlet wants to delete a public render parameter it needs to use the" +
+ " removePublic method on the or the PortletURL."),
+ EXT_PORTLET_REQUESTS_11(new EXT("PortletRequest"), " Test that removePublicRenderParameter method on PortletURL removes the render parameter" +
+ " in the context of a render url and does nothing in the context of an action url."),
+ EXT_PORTLET_REQUESTS_12(new EXT("PortletRequest"), "For serveResource requests the portlet must receive any resource parameters that were" +
+ " explicitly set on the ResourceURL that triggered the request. If the cacheability level of" +
+ " that resource URL (see PLT.13.7) was PORTLET or PAGE, the portlet must also receive the" +
+ " render parameters present in the request in which the URL was created." +
+ " If a resource parameter is set that has the same name as a render parameter, the render" +
+ " parameter must be the last entry in the parameter value array."),
+
+ EXT_PORTLET_RESPONSES_1(new EXT("PortletResponse"), "Test that character encoding is ignored as specified by the spec in PLT.12.3.1"),
+ EXT_PORTLET_RESPONSES_2(new EXT("PortletResponse"), "Not setting the content type before getting a stream will use the content type defined\n" +
+ " * by the portlet request response content type."),
+ EXT_PORTLET_RESPONSES_3(new EXT("PortletResponse"), "Test adding coockies to response"),
+ EXT_PORTLET_RESPONSES_4(new EXT("PortletResponse"), "Test adding HTTP headers"),
+
+ EXT_PREFERENCES_1(new EXT("PortletPreferences"), "Asserts that isReadOnly() returns correct values during both render and action phase."),
+ EXT_PREFERENCES_2(new EXT("PortletPreferences"), "PortletPreferences.getMap()"),
+ EXT_PREFERENCES_3(new EXT("PortletPreferences"), "Store persists all changes"),
+
+ EXT_SESSION_1(new EXT("PortletSession"), "The goal is to test that cross context session attributes are set in container and are accessible from the direct" +
+ " servlet."),
+ EXT_SESSION_2(new EXT("PortletSession"), "Test that HTTPSession invalidation invalidates PortletSession"),
+ EXT_SESSION_3(new EXT("PortletSession"), "Obtain PortletSession with 'create' option equals false"),
+ EXT_SESSION_4(new EXT("PortletSession"), "Test that PORTLET_SCOPE attributes are accessible in APPLICATION_SCOPE"),
+ EXT_SESSION_5(new EXT("PortletSession"), "Test that a session does not exist the first time the portlet is accessed."),
+
+ EXT_TAGLIB_1(new EXT("Taglib"), "Test ActionURL tag implementation"),
+ EXT_TAGLIB_2(new EXT("Taglib"), "Test DefineObjects tag implementation"),
+ EXT_TAGLIB_3(new EXT("Taglib"), "Test Namespace tag implementation"),
+ EXT_TAGLIB_4(new EXT("Taglib"), "Test RenderURL tag implementation"),
+
+ EXT_DISPATCHER_1(new EXT("Dispatcher"), "Test passing session attributes between servlet and portlet with APPLICATION_SCOPE"),
+ EXT_DISPATCHER_2(new EXT("Dispatcher"), "Test creating response content in dispatched servlet with forward and include"),
+ EXT_DISPATCHER_3(new EXT("Dispatcher"), "Test dispatch to servlet filter"),
+ EXT_DISPATCHER_4(new EXT("Dispatcher"), "Test filter chains"),
+ EXT_DISPATCHER_5(new EXT("Dispatcher"), "Test request.getRequestURI in dispatched servlet"),
+ EXT_DISPATCHER_6(new EXT("Dispatcher"), "Test include markup file (HTML)"),
+ EXT_DISPATCHER_7(new EXT("Dispatcher"), "Test passing session attributes between servlet and portlet with PORTLET_SCOPE with javax.portlet.servletDefaultSessionScope runtime" +
+ "option set"),
+ EXT_DISPATCHER_8(new EXT("Dispatcher"), "Test access to request headers in dispatched servlet"),
+
+ EXT_EVENT_1(new EXT("Event"), "Test payload passed to the event"),
+
+ EXT_PORTLET_CONTEXT_1(new EXT("PortletContext"), "Test scope eviction with javax.portlet.actionScopedRequestAttributes runtime parameter"),
+
+ EXT_PORTLET_FILTER_1(new EXT("PortletFilter"), "Test that the init parameters of a filter are correct."),
+ EXT_PORTLET_FILTER_2(new EXT("PortletFilter"), "Test that a portlet filter mapped 2 times in the descriptor is applied on" +
+ " each portlet."),
+
+ EXT_PORTLET_INTERFACE_1(new EXT("Portlet interface"), "Test that portlet is not called after throwing UnavailableException"),
+
;
public String toString()
@@ -1919,6 +2018,22 @@
}
}
+ public static class EXT extends Ref
+ {
+
+ private final String section;
+
+ public EXT(String section)
+ {
+ this.section = section;
+ }
+
+ public String toString()
+ {
+ return "EXT[" + section + "]";
+ }
+ }
+
/**
* The status of an assertion.
*/
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10377 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-26 03:13:12 -0400 (Wed, 26 Mar 2008)
New Revision: 10377
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.1. *-object.xml Files
- revising introduction paragraph
- moved admonition to end of section
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-03-26 06:32:02 UTC (rev 10376)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-03-26 07:13:12 UTC (rev 10377)
@@ -124,6 +124,7 @@
</para>
<para>
<note>
+ <title>Changing the context-root</title>
<para>
By default, Tomcat holds on to the root context, <emphasis>/</emphasis>. You may need to remove the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/</filename> directory,
or add a <filename>jboss-web.xml</filename> file, which declares another
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-26 06:32:02 UTC (rev 10376)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-26 07:13:12 UTC (rev 10377)
@@ -973,27 +973,15 @@
</sect1>
<sect1 id="descriptors_portlet">
<title>Portlet Descriptors</title>
- <para>To define your portal objects (portals, pages, portlet instances, windows, and portlets), you will be using
- the descriptors found in this section. This section seeks to describe these descriptors. It is recommended you
- also look at
- <xref linkend="tutorials_tutorials"/>
- and
- <xref linkend="desc_examples"/>
- for samples on how they are used within a portlet application.
+ <para>
+ The following sections describe the descriptors used to define portal objects, such as portals, pages, portlet instances, windows, and portlets. Refer to <xref linkend="tutorials_tutorials"/> and <xref linkend="desc_examples"/> for examples on using these descriptors within a portlet application.
</para>
<sect2 id="desc_objectxml">
- <title>*-object.xml</title>
+ <title><filename>*-object.xml</filename> Files</title>
<para>
- The *-object.xml file is used to define: portal instances, pages, windows, window layout. Additionally,
- you can also specify the themes and layouts used for specific portal instances, pages, and windows. The
- description below, only defines a portlet window being added to the default page in the default portal. For
- advanced functionality, using this descriptor, please read <xref linkend="desc_examples"/>.
-
- <note>
- <emphasis>Is this descriptor mandatory?</emphasis>
- Technically, no, as you can define your portal object hierarchy (create portals, pages, instances and
- organize them as you see fit) from the management portlet accessible to Portal administrators.
- </note>
+ The <filename>*-object.xml</filename> files are used to define portal instances, pages, windows, and the window layout. As well, themes and layouts for specific portal instances, pages, and windows, can be defined. The following example defines a portlet window being added to the default page, in the default portal. For advanced functionality using this descriptor, refer to <xref linkend="desc_examples"/>:
+ </para>
+ <para>
<programlisting><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE deployments PUBLIC
@@ -1101,6 +1089,15 @@
</imageobject>
</mediaobject>
</para>
+
+ <para>
+ <note>
+ <title>Are <filename>*-object.xml</filename> descriptors necessary?</title>
+ <para>
+ Technically, they are not. The portal object hierarchy, such as creating portals, pages, instances, and organizing them on the page, can be defined using the management portlet, which is accessible to JBoss Portal administrators.
+ </para>
+ </note>
+ </para>
</sect2>
<sect2 id="desc_instancesxml">
<title>portlet-instances.xml</title>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10376 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-26 02:32:02 -0400 (Wed, 26 Mar 2008)
New Revision: 10376
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.4. The JBoss Portal App DTD
revising (small) section
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-26 05:36:40 UTC (rev 10375)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-26 06:32:02 UTC (rev 10376)
@@ -936,26 +936,38 @@
</para>
</sect2>
<sect2>
- <title>JBoss App DTD</title>
+ <title>The JBoss Portal App DTD</title>
<para>
-<itemizedlist>
+ The following items refer to elements found in the JBoss Portal App DTD, <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/jboss-portal.sar/dtd/jboss-app_<replaceable>version_number</replaceable>.dtd</filename>:
+ </para>
+ <para>
+ <variablelist>
+ <varlistentry><term><screen><![CDATA[
+<Element <![CDATA[<!ELEMENT jboss-app (app-name?)>]]>
+</screen></term>
<listitem>
-<para>
-Element <![CDATA[<!ELEMENT jboss-app (app-name?)>]]>
-</para><para><programlisting><![CDATA[<!DOCTYPE jboss-app PUBLIC
+ <para>
+<screen><![CDATA[
+<!DOCTYPE jboss-app PUBLIC
"-//JBoss Portal//DTD JBoss Web Application 2.6//EN"
- "http://www.jboss.org/portal/dtd/jboss-app_2_6.dtd">]]></programlisting></para>
-</listitem><listitem>
-<para>
-Element <![CDATA[<!ELEMENT app-name (#PCDATA)>]]>
-</para><para><programlisting><![CDATA[When a web application is deployed, the context path under wich it is deployed
-is taken as application name. The application name value in this descriptor is
-used to override it. When a component references a references a portlet, it needs to
-reference the application too and if the portlet application war file is renammed
-the reference is not valid anymore. Therefore this tag is used to have an application
-name that does not depend upon the context path under which the application is deployed.]]></programlisting></para>
-</listitem></itemizedlist>
-
+ "http://www.jboss.org/portal/dtd/jboss-app_2_6.dtd">]]>
+</screen>
+ </para>
+ <para>
+<screen><![CDATA[
+<!ELEMENT app-name (#PCDATA)>]]>
+</screen>
+ </para>
+ <para>
+ When a web application is deployed, the context path under which it is deployed
+ is taken as the application name. The application name value in the <computeroutput><app-name></computeroutput> element is
+ used to override it. When a component references a portlet, it needs to
+ reference the application too, and if the portlet application WAR file is renamed,
+ the reference is no longer valid; therefore, the <computeroutput><app-name></computeroutput> element is used to have an application name that does not depend upon the context path, under which the application is deployed.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
</para>
</sect2>
</sect1>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10375 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-26 01:36:40 -0400 (Wed, 26 Mar 2008)
New Revision: 10375
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.3. The JBoss Portal Object DTD
minor revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-25 01:44:11 UTC (rev 10374)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-26 05:36:40 UTC (rev 10375)
@@ -418,12 +418,9 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><security-constraint></computeroutput> element is a container for <computeroutput><policy-permission></computeroutput> elements.
+ The <computeroutput><security-constraint></computeroutput> element is a container for <computeroutput><policy-permission></computeroutput> elements. The following is an example of the <computeroutput><security-constraint></computeroutput> and <computeroutput><policy-permission></computeroutput> elements:
</para>
<para>
- The following is an example of the <computeroutput><security-constraint></computeroutput> element:
- </para>
- <para>
<screen><![CDATA[
<security-constraint>
<policy-permission>
@@ -487,7 +484,7 @@
</screen>
</para>
<para>
- If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view this instance.
+ If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view the instance.
</para>
<para>
<screen><![CDATA[
@@ -495,7 +492,7 @@
</screen>
</para>
<para>
- The <computeroutput><role-name></computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access this instance:
+ The <computeroutput><role-name></computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
</para>
<para>
<screen><![CDATA[
@@ -852,12 +849,9 @@
</screen></term>
<listitem>
<para>
- The security-constraint element is a container for policy-permission elements
+ The <computeroutput><security-constraint></computeroutput> element is a container for <computeroutput><policy-permission></computeroutput> elements. The following is an example of the <computeroutput><security-constraint></computeroutput> and <computeroutput><policy-permission></computeroutput> elements:
</para>
<para>
- The following is an example of the <computeroutput><security-constraint></computeroutput> element:
- </para>
- <para>
<screen><![CDATA[
<security-constraint>
<policy-permission>
@@ -879,40 +873,64 @@
<varlistentry><term><screen><![CDATA[
<!ELEMENT policy-permission (action-name*,unchecked?,role-name*)>]]>
</screen></term>
-<listitem>
- <para>
- The <computeroutput><policy-permission></computeroutput> element is used to secure a specific portlet instance based on a user's role.
- </para>
- <para>
+ <listitem>
+ <para>
+ The <computeroutput><policy-permission></computeroutput> element is used to secure a specific portlet instance based on a user's role.
+ </para>
+ <para>
<screen><![CDATA[
<!ELEMENT action-name (#PCDATA)>]]>
</screen>
- </para>
- <para>
- The <computeroutput><action-name></computeroutput> element is used to define the access rights given to the role defined. The accepted value is <computeroutput>view</computeroutput>, which allows users to view the page.
- </para>
- <para>
+ </para>
+ <para>
+ The <computeroutput><action-name></computeroutput> element is used to define the access rights given to the role defined. Accepted values are:
+ </para>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <computeroutput>view</computeroutput>: users can view the page.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>viewrecursive</computeroutput>: users can view the page and child pages.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>personalize</computeroutput>: users are able personalize the page's theme.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <computeroutput>personalizerecursive</computeroutput>: users are able personalize the page and child pages themes.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>
<screen><![CDATA[
<!ELEMENT unchecked EMPTY>]]>
</screen>
- </para>
- <para>
- If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view this instance.
- </para>
- <para>
+ </para>
+ <para>
+ If present, the <computeroutput><unchecked></computeroutput> element is used to define that anyone can view the instance.
+ </para>
+ <para>
<screen><![CDATA[
<!ELEMENT role-name (#PCDATA)>]]>
</screen>
- </para>
- <para>
- The <computeroutput><role-name></computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access this instance:
- </para>
- <para>
+ </para>
+ <para>
+ The <computeroutput><role-name></computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role to access the instance:
+ </para>
+ <para>
<screen><![CDATA[
<role-name>EXAMPLEROLE</role-name>]]>
</screen>
- </para>
-</listitem>
+ </para>
+ </listitem>
</varlistentry>
</variablelist>
</para>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10374 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-24 21:44:11 -0400 (Mon, 24 Mar 2008)
New Revision: 10374
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.3. The JBoss Portal Object DTD
minor revisions and additions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-25 01:17:06 UTC (rev 10373)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-25 01:44:11 UTC (rev 10374)
@@ -779,12 +779,9 @@
</screen></term>
<listitem>
<para>
- Define the content of the window in a generic manner. The content is define by the type of the content and an URI which acts as an identificator for the content.
+ Define the content of a window in a generic manner. The content is defined by the type of content, and a URI, which acts as an identifier for the content. The following is an example of the <computeroutput><content></computeroutput> element, which is configured in the <filename>WEB-INF/*-object.xml</filename> files:
</para>
<para>
- The following is an example of the <computeroutput><content></computeroutput> element:
- </para>
- <para>
<screen><![CDATA[
<content>
<content-type>portlet</content-type>
@@ -803,7 +800,7 @@
</screen>
</para>
<para>
- The content type of the window.
+ The content type of the window. The <computeroutput><content-type></computeroutput> element specifies the content to display, for example, a <computeroutput>portlet</computeroutput>.
</para>
<para>
<screen><![CDATA[
@@ -811,7 +808,7 @@
</screen>
</para>
<para>
- The content URI of the window.
+ The content URI of the window. The <computeroutput><content-uri></computeroutput> element specifies which content to display, for example, a portlet instance. To display a file from the CMS, use the <computeroutput><content-uri></computeroutput> element to define the full path to that file in the CMS.
</para>
</listitem>
</varlistentry>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10373 - branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-24 21:17:06 -0400 (Mon, 24 Mar 2008)
New Revision: 10373
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
Log:
admin portlet migration - small change
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-03-25 01:12:05 UTC (rev 10372)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-03-25 01:17:06 UTC (rev 10373)
@@ -67,6 +67,16 @@
private DisplayNameBean displayNameBean;
+ public Object getBean()
+ {
+ return bean;
+ }
+
+ public void setBean(Object bean)
+ {
+ this.bean = bean;
+ }
+
public void addDisplayName() throws ConversionException
{
if (newText != null)
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-03-25 01:12:05 UTC (rev 10372)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2008-03-25 01:17:06 UTC (rev 10373)
@@ -57,6 +57,16 @@
private DisplayNameBean displayNameBean;
+ public Object getBean()
+ {
+ return bean;
+ }
+
+ public void setBean(Object bean)
+ {
+ this.bean = bean;
+ }
+
public void addDisplayName() throws ConversionException
{
if (newText != null)
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10372 - in branches/JBoss_Portal_2_6_4_JBPB: core/src/main/org/jboss/portal/core/ui/content/portlet and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-24 21:12:05 -0400 (Mon, 24 Mar 2008)
New Revision: 10372
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
admin portlet issues resolved for bridge migration - still having problem with portlet component
Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-03-24 23:56:01 UTC (rev 10371)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-03-25 01:12:05 UTC (rev 10372)
@@ -36,6 +36,7 @@
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -247,9 +248,17 @@
}
}
+
protected ObjectNode getObjectNode(PortalObjectId path)
{
- return getObjectNode(sessionFactory.getCurrentSession(), path);
+ Session session;
+ try{
+ session = sessionFactory.getCurrentSession();
+ }catch(Exception e){
+ session = sessionFactory.openSession();
+ }
+
+ return getObjectNode(session, path);
}
private ObjectNode getObjectNodeNoCache(Session session, PortalObjectId id)
Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-24 23:56:01 UTC (rev 10371)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-25 01:12:05 UTC (rev 10372)
@@ -103,7 +103,7 @@
protected void getContent(RenderRequest req, RenderResponse resp, boolean newContent) throws PortletException, PortletSecurityException, IOException
{
String selectedURI = req.getParameter("content.uri");
-
+ System.out.println("--getContent------------" + req.getParameter("content.uri"));
//
PortletURL actionURL = resp.createActionURL();
Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-24 23:56:01 UTC (rev 10371)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-25 01:12:05 UTC (rev 10372)
@@ -16,6 +16,8 @@
<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%>
<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%>
+<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.net.URLEncoder" %>
<portlet:defineObjects/>
<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
@@ -106,11 +108,17 @@
String iconLocation = getIcon(info);
+ PortletURL actionURL = renderResponse.createActionURL();
+ actionURL.setParameter("content.uri",instance.getId());
+ actionURL.setParameter("content.action.select","true");
+ String test = "?action=1&" + actionURL.toString().substring(actionURL.toString().lastIndexOf("?") + 1,actionURL.toString().length());
+// test = test.replace("/","%2F");
+//
%>
- <portlet:actionURL var="url">
- <portlet:param name="content.action.select" value="true"/>
- <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
- </portlet:actionURL>
+ <%--<portlet:actionURL var="test">--%>
+ <%--<portlet:param name="content.action.select" value="true"/>--%>
+ <%--<portlet:param name="content.uri" value="<%= instance.getId() %>"/>--%>
+ <%--</portlet:actionURL>--%>
<div style="display:none">
<div class="darktip" id="info-container-<%= displayName %>">
@@ -133,8 +141,9 @@
<tr class="<%= rowClass %>" >
<td >
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
- <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="<%= url %>" id="portlet-instance-link"><%= displayName %></a></span></td>
- </tr>
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="<%= test %>" id="portlet-instance-link"><%= displayName %></a></span>
+ w-<%=test%></td>
+ </tr>
<%
}
%>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-03-24 23:56:01 UTC (rev 10371)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-03-25 01:12:05 UTC (rev 10372)
@@ -50,6 +50,16 @@
public Object bean;
+ public Object getBean()
+ {
+ return bean;
+ }
+
+ public void setBean(Object bean)
+ {
+ this.bean = bean;
+ }
+
public void setNewName(String newName)
{
this.newName = newName;
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10371 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-24 19:56:01 -0400 (Mon, 24 Mar 2008)
New Revision: 10371
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.3. The JBoss Portal Object DTD
minor revisions/updating text
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-24 23:41:32 UTC (rev 10370)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-24 23:56:01 UTC (rev 10371)
@@ -456,7 +456,7 @@
</screen></term>
<listitem>
<para>
- Specifies the layout region and the order this window will be found on the portal page.
+ Specifies the layout region, and the order this window will be found on the portal page.
</para>
</listitem>
</varlistentry>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-24 23:41:32 UTC (rev 10370)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-24 23:56:01 UTC (rev 10371)
@@ -741,12 +741,9 @@
</screen>
</para>
<para>
- Define the content of the window as a reference to a portlet instance. The value is the ID of the instance.
+ Define the content of the window as a reference to a portlet instance. This value is the ID of the instance, and must much the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file. The following is an example of the <computeroutput><instance-ref></computeroutput> element:
</para>
<para>
- The following is an example of the <computeroutput><instance-ref></computeroutput> element:
- </para>
- <para>
<screen>
<instance-ref>MyPortletInstance</instance-ref>
</screen>
@@ -757,7 +754,7 @@
</screen>
</para>
<para>
- The region the window belongs to.
+ The region the window belongs to. The <computeroutput><region></computeroutput> element specifies where the window will appear on the page.
</para>
<para>
<screen><![CDATA[
@@ -765,7 +762,7 @@
</screen>
</para>
<para>
- The height of the window in the particular region.
+ The height of the window in a particular region.
</para>
<para>
<screen><![CDATA[
@@ -773,7 +770,7 @@
</screen>
</para>
<para>
- Define a listener for a portal object. The value is the id of the listener.
+ Define a listener for a portal object. This value is the ID of the listener.
</para>
</listitem>
</varlistentry>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10370 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-24 19:41:32 -0400 (Mon, 24 Mar 2008)
New Revision: 10370
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.3. The JBoss Portal Object DTD
minor revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-24 22:48:30 UTC (rev 10369)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-24 23:41:32 UTC (rev 10370)
@@ -590,7 +590,7 @@
</screen>
</para>
<para>
- The following specifies that the portlet will apear in the portal instance named <computeroutput>default</computeroutput>, and on the page named <computeroutput>default</computeroutput>:
+ The following specifies that the portlet will appear in the portal instance named <computeroutput>default</computeroutput>, and on the page named <computeroutput>default</computeroutput>:
</para>
<para>
<screen>
@@ -668,7 +668,7 @@
</screen></term>
<listitem>
<para>
- The portlet mode value. If there are no declarations of modes or window states, the default values will be <computeroutput>view</computeroutput>, <computeroutput>edit</computeroutput>, <computeroutput>help</computeroutput>, and <computeroutput>normal</computeroutput>, <computeroutput>minimized</computeroutput>, <computeroutput>maximized</computeroutput> respectively.
+ The portlet mode value. If there are no declarations of modes or window states, the default values will be <computeroutput>view</computeroutput>, <computeroutput>edit</computeroutput>, <computeroutput>help</computeroutput>, and <computeroutput>normal</computeroutput>, <computeroutput>minimized</computeroutput>, <computeroutput>maximized</computeroutput>, respectively.
</para>
</listitem>
</varlistentry>
@@ -704,7 +704,7 @@
</screen></term>
<listitem>
<para>
- A portal object with the type <emphasis>page</emphasis>. A page type represents a page, and can only have children that use the types <emphasis>page</emphasis> and <emphasis>window</emphasis>. The children windows are the windows of the page, and the children pages are the subpages of this page.
+ A portal object that uses the <emphasis>page</emphasis> type. A page type represents a page, and can only have children that use the <emphasis>page</emphasis> and <emphasis>window</emphasis> types. The children windows are the windows of the page, and the children pages are the subpages of the page.
</para>
<para>
<screen><![CDATA[
@@ -722,10 +722,10 @@
</screen></term>
<listitem>
<para>
- A portal object with the type <emphasis>window</emphasis>. A window type represents a window. Besides the common properties, a window has content and belongs to a region on the page.
+ A portal object that uses the <emphasis>window</emphasis> type. A window type represents a window. Besides the common properties, a window has content, and belongs to a region on the page.
</para>
<para>
- The <computeroutput><instance-ref></computeroutput> and <computeroutput><content></computeroutput> elements are used to define the content of the window. The <computeroutput><content></computeroutput> element is generic, and is used to describe any kind of content. The <computeroutput><instance-ref></computeroutput> element is a shortcut to define the content-type of the portlet, which points to a portlet instance. The <computeroutput><instance-ref></computeroutput> value must much an <computeroutput><instance-id></computeroutput> value in the <filename>WEB-INF/portlet-instances.xml</filename> file.
+ The <computeroutput><instance-ref></computeroutput> and <computeroutput><content></computeroutput> elements, configured in the <filename>WEB-INF/*-object.xml</filename> files, define the content of a window. The <computeroutput><content></computeroutput> element is generic, and describes any kind of content. The <computeroutput><instance-ref></computeroutput> element is a shortcut to define the content-type of the portlet, which points to a portlet instance. The value of <computeroutput><instance-ref></computeroutput> must match the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file.
</para>
<para>
<screen><![CDATA[
16 years, 1 month
- 1
- 0