March 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6755 - trunk/portlet/src/main/org/jboss/portal/test/framework/portlet.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-19 14:35:29 -0400 (Mon, 19 Mar 2007) New Revision: 6755 Removed: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java Log: svn or idea forgot to delete a refactored class Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java 2007-03-19 18:35:09 UTC (rev 6754) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java 2007-03-19 18:35:29 UTC (rev 6755) @@ -1,123 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.framework.portlet; - -import org.jboss.portal.common.test.info.TestInfo; -import org.jboss.portal.common.test.info.TestContainerInfo; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.test.framework.driver.http.HttpTestDriver; -import org.jboss.portal.test.framework.driver.http.HttpTestContext; - -import java.util.HashMap; -import java.util.Map; -import java.util.Collections; - -/** - * Registry of action sequences. Every sequence is binded with test id - * - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision$ - */ -public class SequenceRegistry implements HttpTestDriver -{ - - /** . */ - private final Map entries; - - /** . */ - protected final TestContainerInfo container; - - public SequenceRegistry(String name) - { - entries = Collections.synchronizedMap(new HashMap()); - container = new TestContainerInfo(name); - } - - /** - * Adding sequence to registry. Sequence can be null as this will clear the binding - * - * @param testName - * @param sequence - */ - public void addSequence(String testName, Sequence sequence) - { - if (testName == null) - { - throw new IllegalArgumentException("Test name must be provided"); - } - if (sequence == null) - { - throw new IllegalArgumentException("Sequence can't be null"); - } - if (entries.containsKey(testName)) - { - throw new IllegalArgumentException("Sequence cannot be bound twice"); - } - - // - TestInfo test = new TestInfo(testName); - - // - entries.put(testName, sequence); - container.addChild(test); - } - - public void removeSequence(String testName) - { - container.removeChild(testName); - } - - public Sequence getSequence(String testName) - { - if (testName == null) - { - throw new IllegalArgumentException("Test name can't be null"); - } - return (Sequence)entries.get(testName); - } - - public TestItemInfo getInfo() - { - return container; - } - - public DriverResponse invoke(String testId, DriverCommand command) throws TestDriverException - { - TestInfo info = (TestInfo)getInfo().findItem(testId); - return new InvokeGetResponse("/test/" + info.getName()); - } - - public void pushContext(String testId, HttpTestContext ctx) - { - PortletTestDriver.context = new PortletTestContext(ctx); - } - - public HttpTestContext popContext(String testId) - { - return PortletTestDriver.context.httpTestContext; - } -}

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6754 - in trunk/identity: src/main/org/jboss/portal/identity and 3 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-03-19 14:35:09 -0400 (Mon, 19 Mar 2007) New Revision: 6754 Modified: trunk/identity/build.xml trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java Log: - merge user properties from LDAP and DB + testcase Modified: trunk/identity/build.xml =================================================================== --- trunk/identity/build.xml 2007-03-19 18:14:33 UTC (rev 6753) +++ trunk/identity/build.xml 2007-03-19 18:35:09 UTC (rev 6754) @@ -453,14 +453,14 @@ <x-test>  -  -  +  - <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/> +  </x-test> <x-classpath> <pathelement location="${build.lib}/portal-identity-lib.jar"/> Modified: trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-19 18:14:33 UTC (rev 6753) +++ trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-19 18:35:09 UTC (rev 6754) @@ -32,6 +32,8 @@ import javax.naming.InitialContext; import java.util.Map; +import java.util.HashMap; +import java.util.Collections; /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> @@ -128,7 +130,6 @@ } } - //TODO: wrong coded - should merge properties from LDAP AND DB public Map getProperties(User user) throws IdentityException, IllegalArgumentException { if (log.isDebugEnabled()) log.debug("getProperties");//: " + name + "/" + propertyValue) @@ -136,8 +137,29 @@ { if (user instanceof LDAPUserImpl && isLDAPSupported()) { - log.debug("Delegating to LDAP module"); - return getLDAPModule().getProperties(user); + log.debug("handling LDAP user implementation"); + + Map props = new HashMap(); + + UserProfileModule dbModule = null; + UserProfileModule ldapModule = null; + + // First get props from databas - its ok if it fails as database support is not required for LDAP configuration + try + { + dbModule = getDBModule(); + props.putAll(dbModule.getProperties(user)); + } + catch (Exception e) + { + // + } + + ldapModule = getLDAPModule(); + props.putAll(ldapModule.getProperties(user)); + + + return Collections.unmodifiableMap(props); } else if (user instanceof HibernateUserImpl && isDBSupported()) { Modified: trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-03-19 18:14:33 UTC (rev 6753) +++ trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-03-19 18:35:09 UTC (rev 6754) @@ -501,6 +501,36 @@ ctx.commit(); } + public void testGetProperties() throws Exception + { + ctx.begin(); + + User user = userModule.createUser("testname", "testpassword"); + + // Set few properties for both LDAP and DB mappings + //userProfileModule.setProperty(user, "user.name.nickName", "blah"); + userProfileModule.setProperty(user, "user.name.family", "blah"); + userProfileModule.setProperty(user, "user.name.given", "blah"); + + //LDAP + userProfileModule.setProperty(user, "user.business-info.online.email", "blah"); + userProfileModule.setProperty(user, "portal.user.occupation", "blah"); + + // Check if they exist - should be merged + Map props = userProfileModule.getProperties(user); + + + //assertTrue(props.containsKey("user.name.nickName")); + assertTrue(props.containsKey("user.name.family")); + assertTrue(props.containsKey("user.name.given")); + assertTrue(props.containsKey("user.business-info.online.email")); + assertTrue(props.containsKey("portal.user.occupation")); + + + ctx.commit(); + } + + public void testFindUsers2() throws Exception { ctx.begin(); Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-03-19 18:14:33 UTC (rev 6753) +++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-03-19 18:35:09 UTC (rev 6754) @@ -187,6 +187,11 @@ commit(); } + public void testGetProperties() throws Exception + { + utc.testGetProperties(); + } + public void testStaticProperty() throws Exception { utc.testStaticProperty(); Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java 2007-03-19 18:14:33 UTC (rev 6753) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java 2007-03-19 18:35:09 UTC (rev 6754) @@ -167,6 +167,11 @@ utc.testDynamicProperty(); } + public void testGetProperties() throws Exception + { + utc.testGetProperties(); + } + public void testStaticProperty() throws Exception { utc.testStaticProperty();

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6753 - trunk/portlet/src/main/org/jboss/portal/test/framework/portlet.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-19 14:14:33 -0400 (Mon, 19 Mar 2007) New Revision: 6753 Added: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java Log: allows portlet container tests to setup test parameters Added: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java (rev 0) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-03-19 18:14:33 UTC (rev 6753) @@ -0,0 +1,143 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.portlet; + +import org.jboss.portal.common.test.info.TestInfo; +import org.jboss.portal.common.test.info.TestContainerInfo; +import org.jboss.portal.common.test.info.TestItemInfo; +import org.jboss.portal.common.test.info.TestParameterInfo; +import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.common.test.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; +import org.jboss.portal.test.framework.driver.http.HttpTestDriver; +import org.jboss.portal.test.framework.driver.http.HttpTestContext; + +import java.util.HashMap; +import java.util.Map; +import java.util.Collections; +import java.util.Iterator; + +/** + * Registry of action sequences. Every sequence is binded with test id + * + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 6720 $ + */ +public class PortletTestDriver implements HttpTestDriver +{ + + /** . */ + private final Map entries; + + /** . */ + protected final TestContainerInfo container; + + /** . */ + private static PortletTestContext context; + + public PortletTestDriver(String name) + { + entries = Collections.synchronizedMap(new HashMap()); + container = new TestContainerInfo(name); + } + + /** + * Adding sequence to registry. Sequence can be null as this will clear the binding + * + * @param testName + * @param portletTest + */ + public void addSequence(String testName, PortletTest portletTest) + { + if (testName == null) + { + throw new IllegalArgumentException("Test name must be provided"); + } + if (portletTest == null) + { + throw new IllegalArgumentException("Portlet test can't be null"); + } + if (entries.containsKey(testName)) + { + throw new IllegalArgumentException("Portlet test cannot be bound twice"); + } + + // + TestInfo test = new TestInfo(testName); + for (Iterator i = portletTest.parameters.iterator();i.hasNext();) + { + String parameterName = (String)i.next(); + test.addParameter(new TestParameterInfo(parameterName)); + } + + // + entries.put(testName, portletTest); + container.addChild(test); + } + + public void removeSequence(String testName) + { + container.removeChild(testName); + } + + public PortletTest getSequence(String testName) + { + if (testName == null) + { + throw new IllegalArgumentException("Test name can't be null"); + } + return (PortletTest)entries.get(testName); + } + + public TestItemInfo getInfo() + { + return container; + } + + public DriverResponse invoke(String testId, DriverCommand command) throws TestDriverException + { + TestInfo info = (TestInfo)getInfo().findItem(testId); + return new InvokeGetResponse("/test/" + info.getName()); + } + + public void pushContext(String testId, HttpTestContext ctx) + { + context = new PortletTestContext(ctx); + } + + public HttpTestContext popContext(String testId) + { + return context.httpTestContext; + } + + /** + * The current portlet test context statically available. + * + * @return the portlet test context. + */ + public static PortletTestContext getPortletTestContext() + { + return context; + } +} Property changes on: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java ___________________________________________________________________ Name: svn:executable + *

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6752 - in trunk: portlet/src/main/org/jboss/portal/test/framework/portlet/basictests and 43 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-19 14:12:24 -0400 (Mon, 19 Mar 2007) New Revision: 6752 Added: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestParameters.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java Removed: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java trunk/portlet-server/src/resources/test-sar/META-INF/jboss-service.xml trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java Log: allows portlet container tests to setup test parameters Copied: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java (from rev 6720, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java) =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java (rev 0) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -0,0 +1,145 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.portlet; + +import org.jboss.portal.test.framework.server.NodeId; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.HashSet; + +/** + * Keeps sequents of TestActions for one test. Actions are binded to specific request counts with Jointcuts + * + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision$ + */ +public class PortletTest +{ + + /** . */ + private Map actionMap; + + /** . */ + Set parameters; + + public PortletTest() + { + actionMap = new HashMap(); + parameters = new HashSet(); + } + + public void addParameter(String parameterName) + { + parameters.add(parameterName); + } + + public void addAction(int requestCount, Joinpoint joinpoint, TestAction action) + { + addAction(requestCount, NodeId.DEFAULT, joinpoint, action); + } + + public void addAction(int requestCount, NodeId nodeId, Joinpoint joinpoint, TestAction action) + { + if (action == null) + { + throw new IllegalArgumentException("Action can't be null"); + } + Key key = new Key(requestCount, nodeId, joinpoint); + if (actionMap.containsKey(key)) + { + throw new IllegalStateException("Action for this joinpoint already defined in provided request count"); + } + else + { + actionMap.put(key, action); + } + } + + public TestAction getAction(int requestCount, Joinpoint joinpoint) + { + return getAction(requestCount, NodeId.DEFAULT, joinpoint); + } + + public TestAction getAction(int requestCount, NodeId nodeId, Joinpoint joinpoint) + { + Key key = new Key(requestCount, nodeId, joinpoint); + return (TestAction)actionMap.get(key); + } + + private static class Key + { + + /** . */ + private final int requestCount; + + /** . */ + private final NodeId nodeId; + + /** . */ + private final Joinpoint joinpoint; + + public Key(int requestCount, NodeId nodeId, Joinpoint joinpoint) + { + if (requestCount < 0) + { + throw new IllegalArgumentException("Request Number must be positive"); + } + if (nodeId == null) + { + throw new IllegalArgumentException("No node id provided"); + } + if (joinpoint == null) + { + throw new IllegalArgumentException("Joinpoint can't be null"); + } + this.requestCount = requestCount; + this.nodeId = nodeId; + this.joinpoint = joinpoint; + } + + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o instanceof Key) + { + Key that = (Key)o; + return this.requestCount == that.requestCount && this.joinpoint.equals(that.joinpoint) && this.nodeId.equals(that.nodeId); + } + return false; + } + + public int hashCode() + { + int result; + result = requestCount; + result = 29 * result + nodeId.hashCode(); + result = 29 * result + joinpoint.hashCode(); + return result; + } + } +} Property changes on: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -1,75 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.framework.portlet; - -import org.jboss.portal.common.test.driver.TestDriverRegistry; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PortletTestDriver -{ - - /** . */ - private TestDriverRegistry testDriverRegistry; - - /** . */ - public static PortletTestContext context; - - /** . */ - private static PortletTestDriver instance; - - public TestDriverRegistry getTestDriverRegistry() - { - return testDriverRegistry; - } - - public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry) - { - this.testDriverRegistry = testDriverRegistry; - } - - public void start() throws Exception - { - if (instance != null) - { - throw new IllegalStateException("A sequence registry already exist"); - } - instance = this; - } - - public void stop() throws Exception - { - instance = null; - } - - public static PortletTestDriver getInstance() throws IllegalStateException - { - if (instance == null) - { - throw new IllegalStateException("No existing instance"); - } - return instance; - } -} Added: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestParameters.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestParameters.java (rev 0) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestParameters.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -0,0 +1,42 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.portlet; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PortletTestParameters +{ + + /** + * Defines the behavior of the portal with respect to the state management behavior + * when the portal calls the portlet container. Legal values are "mutable" and "immutable". + * The "mutable" literal means that the portal will allow the portlet container to modify + * the state and take in account any clone operation done during the request. The "immutable" + * literal means that the portal will call the portlet container without allowing him to + * perform cloning operations. + */ + public static final String PORTAL_PORTLET_STATE_MANAGEMENT = "portal.portlet_state_management"; + +} Copied: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java (from rev 6720, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java) =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java (rev 0) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -0,0 +1,128 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.portlet; + +import org.apache.log4j.Logger; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.List; +import java.util.ArrayList; +import java.util.regex.Pattern; + +/** + * Builder is invoked when web application initialization process is starting. It builds sequence of tests for this + * action + * + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision$ + */ +public abstract class PortletTestSuite implements ServletContextListener +{ + + /** . */ + private final Logger log = Logger.getLogger(getClass()); + + /** Defines pattern for method names like createXXX. */ + public static String METHOD_PATTERN = "create.*"; + + /** . */ + private final PortletTestDriver driver; + + protected PortletTestSuite() + { + this.driver = new PortletTestDriver(getClass().getName()); + } + + /** + * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into + * SequenceRegistry. Then SequenceRegistry is injected into ServletContext + * + * @param sce + */ + public void contextInitialized(ServletContextEvent sce) + { + + log.info("PortletTestSuite invoked with instance of: '" + this.getClass().getName() + "' class"); + + // We invoke all createXXX methods to fill seqenceRegistry + List methods = introspectMethods(METHOD_PATTERN); + for (int i = 0; i < methods.size(); i++) + { + Method m = (Method)methods.get(i); + try + { + log.info("Invoking method: '" + m.getName() + "' "); + m.invoke(this, new Object[]{driver}); + } + catch (IllegalAccessException e) + { + log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); + e.printStackTrace(); + } + catch (InvocationTargetException e) + { + log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); + e.printStackTrace(); + } + } + + // + sce.getServletContext().setAttribute("SequenceRegistry", driver); + TestDriverRegistryAccess.getInstance().getTestDriverRegistry().register(driver); + } + + public void contextDestroyed(ServletContextEvent sce) + { + sce.getServletContext().removeAttribute("SequenceRegistry"); + TestDriverRegistryAccess.getInstance().getTestDriverRegistry().unregister(driver); + } + + /** + * Returning List of Method objects matching given name pattern + * + * @param namePattern + * @return List of Method objects + */ + private List introspectMethods(String namePattern) + { + List allMethods = Arrays.asList(getClass().getMethods()); + List methods = new ArrayList(allMethods.size()); + for (int i = 0; i < allMethods.size(); i++) + { + Method m = (Method)allMethods.get(i); + if (Pattern.matches(namePattern, m.getName()) && + m.getParameterTypes().length == 1 && + m.getParameterTypes()[0].equals(PortletTestDriver.class) && + Modifier.isPublic(m.getModifiers())) + { + methods.add(m); + } + } + return methods; + } +} Property changes on: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -1,135 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.framework.portlet; - -import org.jboss.portal.test.framework.portlet.TestAction; -import org.jboss.portal.test.framework.server.NodeId; - -import java.util.HashMap; -import java.util.Map; - -/** - * Keeps sequents of TestActions for one test. Actions are binded to specific request counts with Jointcuts - * - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision$ - */ -public class Sequence -{ - - /** . */ - private Map actionMap; - - public Sequence() - { - actionMap = new HashMap(); - } - - public void addAction(int requestCount, Joinpoint joinpoint, TestAction action) - { - addAction(requestCount, NodeId.DEFAULT, joinpoint, action); - } - - public void addAction(int requestCount, NodeId nodeId, Joinpoint joinpoint, TestAction action) - { - if (action == null) - { - throw new IllegalArgumentException("Action can't be null"); - } - Key key = new Key(requestCount, nodeId, joinpoint); - if (actionMap.containsKey(key)) - { - throw new IllegalStateException("Action for this joinpoint already defined in provided request count"); - } - else - { - actionMap.put(key, action); - } - } - - public TestAction getAction(int requestCount, Joinpoint joinpoint) - { - return getAction(requestCount, NodeId.DEFAULT, joinpoint); - } - - public TestAction getAction(int requestCount, NodeId nodeId, Joinpoint joinpoint) - { - Key key = new Key(requestCount, nodeId, joinpoint); - return (TestAction)actionMap.get(key); - } - - private static class Key - { - - /** . */ - private final int requestCount; - - /** . */ - private final NodeId nodeId; - - /** . */ - private final Joinpoint joinpoint; - - public Key(int requestCount, NodeId nodeId, Joinpoint joinpoint) - { - if (requestCount < 0) - { - throw new IllegalArgumentException("Request Number must be positive"); - } - if (nodeId == null) - { - throw new IllegalArgumentException("No node id provided"); - } - if (joinpoint == null) - { - throw new IllegalArgumentException("Joinpoint can't be null"); - } - this.requestCount = requestCount; - this.nodeId = nodeId; - this.joinpoint = joinpoint; - } - - public boolean equals(Object o) - { - if (this == o) - { - return true; - } - if (o instanceof Key) - { - Key that = (Key)o; - return this.requestCount == that.requestCount && this.joinpoint.equals(that.joinpoint) && this.nodeId.equals(that.nodeId); - } - return false; - } - - public int hashCode() - { - int result; - result = requestCount; - result = 29 * result + nodeId.hashCode(); - result = 29 * result + joinpoint.hashCode(); - return result; - } - } -} Deleted: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -1,128 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.framework.portlet; - -import org.apache.log4j.Logger; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Arrays; -import java.util.List; -import java.util.ArrayList; -import java.util.regex.Pattern; - -/** - * Builder is invoked when web application initialization process is starting. It builds sequence of tests for this - * action - * - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision$ - */ -public abstract class SequenceRegistryBuilder implements ServletContextListener -{ - - /** . */ - private final Logger log = Logger.getLogger(getClass()); - - /** Defines pattern for method names like createXXX. */ - public static String METHOD_PATTERN = "create.*"; - - /** . */ - private final SequenceRegistry registry; - - protected SequenceRegistryBuilder() - { - this.registry = new SequenceRegistry(getClass().getName()); - } - - /** - * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into - * SequenceRegistry. Then SequenceRegistry is injected into ServletContext - * - * @param sce - */ - public void contextInitialized(ServletContextEvent sce) - { - - log.info("RegistryBuilder invoked with instance of: '" + this.getClass().getName() + "' class"); - - // We invoke all createXXX methods to fill seqenceRegistry - List methods = introspectMethods(SequenceRegistryBuilder.METHOD_PATTERN); - for (int i = 0; i < methods.size(); i++) - { - Method m = (Method)methods.get(i); - try - { - log.info("Invoking method: '" + m.getName() + "' "); - m.invoke(this, new Object[]{registry}); - } - catch (IllegalAccessException e) - { - log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); - e.printStackTrace(); - } - catch (InvocationTargetException e) - { - log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); - e.printStackTrace(); - } - } - - // - sce.getServletContext().setAttribute("SequenceRegistry", registry); - PortletTestDriver.getInstance().getTestDriverRegistry().register(registry); - } - - public void contextDestroyed(ServletContextEvent sce) - { - sce.getServletContext().removeAttribute("SequenceRegistry"); - PortletTestDriver.getInstance().getTestDriverRegistry().unregister(registry); - } - - /** - * Returning List of Method objects matching given name pattern - * - * @param namePattern - * @return List of Method objects - */ - private List introspectMethods(String namePattern) - { - List allMethods = Arrays.asList(getClass().getMethods()); - List methods = new ArrayList(allMethods.size()); - for (int i = 0; i < allMethods.size(); i++) - { - Method m = (Method)allMethods.get(i); - if (Pattern.matches(namePattern, m.getName()) && - m.getParameterTypes().length == 1 && - m.getParameterTypes()[0].equals(SequenceRegistry.class) && - Modifier.isPublic(m.getModifiers())) - { - methods.add(m); - } - } - return methods; - } -} Copied: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java (from rev 6720, trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java) =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java (rev 0) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -0,0 +1,72 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.portlet; + +import org.jboss.portal.common.test.driver.TestDriverRegistry; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class TestDriverRegistryAccess +{ + + /** . */ + private static TestDriverRegistry testDriverRegistry; + + /** . */ + private static TestDriverRegistryAccess instance; + + public TestDriverRegistry getTestDriverRegistry() + { + return testDriverRegistry; + } + + public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry) + { + this.testDriverRegistry = testDriverRegistry; + } + + public void start() throws Exception + { + if (instance != null) + { + throw new IllegalStateException("A sequence registry already exist"); + } + instance = this; + } + + public void stop() throws Exception + { + instance = null; + } + + public static TestDriverRegistryAccess getInstance() throws IllegalStateException + { + if (instance == null) + { + throw new IllegalStateException("No existing instance"); + } + return instance; + } +} Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -46,12 +46,12 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class BasicTestSequenceBuilder extends SequenceRegistryBuilder +public class BasicTestSequenceBuilder extends PortletTestSuite { - public void createOnePortletTestCase(SequenceRegistry registry) + public void createOnePortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("OnePortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -62,9 +62,9 @@ }); } - public void createFailurePortletTestCase(SequenceRegistry registry) + public void createFailurePortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("FailurePortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -75,9 +75,9 @@ }); } - public void createFailAssertPortletTestCase(SequenceRegistry registry) + public void createFailAssertPortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("FailAssertPortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -89,9 +89,9 @@ }); } - public void createFailAssertInActionPortletTestCase(SequenceRegistry registry) + public void createFailAssertInActionPortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("FailAssertInActionPortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -120,9 +120,9 @@ }); } - public void createTwoPortletTestCase(SequenceRegistry registry) + public void createTwoPortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TwoPortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -142,9 +142,9 @@ }); } - public void createTwoResultPortletTestCase(SequenceRegistry registry) + public void createTwoResultPortletTestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TwoResultPortlet", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -23,7 +23,7 @@ package org.jboss.portal.test.framework.portlet.basictests.classes; import junit.framework.TestCase; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; import java.util.LinkedList; import java.util.List; @@ -36,7 +36,7 @@ { public void testBuilder() { - final SequenceRegistry sr = new SequenceRegistry("toto"); + final PortletTestDriver sr = new PortletTestDriver("toto"); final List invoked = new LinkedList(); Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -23,8 +23,8 @@ package org.jboss.portal.test.framework.portlet.basictests.classes; import junit.framework.TestCase; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -34,11 +34,11 @@ { public void testSequenceRegistry() { - Sequence sequence = new Sequence(); + PortletTest portletTest = new PortletTest(); - SequenceRegistry sr = new SequenceRegistry("toto"); + PortletTestDriver sr = new PortletTestDriver("toto"); - sr.addSequence("testA", sequence); + sr.addSequence("testA", portletTest); assertNull(sr.getSequence("blah")); assertNull(sr.getSequence("")); Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,7 +26,7 @@ import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; -import org.jboss.portal.test.framework.portlet.Sequence; +import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; @@ -43,7 +43,7 @@ { public void testSequence() { - Sequence sequence = new Sequence(); + PortletTest portletTest = new PortletTest(); Joinpoint joinpoint = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER); TestAction action = new PortletRenderTestAction() { @@ -54,16 +54,16 @@ }; - sequence.addAction(1, joinpoint, action); + portletTest.addAction(1, joinpoint, action); - assertNull(sequence.getAction(2, joinpoint)); - assertNull(sequence.getAction(0, joinpoint)); - assertNotNull(sequence.getAction(1, joinpoint)); + assertNull(portletTest.getAction(2, joinpoint)); + assertNull(portletTest.getAction(0, joinpoint)); + assertNotNull(portletTest.getAction(1, joinpoint)); - assertTrue(sequence.getAction(1, joinpoint) instanceof PortletRenderTestAction); + assertTrue(portletTest.getAction(1, joinpoint) instanceof PortletRenderTestAction); - sequence.addAction(1, joinpoint, null); - assertNull(sequence.getAction(1, joinpoint)); + portletTest.addAction(1, joinpoint, null); + assertNull(portletTest.getAction(1, joinpoint)); } Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests.classes; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import javax.servlet.ServletContext; @@ -31,22 +31,22 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class TestBuilder extends SequenceRegistryBuilder +public class TestBuilder extends PortletTestSuite { public int counter = 0; - public void createOne(SequenceRegistry registry) + public void createOne(PortletTestDriver registry) { counter++; } - public void createTwo(SequenceRegistry registry) + public void createTwo(PortletTestDriver registry) { counter++; } - protected void saveRegistry(SequenceRegistry registry, ServletContext context) + protected void saveRegistry(PortletTestDriver registry, ServletContext context) { //nothing } Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.components; +import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTestDriver; -import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.test.driver.response.FailureResponse; @@ -66,7 +66,7 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException { - PortletTestContext context = PortletTestDriver.context; + PortletTestContext context = PortletTestDriver.getPortletTestContext(); if (testName.equals(context.getTestName())) { DriverResponse response; @@ -93,7 +93,7 @@ public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException { - PortletTestContext context = PortletTestDriver.context; + PortletTestContext context = PortletTestDriver.getPortletTestContext(); if (testName.equals(context.getTestName())) { DriverResponse response; Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.components; +import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTestDriver; -import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.common.test.driver.response.ErrorResponse; @@ -103,7 +103,7 @@ public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException { - PortletTestContext context = PortletTestDriver.context; + PortletTestContext context = PortletTestDriver.getPortletTestContext(); if (testName.equals(context.getTestName())) { DriverResponse response; @@ -130,7 +130,7 @@ public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException { - PortletTestContext context = PortletTestDriver.context; + PortletTestContext context = PortletTestDriver.getPortletTestContext(); if (testName.equals(context.getTestName())) { DriverResponse response; Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,12 +26,11 @@ import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.TestAction; -import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.server.NodeId; @@ -135,7 +134,7 @@ */ public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException { - PortletTestContext ctx = PortletTestDriver.context; + PortletTestContext ctx = PortletTestDriver.getPortletTestContext(); // log.debug("Component '" + getComponentId() + "' processAction() method invoked for '" @@ -143,13 +142,13 @@ +ctx.getRequestCount() + "' request count"); // - Sequence sequence = getSequence(ctx.getTestName()); + PortletTest portletTest = getSequence(ctx.getTestName()); // - if (sequence != null) + if (portletTest != null) { // - TestAction action = sequence.getAction(ctx.getRequestCount(), NodeId.locate(), actionJoinpoint); + TestAction action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), actionJoinpoint); // if (action == null) @@ -185,7 +184,7 @@ */ public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException { - PortletTestContext ctx = PortletTestDriver.context; + PortletTestContext ctx = PortletTestDriver.getPortletTestContext(); // log.debug("Component '" + getComponentId() + "' render() method invoked for '" @@ -201,10 +200,10 @@ // Get the action TestAction action = null; - Sequence sequence = getSequence(ctx.getTestName()); - if (sequence != null) + PortletTest portletTest = getSequence(ctx.getTestName()); + if (portletTest != null) { - action = sequence.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinpoint); + action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinpoint); } @@ -252,9 +251,9 @@ * * @return SequenceRegistry */ - private SequenceRegistry getSequenceRegistry() + private PortletTestDriver getSequenceRegistry() { - return (SequenceRegistry)getPortletContext().getAttribute("SequenceRegistry"); + return (PortletTestDriver)getPortletContext().getAttribute("SequenceRegistry"); } /** @@ -263,9 +262,9 @@ * @return * @throws PortletException if there is no SequenceRegistry */ - private Sequence getSequence(String testId) throws PortletException + private PortletTest getSequence(String testId) throws PortletException { - SequenceRegistry registry = getSequenceRegistry(); + PortletTestDriver registry = getSequenceRegistry(); if (registry == null) { log.error("No SequenceRegistry object found in current context"); Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,11 +25,10 @@ import org.apache.log4j.Logger; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction; import org.jboss.portal.test.framework.portlet.TestAction; -import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.server.NodeId; @@ -94,7 +93,7 @@ */ protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - PortletTestContext ctx = PortletTestDriver.context; + PortletTestContext ctx = PortletTestDriver.getPortletTestContext(); // log.info("Component '" + getComponentId() + "' service() method invoked for '" @@ -107,10 +106,10 @@ reset(); } - Sequence sequence = getSequence(ctx.getTestName()); - if (sequence != null) + PortletTest portletTest = getSequence(ctx.getTestName()); + if (portletTest != null) { - TestAction action = sequence.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint()); + TestAction action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint()); if (action != null && action instanceof ServletServiceTestAction) { log.info("Found Action for this jointpoint"); @@ -143,9 +142,9 @@ * * @return SequenceRegistry */ - private SequenceRegistry getSequenceRegistry() + private PortletTestDriver getSequenceRegistry() { - return (SequenceRegistry)getServletContext().getAttribute("SequenceRegistry"); + return (PortletTestDriver)getServletContext().getAttribute("SequenceRegistry"); } /** @@ -154,9 +153,9 @@ * @return * @throws javax.servlet.ServletException if there is no SequenceRegistry */ - protected Sequence getSequence(String testId) throws ServletException + protected PortletTest getSequence(String testId) throws ServletException { - SequenceRegistry registry = getSequenceRegistry(); + PortletTestDriver registry = getSequenceRegistry(); if (registry == null) { log.info("No SequenceRegistry object found in current context"); Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -48,11 +48,11 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class SessionSequenceBuilder extends SequenceRegistryBuilder +public class SessionSequenceBuilder extends PortletTestSuite { - public void createTestReplicateImmutableValue(SequenceRegistry registry) + public void createTestReplicateImmutableValue(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestReplicateImmutableValue", seq); seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -79,9 +79,9 @@ }); } - public void createTestReplicateMutableValue(SequenceRegistry registry) + public void createTestReplicateMutableValue(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestReplicateMutableValue", seq); seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -110,9 +110,9 @@ }); } - public void createTestModifyExistingAttributeWithoutExplicitSetDoesNotReplicate(SequenceRegistry registry) + public void createTestModifyExistingAttributeWithoutExplicitSetDoesNotReplicate(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicate", seq); seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -43,7 +43,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class ActionRequestSequenceBuilder extends SequenceRegistryBuilder +public class ActionRequestSequenceBuilder extends PortletTestSuite { //******************************** @@ -54,9 +54,9 @@ * ActionRequest.BASIC_AUTH ActionRequest.CLIENT_CERT_AUTH ActionRequest.DIGEST_AUTH ActionRequest.FORM_AUTH * ActionRequest.USER_INFO */ - public void createConstantsCase(SequenceRegistry registry) + public void createConstantsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constants", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -74,9 +74,9 @@ } /** ActionRequest.getProperty() ActionRequest.getProperties() */ - public void createPropertyCase(SequenceRegistry registry) + public void createPropertyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Property", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -121,9 +121,9 @@ } /** ActionRequest.getAttribute() ActionRequest.setAttribute() ActionRequest.removeAttribute() */ - public void createAttributeCase(SequenceRegistry registry) + public void createAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Attribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -178,9 +178,9 @@ } /** ActionRequest.getParameter() ActionRequest.getParameterValues() */ - public void createParameterCase(SequenceRegistry registry) + public void createParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Parameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -45,13 +45,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class ActionResponseSequenceBuilder extends SequenceRegistryBuilder +public class ActionResponseSequenceBuilder extends PortletTestSuite { /** ActionResponse.setRenderParameter() ActionResponse.setRenderParameter() ActionResponse.setRenderParameters() */ - public void createRenderParameterCase(SequenceRegistry registry) + public void createRenderParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RenderParameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -200,9 +200,9 @@ //************************ /** ActionResponse.setProperty() ActionResponse.addProperty() */ - public void createPropertyCase(SequenceRegistry registry) + public void createPropertyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Property", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -247,9 +247,9 @@ } /** ActionResponse.encodeURL() */ - public void createEncodeURLCase(SequenceRegistry registry) + public void createEncodeURLCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("EncodeURL", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -44,12 +44,12 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortalContextSequenceBuilder extends SequenceRegistryBuilder +public class PortalContextSequenceBuilder extends PortletTestSuite { /** PortalContext.getSupportedPortletModes() */ - public void createSupportedPortletModesCase(SequenceRegistry registry) + public void createSupportedPortletModesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SupportedPortletModes", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -76,9 +76,9 @@ } /** PortalContext.getSupportedWindowStates() */ - public void createSupportedWindowStatesCase(SequenceRegistry registry) + public void createSupportedWindowStatesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SupportedWindowStates", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -106,9 +106,9 @@ } /** PortalContext.getPortalInfo() */ - public void createPortalInfoCase(SequenceRegistry registry) + public void createPortalInfoCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortalInfo", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -125,9 +125,9 @@ } /** PortalContext.getProperty() */ - public void createPropertyCase(SequenceRegistry registry) + public void createPropertyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Property", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; @@ -46,13 +46,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletConfigSequenceBuilder extends SequenceRegistryBuilder +public class PortletConfigSequenceBuilder extends PortletTestSuite { /** @portlet.api assert="PortletConfig.getPortletName()" */ - public void createPortletNameCase(SequenceRegistry registry) + public void createPortletNameCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletName", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -69,9 +69,9 @@ } /** @portlet.api assert="PortletConfig.getPortletContext()" */ - public void createPortletContextCase(SequenceRegistry registry) + public void createPortletContextCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletContext", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -92,9 +92,9 @@ } /** @portlet.api assert="PortletConfig.getInitParameter()" */ - public void createInitParameterCase(SequenceRegistry registry) + public void createInitParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InitParameter", seq); seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -129,9 +129,9 @@ } /** @portlet.api assert="PortletConfig.getInitParameterNames()" */ - public void createInitParameterNamesCase(SequenceRegistry registry) + public void createInitParameterNamesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InitParameterNames", seq); //this portlet has no init params defined Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.TestContants; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -44,7 +44,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletContextSequenceBuilder extends SequenceRegistryBuilder +public class PortletContextSequenceBuilder extends PortletTestSuite { /** . */ @@ -54,9 +54,9 @@ private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE); /** PortletContext.getServerInfo() */ - public void createServerInfoCase(SequenceRegistry registry) + public void createServerInfoCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ServerInfo", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -72,9 +72,9 @@ } /** PortletContext.getRequestDispatcher() PortletContext.getNamedDispatcher() */ - public void createDispatcherCase(SequenceRegistry registry) + public void createDispatcherCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Dispatcher", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -92,9 +92,9 @@ } /** PortletContext.getMinorVersion() PortletContext.getMajorVersion() */ - public void createVersionCase(SequenceRegistry registry) + public void createVersionCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Version", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -110,9 +110,9 @@ } /** PortletContext.getMimeType() */ - public void createMimeTypeCase(SequenceRegistry registry) + public void createMimeTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("MimeType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -127,9 +127,9 @@ } /** PortletContext.getResourcePaths() */ - public void createResourcePathsCase(SequenceRegistry registry) + public void createResourcePathsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResourcePaths", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -149,9 +149,9 @@ } /** PortletContext.getResource() */ - public void createResourceCase(SequenceRegistry registry) + public void createResourceCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Resource", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -188,9 +188,9 @@ } /** PortletContext.getAttribute() PortletContext.removeAttribute() PortletContext.setAttribute() */ - public void createAttributeCase(SequenceRegistry registry) + public void createAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Attribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -236,9 +236,9 @@ } /** PortletContext.getInitParameter() */ - public void createInitParameterCase(SequenceRegistry registry) + public void createInitParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InitParameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -265,9 +265,9 @@ } /** PortletContext.getPortletContextName() */ - public void createPortletContextNameCase(SequenceRegistry registry) + public void createPortletContextNameCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletContextName", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -40,13 +40,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletModeSequenceBuilder extends SequenceRegistryBuilder +public class PortletModeSequenceBuilder extends PortletTestSuite { /** @portlet.api assert="PortletMode.EDIT, PortletMode.HELP, PortletMode.VIEW" */ - public void createModesCase(SequenceRegistry registry) + public void createModesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Modes", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -62,9 +62,9 @@ } /** @portlet.api assert="PortletMode.PortletMode()" */ - public void createConstructorCase(SequenceRegistry registry) + public void createConstructorCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constructor", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -82,9 +82,9 @@ } /** @portlet.api assert="PortletConfig.equals()" */ - public void createEqualsCase(SequenceRegistry registry) + public void createEqualsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Equals", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -106,9 +106,9 @@ } /** @portlet.api assert="PortletConfig.hashCode()" */ - public void createHashCodeCase(SequenceRegistry registry) + public void createHashCodeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("HashCode", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -49,13 +49,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletPreferencesSequenceBuilder extends SequenceRegistryBuilder +public class PortletPreferencesSequenceBuilder extends PortletTestSuite { /** PortletPreferences.isReadOnly() */ - public void createReadOnlyCase(SequenceRegistry registry) + public void createReadOnlyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ReadOnly", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -80,9 +80,9 @@ * PortletPreferences.getValue() PortletPreferences.getValues() PortletPreferences.setValue() * PortletPreferences.setValues() */ - public void createValueCase(SequenceRegistry registry) + public void createValueCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Value", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -195,9 +195,9 @@ } /** PortletPreferences.reset() */ - public void createResetNullKeyThrowsNPE(SequenceRegistry registry) + public void createResetNullKeyThrowsNPE(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResetNullKeyThrowsNPE", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -220,9 +220,9 @@ /** * */ - public void createZeroLengthArrayValue(SequenceRegistry registry) + public void createZeroLengthArrayValue(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ZeroLengthArrayValue", seq); seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -40,13 +40,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletSessionSequenceBuilder extends SequenceRegistryBuilder +public class PortletSessionSequenceBuilder extends PortletTestSuite { /** PortletSession.APPLICATION_SCOPE PortletSession.PORTLET_SCOPE */ - public void createConstantsCase(SequenceRegistry registry) + public void createConstantsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constants", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -60,9 +60,9 @@ } /** PortletSession.getAttribute() */ - public void createGetAttributeCase(SequenceRegistry registry) + public void createGetAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("GetAttribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -117,9 +117,9 @@ } /** PortletSession.getAttributeNames() */ - public void createAttributeNamesCase(SequenceRegistry registry) + public void createAttributeNamesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("AttributeNames", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -159,9 +159,9 @@ } /** PortletSession.getCreationTime() */ - public void createCreationTimeCase(SequenceRegistry registry) + public void createCreationTimeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("CreationTime", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -189,9 +189,9 @@ } /** PortletSession.invalidate() */ - public void createInvalidateCase(SequenceRegistry registry) + public void createInvalidateCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Invalidate", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -217,9 +217,9 @@ } /** PortletSession.isNew() */ - public void createNewCase(SequenceRegistry registry) + public void createNewCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("New", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -247,9 +247,9 @@ } /** PortletSession.removeAttribute() */ - public void createRemoveAttributeCase(SequenceRegistry registry) + public void createRemoveAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RemoveAttribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -307,9 +307,9 @@ } /** PortletSession.setAttribute() */ - public void createSetAttributeCase(SequenceRegistry registry) + public void createSetAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SetAttribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -41,11 +41,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletSessionUtilSequenceBuilder extends SequenceRegistryBuilder +public class PortletSessionUtilSequenceBuilder extends PortletTestSuite { - public void createDecodeAttributeNameCase(SequenceRegistry registry) + public void createDecodeAttributeNameCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("DecodeAttributeName", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -69,9 +69,9 @@ }); } - public void createDecodeScopeCase(SequenceRegistry registry) + public void createDecodeScopeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("DecodeScope", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -42,13 +42,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletURLSequenceBuilder extends SequenceRegistryBuilder +public class PortletURLSequenceBuilder extends PortletTestSuite { /** PortletURL.setParameter() PortletURL.setParameter() PortletURL.setParameters() */ - public void createParameterCase(SequenceRegistry registry) + public void createParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Parameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -39,7 +39,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class RenderRequestSequenceBuilder extends SequenceRegistryBuilder +public class RenderRequestSequenceBuilder extends PortletTestSuite { //******************************** //PortletRequest interface Asserts @@ -49,9 +49,9 @@ * RenderRequest.BASIC_AUTH RenderRequest.CLIENT_CERT_AUTH RenderRequest.DIGEST_AUTH RenderRequest.FORM_AUTH * RenderRequest.USER_INFO */ - public void createConstantsCase(SequenceRegistry registry) + public void createConstantsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constants", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -69,9 +69,9 @@ } /** RenderRequest.getProperty() RenderRequest.getProperties() */ - public void createPropertyCase(SequenceRegistry registry) + public void createPropertyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Property", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -102,9 +102,9 @@ } /** RenderRequest.getAttribute() RenderRequest.setAttribute() RenderRequest.removeAttribute() */ - public void createAttributeCase(SequenceRegistry registry) + public void createAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Attribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -143,9 +143,9 @@ } /** RenderRequest.getParameter() RenderRequest.getParameterValues() */ - public void createParameterCase(SequenceRegistry registry) + public void createParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Parameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -39,13 +39,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class RenderResponseSequenceBuilder extends SequenceRegistryBuilder +public class RenderResponseSequenceBuilder extends PortletTestSuite { /** RenderResponse.EXPIRATION_CACHE */ - public void createConstantsCase(SequenceRegistry registry) + public void createConstantsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constants", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -58,9 +58,9 @@ } /** RenderResponse.setContentType() */ - public void createContentTypeCase(SequenceRegistry registry) + public void createContentTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ContentType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -85,9 +85,9 @@ //************************ /** RenderResponse.setProperty() RenderResponse.addProperty() */ - public void createPropertyCase(SequenceRegistry registry) + public void createPropertyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Property", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -117,9 +117,9 @@ } /** RenderResponse.encodeURL() */ - public void createEncodeURLCase(SequenceRegistry registry) + public void createEncodeURLCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("EncodeURL", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -40,13 +40,13 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class WindowStateSequenceBuilder extends SequenceRegistryBuilder +public class WindowStateSequenceBuilder extends PortletTestSuite { /** @portlet.api assert="WindowState.MINIMIZED WindowState.MAXIMIZED WindowState.NORMAL" */ - public void createStatesCase(SequenceRegistry registry) + public void createStatesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("States", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -62,9 +62,9 @@ } /** @portlet.api assert="WindowState.WindowState()" */ - public void createConstructorCase(SequenceRegistry registry) + public void createConstructorCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Constructor", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -82,9 +82,9 @@ } /** @portlet.api assert="WindowState.equals()" */ - public void createEqualsCase(SequenceRegistry registry) + public void createEqualsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Equals", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -106,9 +106,9 @@ } /** @portlet.api assert="WindowState.hashCode()" */ - public void createHashCodeCase(SequenceRegistry registry) + public void createHashCodeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("HashCode", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.common; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.Joinpoint; -import org.jboss.portal.test.framework.portlet.Sequence; +import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; @@ -53,7 +53,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class AbstractCacheSequenceBuilder extends SequenceRegistryBuilder +public class AbstractCacheSequenceBuilder extends PortletTestSuite { protected final AbstractCacheSequenceBuilder.NavigationalStateConfigurator renderParameterConfigurator = new AbstractCacheSequenceBuilder.NavigationalStateConfigurator() @@ -101,10 +101,10 @@ /** * Overriding the expiration cache to 0 disable the cache on a render or an action/render. */ - protected void createDisableDuringRender(String testName, SequenceRegistry registry, Joinpoint renderjp, Joinpoint actionjp) + protected void createDisableDuringRender(String testName, PortletTestDriver registry, Joinpoint renderjp, Joinpoint actionjp) { final Set calls = new HashSet(); - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence(testName, seq); // @@ -174,7 +174,7 @@ */ protected void createCacheMarkup( String testName, - SequenceRegistry registry, + PortletTestDriver registry, Joinpoint p1renderjp, Joinpoint p1actionjp, Joinpoint p2renderjp, @@ -182,7 +182,7 @@ { final Set calls = new HashSet(); final String[] url = new String[1]; - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence(testName, seq); // @@ -317,14 +317,14 @@ */ protected void createActionInvalidates( String testName, - SequenceRegistry registry, + PortletTestDriver registry, Joinpoint p1renderjp, Joinpoint p1actionjp, Joinpoint p2renderjp) { final Set calls = new HashSet(); final String[] url = new String[1]; - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence(testName, seq); // Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction; @@ -53,15 +53,15 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class DispatcherSequenceBuilder extends SequenceRegistryBuilder +public class DispatcherSequenceBuilder extends PortletTestSuite { public static final String SERVLET_A_URI = "/test-jsr168-ext-dispatcher/universalServletA"; public static final String SERVLET_B_URI = "/test-jsr168-ext-dispatcher/universalServletB"; - public void createGetRequestURICase(SequenceRegistry registry) + public void createGetRequestURICase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("GetRequestURI", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -86,9 +86,9 @@ } /** Show that we can access request headers from the portlet request properties. */ - public void createRequestHeaderAccess(SequenceRegistry registry) + public void createRequestHeaderAccess(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestHeaderAccess", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.expiringcache; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestContext; -import org.jboss.portal.test.framework.portlet.Sequence; +import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.portlet.framework.UTP1; @@ -60,27 +60,27 @@ public class ExpiringCacheSequenceBuilder extends AbstractCacheSequenceBuilder { - public void createDisableDuringRenderExpiringCache(SequenceRegistry registry) + public void createDisableDuringRenderExpiringCache(PortletTestDriver registry) { createDisableDuringRender("DisableDuringRenderExpiringCache", registry, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT); } - public void createActionInvalidatesExpiringCache(SequenceRegistry registry) + public void createActionInvalidatesExpiringCache(PortletTestDriver registry) { createActionInvalidates("ActionInvalidatesExpiringCache", registry, UTP2.RENDER_JOINPOINT, UTP2.ACTION_JOINPOINT, UTP3.RENDER_JOINPOINT); } - public void createExpiringCacheWithRenderParameters(SequenceRegistry registry) + public void createExpiringCacheWithRenderParameters(PortletTestDriver registry) { createCacheMarkup("ExpiringCacheWithRenderParameters", registry, UTP4.RENDER_JOINPOINT, UTP4.ACTION_JOINPOINT, UTP5.RENDER_JOINPOINT, renderParameterConfigurator); } - public void createExpiringCacheWithWindowState(SequenceRegistry registry) + public void createExpiringCacheWithWindowState(PortletTestDriver registry) { createCacheMarkup("ExpiringCacheWithWindowState", registry, UTP6.RENDER_JOINPOINT, UTP6.ACTION_JOINPOINT, UTP7.RENDER_JOINPOINT, windowStateConfigurator); } - public void createExpiringCacheWithPortletMode(SequenceRegistry registry) + public void createExpiringCacheWithPortletMode(PortletTestDriver registry) { createCacheMarkup("ExpiringCacheWithPortletMode", registry, UTP8.RENDER_JOINPOINT, UTP8.ACTION_JOINPOINT, UTP9.RENDER_JOINPOINT, portletModeConfigurator); } @@ -88,11 +88,11 @@ /** * Check that content is cached for at most 5 seconds in various situations. */ - public void createExpiringCache(SequenceRegistry registry) + public void createExpiringCache(PortletTestDriver registry) { final Set calls = new HashSet(); final String[] url = new String[1]; - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ExpiringCache", seq); // Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -32,7 +32,7 @@ import org.jboss.portal.test.portlet.framework.UTP7; import org.jboss.portal.test.portlet.framework.UTP8; import org.jboss.portal.test.portlet.framework.UTP9; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -41,27 +41,27 @@ public class NeverExpiringCacheSequenceBuilder extends AbstractCacheSequenceBuilder { - public void createDisableDuringRenderNeverExpiringCache(SequenceRegistry registry) + public void createDisableDuringRenderNeverExpiringCache(PortletTestDriver registry) { createDisableDuringRender("DisableDuringRenderNeverExpiringCache", registry, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT); } - public void createActionInvalidatesNeverExpiringCache(SequenceRegistry registry) + public void createActionInvalidatesNeverExpiringCache(PortletTestDriver registry) { createActionInvalidates("ActionInvalidatesNeverExpiringCache", registry, UTP2.RENDER_JOINPOINT, UTP2.ACTION_JOINPOINT, UTP3.RENDER_JOINPOINT); } - public void createNeverExpiringCacheWithRenderParameters(SequenceRegistry registry) + public void createNeverExpiringCacheWithRenderParameters(PortletTestDriver registry) { createCacheMarkup("NeverExpiringCacheWithRenderParameters", registry, UTP4.RENDER_JOINPOINT, UTP4.ACTION_JOINPOINT, UTP5.RENDER_JOINPOINT, renderParameterConfigurator); } - public void createNeverExpiringCacheWithWindowState(SequenceRegistry registry) + public void createNeverExpiringCacheWithWindowState(PortletTestDriver registry) { createCacheMarkup("NeverExpiringCacheWithWindowState", registry, UTP6.RENDER_JOINPOINT, UTP6.ACTION_JOINPOINT, UTP7.RENDER_JOINPOINT, windowStateConfigurator); } - public void createNeverExpiringCacheWithPortletMode(SequenceRegistry registry) + public void createNeverExpiringCacheWithPortletMode(PortletTestDriver registry) { createCacheMarkup("NeverExpiringCacheWithPortletMode", registry, UTP8.RENDER_JOINPOINT, UTP8.ACTION_JOINPOINT, UTP9.RENDER_JOINPOINT, portletModeConfigurator); } Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.nocache; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.Sequence; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.Joinpoint; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -34,7 +34,6 @@ import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP3; import org.jboss.portal.test.portlet.framework.UTP4; -import org.jboss.portal.test.portlet.framework.UTP5; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.response.ErrorResponse; @@ -46,7 +45,6 @@ import javax.portlet.PortletException; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; -import javax.portlet.PortletURL; import java.util.Set; import java.util.HashSet; import java.io.IOException; @@ -55,15 +53,15 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class NoCacheSequenceBuilder extends SequenceRegistryBuilder +public class NoCacheSequenceBuilder extends PortletTestSuite { - public void createExplicitNoCache(SequenceRegistry registry) + public void createExplicitNoCache(PortletTestDriver registry) { create("ExplicitNoCache", registry, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT, UTP2.RENDER_JOINPOINT); } - public void createImplicitNoCache(SequenceRegistry registry) + public void createImplicitNoCache(PortletTestDriver registry) { create("ImplicitNoCache", registry, UTP3.RENDER_JOINPOINT, UTP3.ACTION_JOINPOINT, UTP4.RENDER_JOINPOINT); } @@ -74,14 +72,14 @@ */ private void create( String testName, - SequenceRegistry registry, + PortletTestDriver registry, Joinpoint p1renderjp, Joinpoint p1actionjp, Joinpoint p2renderjp) { final Set calls = new HashSet(); final String[] url = new String[1]; - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence(testName, seq); // Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; @@ -46,11 +46,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletConfigSequenceBuilder extends SequenceRegistryBuilder +public class PortletConfigSequenceBuilder extends PortletTestSuite { - public void createGetResourceBundleDuringInit(SequenceRegistry registry) + public void createGetResourceBundleDuringInit(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("GetResourceBundleDuringInit", seq); seq.addAction(0, GetResourceBundleDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -67,9 +67,9 @@ } - public void createResourceBundleCascade(SequenceRegistry registry) + public void createResourceBundleCascade(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResourceBundleCascade", seq); seq.addAction(0, ResourceBundleCascadePortlet.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -142,9 +142,9 @@ }); } - public void createResourceBundle(SequenceRegistry registry) + public void createResourceBundle(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResourceBundle", seq); seq.addAction(0, ResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -47,11 +47,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletModeSequenceBuilder extends SequenceRegistryBuilder +public class PortletModeSequenceBuilder extends PortletTestSuite { - public void createTestActionWithPortletModeCase(SequenceRegistry registry) + public void createTestActionWithPortletModeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestActionWithPortletMode", seq); seq.addAction(0, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -81,9 +81,9 @@ }); } - public void createTestDuringActionCase(SequenceRegistry registry) + public void createTestDuringActionCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestDuringAction", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -114,9 +114,9 @@ } - public void createTestDuringRenderCase(SequenceRegistry registry) + public void createTestDuringRenderCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestDuringRender", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -28,9 +28,9 @@ import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -58,7 +58,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletRequestsSequenceBuilder extends SequenceRegistryBuilder +public class PortletRequestsSequenceBuilder extends PortletTestSuite { private final byte[] byteContent = {65, 66, 67, 68, 69, 70}; @@ -67,9 +67,9 @@ * 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. */ - public void createActionRequestUseFormCase(SequenceRegistry registry) + public void createActionRequestUseFormCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ActionRequestUseForm", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -137,9 +137,9 @@ * Test that a POST request having a content type not set to x-www-form-urlencoded will make the body content * available as an input stream. */ - public void createActionRequestUseInputStreamCase(SequenceRegistry registry) + public void createActionRequestUseInputStreamCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ActionRequestUseInputStream", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -216,9 +216,9 @@ * 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. */ - public void createActionRequestUseReaderCase(SequenceRegistry registry) + public void createActionRequestUseReaderCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ActionRequestUseReader", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -292,9 +292,9 @@ * This case works with two portlets involved in the same render request. To pass the test, the assert result of the * two portlets must pass. */ - public void createRequestAttributeCase(SequenceRegistry registry) + public void createRequestAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestAttribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -327,9 +327,9 @@ * This case works with two portlets involved in the same render request. To pass the test, the assert result of the * two portlets must pass. */ - public void createRequestAttributeScopingCase(SequenceRegistry registry) + public void createRequestAttributeScopingCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestAttributeScoping", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -342,9 +342,9 @@ }); } - public void createRequestParameterCase(SequenceRegistry registry) + public void createRequestParameterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestParameter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -396,9 +396,9 @@ /** Show that we can access request headers from the portlet request properties. */ - public void createRequestHeaderAccess(SequenceRegistry registry) + public void createRequestHeaderAccess(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestHeaderAccess", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -39,11 +39,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletResponsesSequenceBuilder extends SequenceRegistryBuilder +public class PortletResponsesSequenceBuilder extends PortletTestSuite { - public void createContentTypeCase(SequenceRegistry registry) + public void createContentTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ContentType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -51,7 +51,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PreferencesSequenceBuilder extends SequenceRegistryBuilder +public class PreferencesSequenceBuilder extends PortletTestSuite { /** @@ -59,11 +59,12 @@ * * @param registry */ - public void createIsReadOnlyCase(SequenceRegistry registry) + public void createIsReadOnlyCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("IsReadOnly", seq); + seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction() { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) @@ -100,9 +101,9 @@ }); } - public void createStoreMustPersistAllChangesCase(SequenceRegistry registry) + public void createStoreMustPersistAllChangesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("StoreMustPersistAllChanges", seq); seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -169,9 +170,9 @@ }); } - public void createMapCase(SequenceRegistry registry) + public void createMapCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("Map", seq); seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -54,7 +54,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class SessionSequenceBuilder extends SequenceRegistryBuilder +public class SessionSequenceBuilder extends PortletTestSuite { /** @@ -62,9 +62,9 @@ * * @param registry */ - public void createSessionDoesNotExistBeforeItIsRequested(SequenceRegistry registry) + public void createSessionDoesNotExistBeforeItIsRequested(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SessionDoesNotExistBeforeItIsRequested", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -82,9 +82,9 @@ * * @param registry */ - public void createObtainNonNullSessionUsingCreateEqualsFalse(SequenceRegistry registry) + public void createObtainNonNullSessionUsingCreateEqualsFalse(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ObtainNonNullSessionUsingCreateEqualsFalse", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -127,9 +127,9 @@ * 1/ portlet put key=value in the http session 2/ portlet ask the client to perform get on /servlet 3/ servlet check * that key=value */ - public void createCrossContextSessionAttributeCase(SequenceRegistry registry) + public void createCrossContextSessionAttributeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("CrossContextSessionAttribute", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.apache.log4j.Logger; import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -39,11 +39,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 5113 $ */ -public class Log4jSequenceBuilder extends SequenceRegistryBuilder +public class Log4jSequenceBuilder extends PortletTestSuite { - public void createLog4j(SequenceRegistry registry) + public void createLog4j(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TestLog4j", seq); seq.addAction(0, LoggingPortlet.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -57,7 +57,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class DispatcherSequenceBuilder extends SequenceRegistryBuilder +public class DispatcherSequenceBuilder extends PortletTestSuite { public static final String SERVLET_A_URI = "/test-jsr168-dispatcher/universalServletA"; @@ -71,9 +71,9 @@ * name of a servlet known to the PortletContext of the portlet application. If no resource can be resolved based on * the given path or name the methods must return null" */ - public void createObtainingDispatcherCase(SequenceRegistry registry) + public void createObtainingDispatcherCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ObtainingDispatcher", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -124,9 +124,9 @@ * @portlet.specification assert="SPEC:123 - The parameters associated with a PortletRequestDispatcher are scoped to * apply only for the duration of the include call." */ - public void createQueryStringInRequestDispatcherCase(SequenceRegistry registry) + public void createQueryStringInRequestDispatcherCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("QueryStringInRequestDispatcher", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -184,9 +184,9 @@ * @portlet.specification assert="SPEC:125 - The portlet container must ensure that the servlet or JSP called through * a PortletRequestDispatcher is called in the same thread as the PortletRequestDispatcher include invocation." */ - public void createDispatchedRequestCase(SequenceRegistry registry) + public void createDispatchedRequestCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("DispatchedRequest", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -225,9 +225,9 @@ * @portlet.specification assert="SPEC:126 - Servlets and JSPs included from portlets must be handled as HTTP GET * requests." */ - public void createGETMethodCase(SequenceRegistry registry) + public void createGETMethodCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("GETMethod", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -266,9 +266,9 @@ * javax.servlet.include.context_path javax.servlet.include.servlet_path, javax.servlet.include.path_info, * javax.servlet.include.query_string" */ - public void createIncludedRequestParametersCase(SequenceRegistry registry) + public void createIncludedRequestParametersCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("IncludedRequestParameters", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -368,9 +368,9 @@ * @portlet.specification assert="SPEC:128 - javax.portlet.config, javax.portlet.request, javax.portlet.response. * These attributes must be the same Portlet API objects accessible to the portlet doing the include call." */ - public void createIncludedRequestAttributesCase(SequenceRegistry registry) + public void createIncludedRequestAttributesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("IncludedRequestAttributes", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -445,9 +445,9 @@ * @portlet.specification assert="SPEC:137 - The getMethod method of the HttpServletRequest must always return * �GET�" */ - public void createRequestObjectCase(SequenceRegistry registry) + public void createRequestObjectCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RequestObject", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -576,9 +576,9 @@ * @portlet.specification assert="SPEC:141 - The getLocale method of the HttpServletResponse must be based on the * getLocale method of the RenderResponse." */ - public void createResponseObjectCase(SequenceRegistry registry) + public void createResponseObjectCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResponseObject", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -623,9 +623,9 @@ * a PortletException. The root cause of the exception must be set to the original exception before being * propagated." */ - public void createErrorHandlingCase(SequenceRegistry registry) + public void createErrorHandlingCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ErrorHandling", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -24,9 +24,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; @@ -45,11 +45,11 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletConfigSequenceBuilder extends SequenceRegistryBuilder +public class PortletConfigSequenceBuilder extends PortletTestSuite { - public void createInlineValuesNotInResourceBundle(SequenceRegistry registry) + public void createInlineValuesNotInResourceBundle(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InlineValuesNotInResourceBundle", seq); seq.addAction(0, InlineValuesNotInResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -73,9 +73,9 @@ }); } - public void createInlineValuesWithNoResourceBundleDefined(SequenceRegistry registry) + public void createInlineValuesWithNoResourceBundleDefined(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InlineValuesWithNoResourceBundleDefined", seq); seq.addAction(0, InlineValuesWithNoResourceBundleDefinedPortlet.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.test.driver.DriverResponse; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction; @@ -49,7 +49,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.List; @@ -58,7 +57,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletContextSequenceBuilder extends SequenceRegistryBuilder +public class PortletContextSequenceBuilder extends PortletTestSuite { @@ -66,9 +65,9 @@ * @portlet.specification assert="SPEC:43 - The initialization parameters accessible through the PortletContext must * be the same that are accessible through the ServletContext of the portlet application." */ - public void createInitializationParametersCase(SequenceRegistry registry) + public void createInitializationParametersCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InitializationParameters", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -115,9 +114,9 @@ * ServletContext of the portlet application. A direct consequence of this is that data stored in the ServletContext * by servlets or JSPs is accessible to portlets through the PortletContext and vice versa." */ - public void createContextAttributesCase(SequenceRegistry registry) + public void createContextAttributesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ContextAttributes", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -164,9 +163,9 @@ * @portlet.specification assert="SPEC:45 - The PortletContext must offer access to the same set of resources the * ServletContext exposes." */ - public void createAccessSameSetOfResourcesCase(SequenceRegistry registry) + public void createAccessSameSetOfResourcesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("AccessSameSetOfResources", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -236,9 +235,9 @@ * ServletContext handles. It must be accessible as a context attribute using the same constant defined in the * Servlet Specification 2.3 SVR 3 Servlet Context Chapter, javax.servlet.context.tempdir." */ - public void createTempDirCase(SequenceRegistry registry) + public void createTempDirCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("TempDir", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -58,16 +58,16 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletInterfaceSequenceBuilder extends SequenceRegistryBuilder +public class PortletInterfaceSequenceBuilder extends PortletTestSuite { /** * @portlet.specification assert="SPEC:4 - After the portlet object is instantiated, the portlet container must * initialize the portlet before invoking it to handle requests" */ - public void createInitializeBeforeHandleCase(SequenceRegistry registry) + public void createInitializeBeforeHandleCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InitializeBeforeHandle", seq); seq.addAction(0, InitializeBeforeHandlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -88,9 +88,9 @@ * @portlet.specification assert="SPEC:8 - A RuntimeException thrown during initialization must be handled as a * PortletException." */ - public void createExceptionsOnInitCase(SequenceRegistry registry) + public void createExceptionsOnInitCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ExceptionsOnInit", seq); //PortletExceptionDuringInitPortlet seq.addAction(0, PortletExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -163,9 +163,9 @@ * portal/portlet-container must first trigger the action request by invoking the processAction method of the * targeted portlet." */ - public void createInvokeActionFirstCase(SequenceRegistry registry) + public void createInvokeActionFirstCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InvokeActionFirst", seq); final Boolean[] actionInvoked= new Boolean[1]; @@ -201,9 +201,9 @@ * Then, the portal/portlet-container must trigger the render request by invoking the render method for all the * portlets in the portal page with the possible exception of portlets for which their content is being cached." */ - public void createInvokeRenderAfterActionURLCase(SequenceRegistry registry) + public void createInvokeRenderAfterActionURLCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InvokeRenderAfterActionURL", seq); final Boolean[] actionInvoked= new Boolean[1]; @@ -279,9 +279,9 @@ * portal/portlet-container must invoke the render method for all the portlets in the portal page with the possible * exception of portlets for which their content is being cached." */ - public void createInvokeRenderAfterRenderURLCase(SequenceRegistry registry) + public void createInvokeRenderAfterRenderURLCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InvokeRenderAfterRenderURL", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -326,9 +326,9 @@ * portal/portlet-container to redirect the user to a specific URL. If the portlet issues a redirection, when the * processAction method concludes, the portal/portlet-container must send the redirection back to the user agent" */ - public void createSendRedirectDuringActionCase(SequenceRegistry registry) + public void createSendRedirectDuringActionCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SendRedirectDuringAction", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -365,9 +365,9 @@ }); } - public void createMinimizedStateDontRenderPortlet(SequenceRegistry registry) + public void createMinimizedStateDontRenderPortlet(PortletTestDriver registry) { - registry.addSequence("MinimizedStateDontRenderPortlet", new Sequence()); + registry.addSequence("MinimizedStateDontRenderPortlet", new PortletTest()); } /** Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -44,15 +44,15 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletModeSequenceBuilder extends SequenceRegistryBuilder +public class PortletModeSequenceBuilder extends PortletTestSuite { /** * @portlet.specification assert="SPEC:38 - The portlet must not be invoked in a portlet mode that has not been * declared as supported for a given markup type" */ - public void createNotInvokeModeDeclaredForNotSupportedMarkupCase(SequenceRegistry registry) + public void createNotInvokeModeDeclaredForNotSupportedMarkupCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); seq.addAction(0, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -119,8 +119,8 @@ // registry.addSequence("NotInvokeModeDeclaredForNotSupportedMarkup", seq); } - public void createRequestDispatchingDependingOnModePortlet(SequenceRegistry registry) + public void createRequestDispatchingDependingOnModePortlet(PortletTestDriver registry) { - registry.addSequence("RequestDispatchingDependingOnModePortlet", new Sequence()); + registry.addSequence("RequestDispatchingDependingOnModePortlet", new PortletTest()); } } Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -47,7 +47,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletRequestsSequenceBuilder extends SequenceRegistryBuilder +public class PortletRequestsSequenceBuilder extends PortletTestSuite { private final byte[] byteContent = {65, 66, 67, 68, 69, 70}; @@ -56,9 +56,9 @@ * @portlet.specification assert="SPEC:50 - The portlet-container must not propagate parameters received in an action * request to subsequent render requests of the portlet." */ - public void createActionToRequestParametersNotPropagatedCase(SequenceRegistry registry) + public void createActionToRequestParametersNotPropagatedCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ActionToRequestParametersNotPropagated", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -98,9 +98,9 @@ * part of the same client request, the parameters received with render request must be the render parameters set * during the action request." */ - public void createActionToRenderParametersCase(SequenceRegistry registry) + public void createActionToRenderParametersCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ActionToRenderParameters", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -139,9 +139,9 @@ * previous render request." * @portlet.specification assert="SPEC:54 - A portlet must not see any parameter targeted to other portlets." */ - public void createParametersDuringRenderNotTargetedCase(SequenceRegistry registry) + public void createParametersDuringRenderNotTargetedCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ParametersDuringRenderNotTargeted", seq); final String[] urls = new String[1]; seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -228,9 +228,9 @@ * @portlet.specification assert="SPEC:56 - If there is a single parameter value associated with a parameter name the * method returns must return an array of size one containing the parameter value" */ - public void createParameterAccessMethodstCase(SequenceRegistry registry) + public void createParameterAccessMethodstCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ParameterAccessMethodst", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -275,9 +275,9 @@ * @portlet.specification assert="SPEC:59 - "Otherwise, it must be the path the portlet application is rooted to, the * path must start with a '/' and it must not end with a '/' character." */ - public void createContextPathCase(SequenceRegistry registry) + public void createContextPathCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ContextPath", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -327,9 +327,9 @@ * @portlet.specification assert="SPEC:60 - If the user is not authenticated the getAuthType method must return * null" */ - public void createAuthTypeCase(SequenceRegistry registry) + public void createAuthTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("AuthType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -367,9 +367,9 @@ * supports in order of preference. The first element of the enumeration must be the same content type returned by * the getResponseContentType method." */ - public void createContentTypeCase(SequenceRegistry registry) + public void createContentTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ContentType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -407,9 +407,9 @@ * IllegalStateException. Similarly, if the reader is obtained, a call to the getPortletInputStream must throw an * IllegalStateException." */ - public void createObtainingInputStreamAndReaderCase(SequenceRegistry registry) + public void createObtainingInputStreamAndReaderCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ObtainingInputStreamAndReader", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -62,16 +62,16 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletResponsesSequenceBuilder extends SequenceRegistryBuilder +public class PortletResponsesSequenceBuilder extends PortletTestSuite { /** * @portlet.specification assert="SPEC:65 - The sendRedirect method instructs the portal/portlet-container to set the * appropriate headers and content body to redirect the user to a different URL. A fully qualified URL or a full path * URL must be specified. If a relative path URL is given, an IllegalArgumentException must be thrown." */ - public void createSendRedirectWithRelativeURLCase(SequenceRegistry registry) + public void createSendRedirectWithRelativeURLCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SendRedirectWithRelativeURL", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -112,9 +112,9 @@ * setWindowState, setRenderParameter or setRenderParameters methods of the ActionResponse interface, an * IllegalStateException must be thrown and the redirection must not be executed" */ - public void createSendRedirectAfterChangeStateMethodsCase(SequenceRegistry registry) + public void createSendRedirectAfterChangeStateMethodsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SendRedirectAfterChangeStateMethods", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -236,9 +236,9 @@ * mode. The new portlet mode would be effective in the following render request. If a portlet attempts to set a * portlet mode that is not allowed to switch to, a PortletModeException must be thrown." */ - public void createNotAllowedModeCase(SequenceRegistry registry) + public void createNotAllowedModeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("NotAllowedMode", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -279,9 +279,9 @@ * state. The new window state would be effective in the following render request. If a portlet attempts to set a * window state that it is not allowed to switch to, a WindowStateException must be thrown." */ - public void createNotSupportedWindowStateCase(SequenceRegistry registry) + public void createNotSupportedWindowStateCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("NotSupportedWindowState", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -323,9 +323,9 @@ * @portlet.specification assert="SPEC:70 - If the exception is caught by the portlet, the redirection must be * executed." */ - public void createStateChangesAfterRedirectionSendCase(SequenceRegistry registry) + public void createStateChangesAfterRedirectionSendCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("StateChangesAfterRedirectionSend", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -388,9 +388,9 @@ * @portlet.specification assert="SPEC:73 - If no render parameters are set during the processAction invocation, the * render request must not contain any request parameters." */ - public void createRenderParametersCase(SequenceRegistry registry) + public void createRenderParametersCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RenderParameters", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -448,9 +448,9 @@ * @portlet.specification assert="SPEC:75 - If the exception is caught by the portlet, the redirection must be * executed. If the exception is propagated back to the portlet-container, the redirection must not be executed." */ - public void createParametersSetAfterSendRedirectCase(SequenceRegistry registry) + public void createParametersSetAfterSendRedirectCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ParametersSetAfterSendRedirect", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -514,9 +514,9 @@ * IllegalArgumentException if the content type set does not match (including wildcard matching) any of the content * types returned by the getResponseContentType method of the PortleRequest object" */ - public void createSetNotSupportedContentTypeCase(SequenceRegistry registry) + public void createSetNotSupportedContentTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SetNotSupportedContentType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -540,9 +540,9 @@ * @portlet.specification assert="SPEC:77 - If the getWriter or getPortletOutputStream methods are called before the * setContentType method, they must throw an IllegalStateException." */ - public void createSetContentTypeBeforeOutputStreamOrWriterCase(SequenceRegistry registry) + public void createSetContentTypeBeforeOutputStreamOrWriterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SetContentTypeBeforeOutputStreamOrWriter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -583,9 +583,9 @@ * @portlet.specification assert="SPEC:78 - If the portlet has set a content type, the getContentType method must * return it. Otherwise, the getContentType method must return null." */ - public void createGetContentTypeCase(SequenceRegistry registry) + public void createGetContentTypeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("GetContentType", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -615,9 +615,9 @@ * the Writer of the RenderResponse object. A portlet must use only one of these objects. The portlet container must * throw an IllegalStateException if a portlet attempts to use both." */ - public void createOutputStreamOrWriterCase(SequenceRegistry registry) + public void createOutputStreamOrWriterCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("OutputStreamOrWriter", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -676,9 +676,9 @@ * @portlet.specification assert="SPEC:88 - The getNamespace method must return a valid identifier as defined in the * 3.8 Identifier Section of the Java Language Specification Second Edition." */ - public void createNamespaceEncodingCase(SequenceRegistry registry) + public void createNamespaceEncodingCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("NamespaceEncoding", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -729,9 +729,9 @@ * sendRedirect method has been called an IllegalStateException must be thrown. (...) If the exception is propagated * back to the portlet-container, the redirection must not be executed." */ - public void _createIllegalStateExceptionAfterSendRedirectCase(SequenceRegistry registry) + public void _createIllegalStateExceptionAfterSendRedirectCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("IllegalStateExceptionAfterSendRedirect", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -778,9 +778,9 @@ * setBufferSize method. The buffer assigned is not required to be the size requested by the portlet, but must be at * least as large as the size requested." */ - public void createBufferSizeCase(SequenceRegistry registry) + public void createBufferSizeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("BufferSize", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -805,9 +805,9 @@ * @portlet.specification assert="SPEC:83 - If the response is committed and the reset or resetBuffer method is * called, an IllegalStateException must be thrown." */ - public void createBufferResetCase(SequenceRegistry registry) + public void createBufferResetCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("BufferReset", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -59,7 +59,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletSessionSequenceBuilder extends SequenceRegistryBuilder +public class PortletSessionSequenceBuilder extends PortletTestSuite { /** @@ -69,9 +69,9 @@ * @portlet.specification assert="SPEC:107 - In addition, if within these portlet requests more than one portlet * creates a session, the session object must be the same for all the portlets in the same portlet application" */ - public void createSessionCreateCase(SequenceRegistry registry) + public void createSessionCreateCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SessionCreate", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -121,9 +121,9 @@ * @portlet.specification assert="SPEC:119 - The variant of these methods that does not receive a scope must be * treated as PORTLET_SCOPE." */ - public void createSessionAttributesCase(SequenceRegistry registry) + public void createSessionAttributesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SessionAttributes", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -219,9 +219,9 @@ * @portlet.specification assert="SPEC:114 - Conversely, data stored by portlets in the PortletSession in the portlet * application scope is accessible to servlets and JSPs through the HttpSession." */ - public void createHttpSessionRelationsCase(SequenceRegistry registry) + public void createHttpSessionRelationsCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("HttpSessionRelations", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -267,9 +267,9 @@ * @portlet.specification assert="SPEC:115 - If the HttpSession object is invalidated, the PortletSession object must * also be invalidated by the portlet container." */ - public void createHttpSessionInvalidatesPortletSession(SequenceRegistry registry) + public void createHttpSessionInvalidatesPortletSession(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("HttpSessionInvalidatesPortletSession", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -312,9 +312,9 @@ * @portlet.specification assert="SPEC:116 - If the PortletSession object is invalidated by a portlet, the portlet * container must invalidate the associated HttpSession object." */ - public void createPortletSessionInvalidatesHttpSession(SequenceRegistry registry) + public void createPortletSessionInvalidatesHttpSession(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletSessionInvalidatesHttpSession", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -50,15 +50,15 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PortletUrlSequenceBuilder extends SequenceRegistryBuilder +public class PortletUrlSequenceBuilder extends PortletTestSuite { /** * @portlet.specification assert="SPEC:26 - A render URL is an optimization for a special type of action URLs. The * portal/portletcontainer must not invoke the processAction method of the targeted portlet." */ - public void createRenderURLNotInvokeActionCase(SequenceRegistry registry) + public void createRenderURLNotInvokeActionCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("RenderURLNotInvokeAction", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -97,9 +97,9 @@ * @portlet.specification assert="SPEC:29 - All the parameters a portlet adds to a PortletURL object must be made * available to the portlet as request parameters" */ - public void createPortletURLParametersCase(SequenceRegistry registry) + public void createPortletURLParametersCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletURLParameters", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -203,9 +203,9 @@ * defined as supported by the portlet or that the user it is not allowed to use. The setPortletMode methods must * throw a PortletModeException in that situation." */ - public void createPortletURLWithNotSupportedModeCase(SequenceRegistry registry) + public void createPortletURLWithNotSupportedModeCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletURLWithNotSupportedMode", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -232,9 +232,9 @@ * supported by the portlet container. The setWindowState method must throw a WindowStateException if that is the * case" */ - public void createPortletURLWithNotSupportedStateCase(SequenceRegistry registry) + public void createPortletURLWithNotSupportedStateCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PortletURLWithNotSupportedState", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -260,9 +260,9 @@ * indicate if the portlet URL has to be a secure URL or not (i.e. HTTPS or HTTP). If the setSecure method is not * used, the portlet URL must be of the same security level of the current request." */ - public void createSecurityLevelCase(SequenceRegistry registry) + public void createSecurityLevelCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("SecurityLevel", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,9 +25,9 @@ import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; @@ -57,7 +57,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class PreferencesSequenceBuilder extends SequenceRegistryBuilder +public class PreferencesSequenceBuilder extends PortletTestSuite { @@ -65,9 +65,9 @@ * @portlet.specification assert="SPEC:90 Preference attributes are String array objects. Preferences attributes can * be set to null." */ - public void createPreferencesCanBeSetToNullCase(SequenceRegistry registry) + public void createPreferencesCanBeSetToNullCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PreferencesCanBeSetToNull", seq); seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -142,9 +142,9 @@ * values containing all current preference values. Preferences values must not be modified if the values in the Map * are altered." */ - public void createPreferencesMapModificationDoesNotModifyPreferencesValuesCase(SequenceRegistry registry) + public void createPreferencesMapModificationDoesNotModifyPreferencesValuesCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("PreferencesMapModificationDoesNotModifyPreferencesValues", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -195,9 +195,9 @@ * <p/> * Does not cover restore to default test yet. */ - public void createResetPreferenceHavingNoDefaultValueDeletesItCase(SequenceRegistry registry) + public void createResetPreferenceHavingNoDefaultValueDeletesItCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ResetPreferenceHavingNoDefaultValueDeletesIt", seq); seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -294,9 +294,9 @@ * @portlet.specification assert="SPEC:93 - If a preference attribute is read only, the setValue, setValues and reset * methods must throw a ReadOnlyException when the portlet is in any of the standard modes" */ - public void createReadOnlyPreferenceCannotBeModifiedCase(SequenceRegistry registry) + public void createReadOnlyPreferenceCannotBeModifiedCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ReadOnlyPreferenceCannotBeModified", seq); seq.addAction(0, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -393,9 +393,9 @@ * @portlet.specification assert="SPEC:96 - All changes made to PortletPreferences object not followed by a call to * the store method must be discarded when the portlet finishes the 20 processAction method." */ - public void createChangesMadeButNotStoredAreDiscardedCase(SequenceRegistry registry) + public void createChangesMadeButNotStoredAreDiscardedCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ChangesMadeButNotStoredAreDiscarded", seq); seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -469,9 +469,9 @@ * @portlet.specification assert="SPEC:97 - If the store method is invoked within the scope of a render method * invocation, it must throw an IllegalStateException." */ - public void createStoreCalledDuringRenderThrowsIllegalArgumentExceptionCase(SequenceRegistry registry) + public void createStoreCalledDuringRenderThrowsIllegalArgumentExceptionCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("StoreCalledDuringRenderThrowsIllegalArgumentException", seq); seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -499,9 +499,9 @@ * element set to true, the preference attribute is modifiable when the portlet is processing an action request in * any of the standard portlet modes (VIEW, EDIT or HELP)." */ - public void createCanModifyNonReadOnlyPreferenceCase(SequenceRegistry registry) + public void createCanModifyNonReadOnlyPreferenceCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("CanModifyNonReadOnlyPreference", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -576,9 +576,9 @@ * deployment descriptor. They can programmatically add preference attributes using names not defined in the * deployment descriptor. These preferences attributes must be treated as modifiable attributes." */ - public void createDynamicPreferenceTreatedLikeModifiablePreferenceCase(SequenceRegistry registry) + public void createDynamicPreferenceTreatedLikeModifiablePreferenceCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("DynamicPreferenceTreatedLikeModifiablePreference", seq); seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -687,9 +687,9 @@ * @portlet.specification assert="SPEC:101 - If a portlet definition includes a validator, the portlet container must * create a single validator instance per portlet definition. (according to spec: Testable=false ;)" */ - public void createCreateASingleInstanceOfValidatorCase(SequenceRegistry registry) + public void createCreateASingleInstanceOfValidatorCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("CreateASingleInstanceOfValidator", seq); seq.addAction(0, UTP6.RENDER_JOINPOINT, new PortletRenderTestAction() { @@ -708,9 +708,9 @@ * validator before writing the changes to the persistent store." * @portlet.specification assert="SPEC:105 - If the validation is successful, the store operation must be completed" */ - public void createValidationStoresCase(SequenceRegistry registry) + public void createValidationStoresCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("ValidationStores", seq); seq.addAction(0, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction() @@ -788,9 +788,9 @@ * throw a ValidatorException. If a ValidatorException is thrown, the portlet container must cancel the store * operation and it must propagate the exception to the portlet" */ - public void createInvalidationCancelsStoreCase(SequenceRegistry registry) + public void createInvalidationCancelsStoreCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("InvalidationCancelsStore", seq); seq.addAction(0, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction() Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -26,9 +26,9 @@ import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.test.framework.portlet.Sequence; -import org.jboss.portal.test.framework.portlet.SequenceRegistry; -import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder; +import org.jboss.portal.test.framework.portlet.PortletTest; +import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import org.jboss.portal.test.framework.portlet.PortletTestSuite; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; @@ -45,16 +45,16 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision$ */ -public class WindowStatesSequenceBuilder extends SequenceRegistryBuilder +public class WindowStatesSequenceBuilder extends PortletTestSuite { /** * @portlet.specification assert="SPEC:40 - If a custom window state defined in the deployment descriptor is not * mapped to a custom window state provided by the portal, portlets must not be invoked in that window state." */ - public void _createCustomStateNotMappedNotInvokedCase(SequenceRegistry registry) + public void _createCustomStateNotMappedNotInvokedCase(PortletTestDriver registry) { - Sequence seq = new Sequence(); + PortletTest seq = new PortletTest(); registry.addSequence("CustomStateNotMappedNotInvoked", seq); seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction() { Modified: trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet-server/src/main/org/jboss/portal/portlet/test/PortletController.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -123,6 +123,9 @@ public void handle(ServerInvocation invocation) throws ServerException { + +// PortletTestDriver.getInstance(). + try { String requestPath = invocation.getServerContext().getPortalRequestPath(); Modified: trunk/portlet-server/src/resources/test-sar/META-INF/jboss-service.xml =================================================================== --- trunk/portlet-server/src/resources/test-sar/META-INF/jboss-service.xml 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/portlet-server/src/resources/test-sar/META-INF/jboss-service.xml 2007-03-19 18:12:24 UTC (rev 6752) @@ -46,7 +46,7 @@  <mbean - code="org.jboss.portal.test.framework.portlet.PortletTestDriver" + code="org.jboss.portal.test.framework.portlet.TestDriverRegistryAccess" name="portal:service=PortletTestDriver" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -25,6 +25,7 @@ import org.jboss.portal.test.framework.server.NodeId; import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.common.test.TestParametrization; import org.jboss.deployment.DeploymentException; import java.io.Serializable; @@ -87,6 +88,9 @@ /** The test agent, normally only valid in the server side for now. */ private TestAgent testAgent; + /** The test parametrization. */ + private TestParametrization parametrization; + /** * Copy constructor. */ @@ -98,13 +102,19 @@ this.response = that.response; } - public HttpTestContext(String testName, int requestCount, String archivePath) + public HttpTestContext(String testName, int requestCount, String archivePath, TestParametrization parametrization) { this.testName = testName; this.requestCount = requestCount; this.archivePath = archivePath; + this.parametrization = parametrization; } + public TestParametrization getParametrization() + { + return parametrization; + } + public String getArchivePath() { return archivePath; Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -39,6 +39,7 @@ import org.jboss.portal.common.test.driver.response.ErrorResponse; import org.jboss.portal.common.test.driver.response.FailureResponse; import org.jboss.portal.common.test.info.TestItemInfo; +import org.jboss.portal.common.test.TestParametrization; import org.jboss.portal.common.http.HttpHeader; import org.jboss.portal.common.http.HttpHeaders; import org.jboss.portal.common.http.HttpRequest; @@ -181,6 +182,9 @@ /** The request count for that session. */ int requestCount; + /** The test parametrization. */ + TestParametrization parametrization; + public TestConversation(String testId, Node node) { this.testId = testId; @@ -339,6 +343,7 @@ else if (cmd instanceof StartTestCommand) { requestCount = -1; + parametrization = ((StartTestCommand)cmd).getParametrization(); pushContext(); DriverResponse response = getServer(node).invoke(testId, cmd); requestCount = 0; @@ -456,8 +461,7 @@ private void pushContext() { - HttpTestContext ctx = new HttpTestContext(testId, requestCount, archivePath); - + HttpTestContext ctx = new HttpTestContext(testId, requestCount, archivePath, parametrization); log.info("# Updating test case context of : " + node + " : " + ctx); HttpTestDriver agent = getServer(node); agent.pushContext(testId, ctx); Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -61,7 +61,7 @@ HttpTestDriver httpDriver = (HttpTestDriver)driver; TestItemInfo item = _container.findItem(testId); String newId = item.getId(httpDriver.getInfo()); - HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath()); + HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath(), ctx.getParametrization()); ctx2.setTestAgent(getAgent()); httpDriver.pushContext(newId, ctx2); } Modified: trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-03-19 18:10:54 UTC (rev 6751) +++ trunk/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-03-19 18:12:24 UTC (rev 6752) @@ -29,6 +29,7 @@ import org.jboss.portal.test.framework.ServiceLookup; import org.jboss.portal.test.framework.driver.http.HttpTestDriverClient; import org.jboss.portal.common.test.junit.JUnitAdapter; +import org.jboss.portal.common.test.TestParametrization; import org.apache.log4j.Logger; import org.apache.log4j.Appender; import org.apache.log4j.SimpleLayout; @@ -175,16 +176,18 @@ { startContext(); - // + // Create driver HttpTestDriverClient driver = new HttpTestDriverClient(); driver.setInitialNodeId(nodeIds[0]); driver.setArchivePath(archivePath); driver.setNodeManager(nodeManager); driver.setServerLookup(httpTestDriverServerLookup); + // Get optional parametrization + TestParametrization parametrization = JUnitAdapter.getParametrization(); + // - adapter = new JUnitAdapter(driver); - + adapter = new JUnitAdapter(driver, parametrization); state = STARTED; } finally

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6751 - trunk/api/src/main/org/jboss/portal.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-03-19 14:10:54 -0400 (Mon, 19 Mar 2007) New Revision: 6751 Modified: trunk/api/src/main/org/jboss/portal/Mode.java trunk/api/src/main/org/jboss/portal/WindowState.java Log: - JBPORTAL-1322: Updated @since tags after backport. Modified: trunk/api/src/main/org/jboss/portal/Mode.java =================================================================== --- trunk/api/src/main/org/jboss/portal/Mode.java 2007-03-19 17:44:14 UTC (rev 6750) +++ trunk/api/src/main/org/jboss/portal/Mode.java 2007-03-19 18:10:54 UTC (rev 6751) @@ -58,7 +58,7 @@ /** * @param name * @param preserveCase - * @since 2.6 + * @since 2.4.2 */ private Mode(String name, boolean preserveCase) { @@ -127,7 +127,7 @@ * @param name * @param preserveCase * @return - * @since 2.6 + * @since 2.4.2 */ public static Mode create(String name, boolean preserveCase) { Modified: trunk/api/src/main/org/jboss/portal/WindowState.java =================================================================== --- trunk/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 17:44:14 UTC (rev 6750) +++ trunk/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 18:10:54 UTC (rev 6751) @@ -55,7 +55,7 @@ /** * @param name * @param preserveCase - * @since 2.6 + * @since 2.4.2 */ private WindowState(String name, boolean preserveCase) { @@ -116,6 +116,12 @@ return create(name, false); } + /** + * @param name + * @param preserveCase + * @return + * @since 2.4.2 + */ public static WindowState create(String name, boolean preserveCase) { if (WindowState.NORMAL.name.equals(name))

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6750 - in branches/JBoss_Portal_Branch_2_4: wsrp/src/main/org/jboss/portal/wsrp and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-03-19 13:44:14 -0400 (Mon, 19 Mar 2007) New Revision: 6750 Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java Log: - JBPORTAL-1322: Backported fix. Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -52,13 +52,24 @@ public Mode(String name) { + this(name, false); + } + + /** + * @param name + * @param preserveCase + * @since 2.4.2 + */ + private Mode(String name, boolean preserveCase) + { if (name == null) { throw new IllegalArgumentException("Mode cannot be null"); } - this.name = name.toLowerCase(Locale.ENGLISH); + this.name = (preserveCase ? name : name.toLowerCase(Locale.ENGLISH)); } + public boolean equals(Object o) { if (o == this) @@ -107,27 +118,38 @@ } } - public static Mode create(String s) + public static Mode create(String name) { - if (Mode.VIEW.name.equals(s)) + return create(name, false); + } + + /** + * @param name + * @param preserveCase + * @return + * @since 2.4.2 + */ + public static Mode create(String name, boolean preserveCase) + { + if (Mode.VIEW.name.equals(name)) { return Mode.VIEW; } - else if (Mode.EDIT.name.equals(s)) + else if (Mode.EDIT.name.equals(name)) { return Mode.EDIT; } - else if (Mode.HELP.name.equals(s)) + else if (Mode.HELP.name.equals(name)) { return Mode.HELP; } - else if (Mode.EDIT_DEFAULTS.name.equals(s)) + else if (Mode.EDIT_DEFAULTS.name.equals(name)) { return Mode.VIEW; } else { - return new Mode(s); + return new Mode(name, preserveCase); } } } Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -49,11 +49,22 @@ public WindowState(String name) { + this(name, false); + } + + /** + * @param name + * @param preserveCase + * @since 2.4.2 + */ + private WindowState(String name, boolean preserveCase) + { if (name == null) { throw new IllegalArgumentException("Window state name cannot be null"); } - this.name = name.toLowerCase(Locale.ENGLISH); + + this.name = (preserveCase ? name : name.toLowerCase(Locale.ENGLISH)); } public boolean equals(Object o) @@ -100,23 +111,34 @@ } } - public static WindowState create(String s) + public static WindowState create(String name) { - if (WindowState.NORMAL.name.equals(s)) + return create(name, false); + } + + /** + * @param name + * @param preserveCase + * @return + * @since 2.4.2 + */ + public static WindowState create(String name, boolean preserveCase) + { + if (WindowState.NORMAL.name.equals(name)) { return WindowState.NORMAL; } - else if (WindowState.MINIMIZED.name.equals(s)) + else if (WindowState.MINIMIZED.name.equals(name)) { return WindowState.MINIMIZED; } - else if (WindowState.MAXIMIZED.name.equals(s)) + else if (WindowState.MAXIMIZED.name.equals(name)) { return WindowState.MAXIMIZED; } else { - return new WindowState(s); + return new WindowState(name, preserveCase); } } } Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -525,12 +525,12 @@ public Mode getMode() { - return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } public WindowState getWindowState() { - return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } }; @@ -543,12 +543,12 @@ public Mode getMode() { - return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } public WindowState getWindowState() { - return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } };

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6749 - trunk/test/src/etc.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-03-19 13:34:55 -0400 (Mon, 19 Mar 2007) New Revision: 6749 Modified: trunk/test/src/etc/directories-extrolemodule.xml trunk/test/src/etc/directories-extusermodule.xml Log: - disable not configured servers Modified: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml 2007-03-19 17:12:40 UTC (rev 6748) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-03-19 17:34:55 UTC (rev 6749) @@ -34,7 +34,7 @@ <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> - <directory> +   <!--<directory> <directory-name>MSAD</directory-name> <description>Microsoft Active Directory in QA Labs (need vpn access)</description>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6748 - in trunk/identity/src/main/org/jboss/portal/identity: db and 2 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-03-19 13:12:40 -0400 (Mon, 19 Mar 2007) New Revision: 6748 Modified: trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleImpl.java trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserImpl.java trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java trunk/identity/src/main/org/jboss/portal/identity/info/ProfileInfo.java trunk/identity/src/main/org/jboss/portal/identity/info/PropertyInfo.java trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java Log: - code cleanup - small update on javadoc Modified: trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -88,18 +88,6 @@ { log.debug("Delegating to DB module"); return getDBModule().getProperty(user, propertyName); - - - //if property is column it may be some Object - just convert to String for now - /*if(o != null && !(o instanceof String)) - { - return o.toString(); - } - else - { - return o; - }*/ - } throw new IdentityException("Cannot process property - incorrect profile or module configuration"); } @@ -129,19 +117,6 @@ { log.debug("Delegating to DB module"); - - //Object val = propertyValue; - //if property is dynamic convert value to String first -// if(property.getMappingDBType().equals(PropertyInfo.MAPPING_DB_TYPE_DYNAMIC)) -// { -// val = propertyValue.toString(); -// } -// else -// { -// val = propertyValue; -// } - - getDBModule().setProperty(user, name, propertyValue); return; } Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -22,6 +22,8 @@ package org.jboss.portal.identity; /** + * Keeps track on all identity modules deployed with simple name-object mapping + * * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ @@ -43,10 +45,25 @@ public static final String TYPE_IDENTITY_EVENT_BROADCASTER = "IdentityEventBroadcaster"; - + /** + * Retister identity object in context + * @param object representing identity object + * @param name to map object + * @throws IdentityException thrown if such object is already registered or operation fail. + */ public void register(Object object, String name) throws IdentityException; + /** + * Remove identity object from context + * @param name of identity object + */ public void unregister(String name); + /** + * Retrieve registered identity object + * @param name + * @return + * @throws IdentityException thrown if no such object exists in context + */ public Object getObject(String name) throws IdentityException; } Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -22,11 +22,16 @@ package org.jboss.portal.identity; /** + * Service that bootstrap all identity related modules and services. It registers them in IdentityContext * * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ public interface IdentityServiceController { + /** + * Get IdentityContext that contains modules and services bootstrapped by this instance. + * @return + */ public IdentityContext getIdentityContext(); } Modified: trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -44,6 +44,13 @@ */ Set getRoles(User user) throws IdentityException, IllegalArgumentException; + /** + * Returns the set of user objects that a given role has. + * @param role + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ Set getUsers(Role role) throws IdentityException, IllegalArgumentException; Modified: trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -29,18 +29,48 @@ import java.util.Map; /** + * Manages user properties + * * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ public interface UserProfileModule { + /** + * Returns user property + * @param user + * @param propertyName + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException; + /** + * Sets user property + * @param user + * @param name + * @param property + * @throws IdentityException + * @throws IllegalArgumentException + */ public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException; + /** + * Returns all properties related to user + * @param user + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ public Map getProperties(User user) throws IdentityException, IllegalArgumentException; + /** + * Return ProfileInfo object that can be used to obtain PropertyInfo on specific property name. + * @return + * @throws IdentityException + */ public ProfileInfo getProfileInfo() throws IdentityException; } Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleImpl.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateRoleImpl.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -45,7 +45,6 @@ /** * */ - //TODO: make this protected (clashes with bsh script in HibernateSerssionBinder public HibernateRoleImpl() { this.key = null; @@ -57,7 +56,6 @@ /** * */ - //TODO: make this protected (clashes with bsh script in HibernateSerssionBinder public HibernateRoleImpl(String name) { this.key = null; Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserImpl.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserImpl.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -112,7 +112,6 @@ /** * */ - //TODO: make this protected (clashes with bsh script in HibernateSerssionBinder public HibernateUserImpl() { this.key = null; Modified: trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -82,11 +82,6 @@ super.stopService(); } -// public SessionFactory getSessionFactory() -// { -// return sessionFactory; -// } - public String getSessionFactoryJNDIName() { return sessionFactoryJNDIName; Modified: trunk/identity/src/main/org/jboss/portal/identity/info/ProfileInfo.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/info/ProfileInfo.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/info/ProfileInfo.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -37,6 +37,12 @@ */ public Map getPropertiesInfo(); + /** + * Returns a PropertyInfo object that describes specified property + * + * @param name of property + * @return PropertyInfo of specified property or null if no such property exists. + */ public PropertyInfo getPropertyInfo(String name); } Modified: trunk/identity/src/main/org/jboss/portal/identity/info/PropertyInfo.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/info/PropertyInfo.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/info/PropertyInfo.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -39,26 +39,70 @@ public static final String MAPPING_DB_TYPE_COLUMN = "column"; public static final String MAPPING_DB_TYPE_DYNAMIC = "dynamic"; + /** + * Returns property name + * @return + */ public String getName(); + /** + * Returns property type + * @return + */ public String getType(); + /** + * Returns property access mode + * @return + */ public String getAccessMode(); + /** + * Returns property usage + * @return + */ public String getUsage(); + /** + * Returns property display name + * @return + */ public LocalizedString getDisplayName(); + /** + * Returns property description + * @return + */ public LocalizedString getDescription(); + /** + * Returns type of property database mapping + * @return + */ public String getMappingDBType(); + /** + * Returns name of LDAP attribue to which this property corresponds + * @return + */ public String getMappingLDAPValue(); + /** + * Returns name of database column name to which this property corresponds + * @return + */ public String getMappingDBValue(); + /** + * If property is mapped in database + * @return + */ public boolean isMappedDB(); + /** + * If property is mapped in LDAP + * @return + */ public boolean isMappedLDAP(); Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2007-03-19 15:43:20 UTC (rev 6747) +++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2007-03-19 17:12:40 UTC (rev 6748) @@ -66,29 +66,7 @@ private String externalContextJndiName; - /*public LDAPConnectionContext(String name, - String url, - String context, - String admin, - String password, - String protocol, - String authentication) - { - this.name = name; - this.providerUrl = url; - this.contextFactory = context; - this.adminDN = admin; - this.adminPassword = password; - this.protocol = protocol; - this.authentication = authentication; - }*/ - /*public LDAPConnectionContext() - { - super(IdentityContext.TYPE_CONNECTION_CONTEXT); - }*/ - - public Hashtable getEnvironment() { Hashtable env = new Hashtable(); @@ -162,7 +140,8 @@ .append(", Port: ").append(getPort()) .append(", Context factory: ").append(getContextFactory()) .append(", Admin user: ").append(getAdminDN()) - //.append(", Admin password: ").append(getAdminPassword()) + + // Protect admin credentials to not go in logs .append(", Admin password: ").append("***") .append(", Authentication: ").append(getAuthentication()) .append(", Protocol: ").append(getProtocol());

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6747 - in trunk: identity/src/main/org/jboss/portal/test/identity/db and 4 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-03-19 11:43:20 -0400 (Mon, 19 Mar 2007) New Revision: 6747 Removed: trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserTestCase.java trunk/identity/src/resources/experimental/ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPMembershipModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml trunk/test/src/etc/directories-extrolemodule.xml trunk/test/src/etc/directories-extusermodule.xml trunk/test/src/etc/directories-staticrolemembership.xml Log: - cleanup in identity testsuite Deleted: trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ConfigurationTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,151 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.portal.test.identity; - -import org.apache.log4j.Appender; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.SimpleLayout; -import org.apache.log4j.Logger; -import org.apache.log4j.Level; -import org.jboss.portal.identity.IdentityContextImpl; -import org.jboss.portal.identity.IdentityServiceControllerImpl; -import org.jboss.portal.identity.IdentityContext; -import org.jboss.portal.identity.service.IdentityModuleService; -import org.jboss.portal.test.framework.TestRuntimeContext; - - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> - * @version $Revision: 5247 $ - */ -public class ConfigurationTestCase extends junit.framework.TestCase -{ - - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(ConfigurationTestCase.class); - - static - { - Appender appender = new ConsoleAppender(new SimpleLayout()); - Logger.getRoot().addAppender(appender); - Logger.getRoot().setLevel(Level.INFO); - Logger.getLogger("org.jboss.portal.identity2").setLevel(Level.DEBUG); - } - - /*public static TestSuite createTestSuite(Class clazz) throws Exception - { - URL configsURL = Thread.currentThread().getContextClassLoader().getResource("directories.xml"); - Map parameterMap = new HashMap(); - parameterMap.put("DirectoryServerConfig", DSConfig.fromXML2(configsURL)); - POJOJUnitTest abc = new POJOJUnitTest(clazz); - JUnitAdapter adapter = new JUnitAdapter(abc); - TestSuite suite = new TestSuite(); - suite.addTest(adapter); - return suite; - }*/ - - public ConfigurationTestCase() - { - - } - - /*public ConfigurationTestCase(DSConfig dsConfig) - { - this.directoryServerConfigParameter = dsConfig; - } - - private DSConfig directoryServerConfigParameter; - - public String getName() - { - return super.getName();// + "," + directoryServerConfigParameter.getName() + "," + directoryServerConfigParameter.getDescription(); - } - - public DSConfig getDirectoryServerConfigParameter() - { - return directoryServerConfigParameter; - } - - public void setDirectoryServerConfigParameter(DSConfig directoryServerConfigParameter) - { - this.directoryServerConfigParameter = directoryServerConfigParameter; - }*/ - - IdentityContextImpl context; - - - public void setUp() throws Exception - { - TestRuntimeContext runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml"); - runtimeContext.addBean("LDAPTestBean", this); - runtimeContext.start(); - this.context = new IdentityContextImpl(); - context.start(); - - - } - - /*public void testSimpleConfigurationFactory() throws Exception - { - SimpleConfigurationImpl configuration = new SimpleConfigurationImpl(); - configuration.setIdentityContext(context); - configuration.setConfigFile("identityconfig/test-config.xml"); - configuration.start(); - Set keys = configuration.getOptionGroups().keySet(); - log.info("Option Groups:"); - for (Iterator iterator = keys.iterator(); iterator.hasNext();) - { - String group = (String)iterator.next(); - log.info("option-group: " + group); - - log.info("Options:"); - Set names = configuration.getOptions(group).keySet(); - for (Iterator iterator1 = names.iterator(); iterator1.hasNext();) - { - String optionName = (String)iterator1.next(); - log.info("Name: " + optionName); - - } - - } - - - assertEquals("uid",configuration.getValue("user.uidAttributeId")); - }*/ - - - public void testIdentityServiceController() throws Exception - { - IdentityServiceControllerImpl controller = new IdentityServiceControllerImpl(); - controller.setRegisterMBeans(false); - controller.setConfigFile("config/minimal-ldap-identity-config.xml"); - controller.setDefaultConfigFile("config/standardidentity-config.xml"); - controller.start(); - - IdentityModuleService service = (IdentityModuleService)controller.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); - assertEquals("java:/portal/UserModule", service.getJNDIName()); - } - - - - -} Deleted: trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,88 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.identity; - -import junit.framework.Assert; -import org.jboss.portal.identity.MembershipModule; -import org.jboss.portal.identity.RoleModule; -import org.jboss.portal.identity.UserModule; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> - * @version $Revision: 2001 $ - */ -public class MembershipStrategyTest extends Assert -{ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(MembershipStrategyTest.class); - - /** . */ - private MembershipStrategyTest.Context ctx; - - protected MembershipModule membership; - - protected UserModule userModule; - - protected RoleModule roleModule; - - public void setContext(MembershipStrategyTest.Context ctx) - { - this.ctx = ctx; - } - - public void setMembershipModule(MembershipModule membership) - { - this.membership = membership; - } - - public void setUserModule(UserModule userModule) - { - this.userModule = userModule; - } - - public void setRoleModule(RoleModule roleModule) - { - this.roleModule = roleModule; - } - - public void testFirstSimple() throws Exception - { - log.info("first test"); - } - - public void testSecondSimple() throws Exception - { - log.info("second test"); - } - - public void testThirdSimple() throws Exception - { - log.info("third test"); - } - - public interface Context - { - void begin(); - - void commit(); - } -} Deleted: trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,183 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.portal.test.identity; - -import org.apache.log4j.Appender; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.SimpleLayout; -import org.apache.log4j.Logger; -import org.apache.log4j.Level; -import org.jboss.portal.identity.IdentityContextImpl; -import org.jboss.portal.test.framework.TestRuntimeContext; -import org.jboss.portal.test.framework.embedded.HibernateSupport; -import org.hibernate.Session; -import org.hibernate.Query; - -import java.util.Map; -import java.util.HashMap; -import java.util.Set; -import java.util.HashSet; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> - * @version $Revision: 5247 $ - */ -public class UserProtoTestCase extends junit.framework.TestCase -{ - - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(UserProtoTestCase.class); - - private HibernateSupport hibernate; - - static - { - Appender appender = new ConsoleAppender(new SimpleLayout()); - Logger.getRoot().addAppender(appender); - Logger.getRoot().setLevel(Level.INFO); - Logger.getLogger("org.jboss.portal.identity").setLevel(Level.DEBUG); - } - - /*public static TestSuite createTestSuite(Class clazz) throws Exception - { - URL configsURL = Thread.currentThread().getContextClassLoader().getResource("directories.xml"); - Map parameterMap = new HashMap(); - parameterMap.put("DirectoryServerConfig", DSConfig.fromXML2(configsURL)); - POJOJUnitTest abc = new POJOJUnitTest(clazz); - JUnitAdapter adapter = new JUnitAdapter(abc); - TestSuite suite = new TestSuite(); - suite.addTest(adapter); - return suite; - }*/ - - public UserProtoTestCase() - { - - } - - public HibernateSupport getHibernate() - { - return hibernate; - } - - public void setHibernate(HibernateSupport hibernate) - { - this.hibernate = hibernate; - } - - /*public ConfigurationTestCase(DSConfig dsConfig) - { - this.directoryServerConfigParameter = dsConfig; - } - - private DSConfig directoryServerConfigParameter; - - public String getName() - { - return super.getName();// + "," + directoryServerConfigParameter.getName() + "," + directoryServerConfigParameter.getDescription(); - } - - public DSConfig getDirectoryServerConfigParameter() - { - return directoryServerConfigParameter; - } - - public void setDirectoryServerConfigParameter(DSConfig directoryServerConfigParameter) - { - this.directoryServerConfigParameter = directoryServerConfigParameter; - }*/ - - IdentityContextImpl context; - - - public void setUp() throws Exception - { - TestRuntimeContext runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/proto-beans.xml"); - runtimeContext.addBean("LDAPTestBean", this); - runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig("proto")); - runtimeContext.start(); - this.context = new IdentityContextImpl(); - context.start(); - } - - - public void testSimle() throws Exception - { - log.info("I'm here"); - - //SessionFactory sf = (SessionFactory)new InitialContext().lookup("java:/TestSessionFactory"); - - - Session es = hibernate.openSession(); - //Session es = session.getSession(EntityMode.MAP); - Map lolo = new HashMap(); - lolo.put("userName", "lolo"); - //lolo.put("roles", new HashSet()); - es.save("PortalUser", lolo); - Map dummy = new HashMap(); - dummy.put("name", "dummy"); - es.save("PortalRole", dummy); - - Set roles = new HashSet(); - roles.add(dummy); - lolo.put("roles",roles); - Map props = new HashMap(); - props.put("theme", "pp"); - props.put("signature", "alalala"); - lolo.put("dynamic", props); - es.save("PortalUser", lolo); - hibernate.commitTransaction(); - - hibernate.openSession(); - es = hibernate.getCurrentSession(); - Query query = es.createQuery("from PortalUser where userName=:userName"); - query.setParameter("userName", "lolo"); - lolo = (Map)query.uniqueResult(); - assertNotNull(lolo.get("roles")); - assertNotNull(lolo.get("dynamic")); - hibernate.commitTransaction(); - - //hibernate.openSession(); - - //Session es = hibernate.getCurrentSession(); - /*Session es = sf.openSession(); - Transaction tx = es.beginTransaction(); - Map lolo = new HashMap(); - lolo.put("userName", "lolo"); - es.save("PortalUser", lolo); - Query query = es.createQuery("from PortalUser where userName=:userName"); - query.setParameter("userName", "lolo"); - lolo = (Map)query.uniqueResult(); - tx.commit(); - //hibernate.commitTransaction(); - - - es = sf.getCurrentSession(); - tx = es.beginTransaction(); - query = es.createQuery("from PortalUser where userName=:userName"); - query.setParameter("userName", "lolo"); - lolo = (Map)query.uniqueResult(); - //hibernate.commitTransaction(); - tx.commit();*/ - } - - -} Deleted: trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,411 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.portal.test.identity; - -import junit.framework.Assert; -import org.jboss.portal.identity.UserModule; -import org.jboss.portal.identity.RoleModule; -import org.jboss.portal.identity.User; -import org.jboss.portal.identity.Role; -import org.jboss.portal.identity.MembershipModule; -import org.jboss.portal.identity.UserProfileModule; -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.common.util.CollectionBuilder; - -import java.util.Set; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Arrays; -import java.util.Collections; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class UserTest extends Assert -{ - - /** . */ - private UserModule userModule; - - /** . */ - private RoleModule roleModule; - - /** . */ - private MembershipModule membershipModule; - - /** . */ - private UserProfileModule userProfileModule; - - - /** . */ - private UserTest.Context ctx; - - public void setUserModule(UserModule userModule) - { - this.userModule = userModule; - } - - public void setRoleModule(RoleModule roleModule) - { - this.roleModule = roleModule; - } - - public void setMembershipModule(MembershipModule membershipModule) - { - this.membershipModule = membershipModule; - } - - public void setUserProfileModule(UserProfileModule userProfileModule) - { - this.userProfileModule = userProfileModule; - } - - public void setContext(UserTest.Context ctx) - { - this.ctx = ctx; - } - - public void testFindUsersUsingFilter() throws Exception - { - ctx.begin(); - Set set1 = userModule.findUsersFilteredByUserName("user", 0, 10); - Set nameSet1 = new HashSet(); - for (Iterator i = set1.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet1.add(user.getUserName()); - } - Set expectedNameSet1 = new HashSet(); - expectedNameSet1.add("user1"); - expectedNameSet1.add("user2"); - assertEquals(expectedNameSet1, nameSet1); - - // - Set set2 = userModule.findUsersFilteredByUserName("blah", 0, 10); - assertEquals(0, set2.size()); - - // - Set set3 = userModule.findUsersFilteredByUserName("", 0, 10); - Set nameSet3 = new HashSet(); - for (Iterator i = set3.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet3.add(user.getUserName()); - } - Set expectedNameSet3 = new HashSet(); - expectedNameSet3.add("user1"); - expectedNameSet3.add("user2"); - assertEquals(expectedNameSet3, nameSet3); - - // - Set set4 = userModule.findUsersFilteredByUserName("user1", 0, 10); - Set nameSet4 = new HashSet(); - for (Iterator i = set4.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet4.add(user.getUserName()); - } - Set expectedNameSet4 = new HashSet(); - expectedNameSet4.add("user1"); - assertEquals(expectedNameSet4, nameSet4); - ctx.commit(); - } - - public void testFindUser1() throws Exception - { - ctx.begin(); - User u1 = userModule.findUserByUserName("user1"); - assertNotNull(u1); - Assert.assertEquals("user1", u1.getUserName()); - assertNotNull(membershipModule.getRoles(u1)); - Assert.assertEquals(1, membershipModule.getRoles(u1).size()); - Assert.assertEquals("role1", ((Role)membershipModule.getRoles(u1).iterator().next()).getName()); - Assert.assertEquals(u1.getId(), userModule.findUserById(u1.getId()).getId()); - ctx.commit(); - } - - public void testFindUser2() throws Exception - { - ctx.begin(); - Set roleNames = new HashSet(Arrays.asList(new Object[]{"role1", "role2"})); - User u2 = userModule.findUserByUserName("user2"); - assertNotNull(u2); - Assert.assertEquals("user2", u2.getUserName()); - assertNotNull(membershipModule.getRoles(u2)); - Assert.assertEquals(2, membershipModule.getRoles(u2).size()); - Iterator iterator = membershipModule.getRoles(u2).iterator(); - assertTrue(roleNames.contains(((Role)iterator.next()).getName())); - assertTrue(roleNames.contains(((Role)iterator.next()).getName())); - Assert.assertEquals(u2.getId(), userModule.findUserById(u2.getId()).getId()); - ctx.commit(); - } - - public void testFindUsers() throws Exception - { - ctx.begin(); - Set c1 = userModule.findUsers(0, 1); - assertNotNull(c1); - assertEquals(1, c1.size()); - - Set c2 = userModule.findUsers(1, 1); - assertNotNull(c2); - assertEquals(1, c2.size()); - - Set c3 = userModule.findUsers(0, 2); - assertNotNull(c3); - assertEquals(2, c3.size()); - - Set s1 = new HashSet(); - s1.add(((User)c1.iterator().next()).getUserName()); - s1.add(((User)c2.iterator().next()).getUserName()); - Set s2 = new HashSet(); - Iterator iterator = c3.iterator(); - s2.add(((User)iterator.next()).getUserName()); - s2.add(((User)iterator.next()).getUserName()); - assertEquals(s1, s2); - ctx.commit(); - } - - public void testCreateUser() throws Exception - { - ctx.begin(); - User u3 = userModule.createUser("user3", "password"); - Role g1 = roleModule.findRoleByName("role1"); - membershipModule.assignRoles(u3, Collections.singleton(g1)); - Assert.assertEquals("user3", u3.getUserName()); - assertNotNull(membershipModule.getRoles(u3)); - Assert.assertEquals(1, membershipModule.getRoles(u3).size()); - Assert.assertEquals("role1", ((Role)membershipModule.getRoles(u3).iterator().next()).getName()); - ctx.commit(); - - ctx.begin(); - u3 = userModule.findUserByUserName("user3"); - assertNotNull(u3); - Assert.assertEquals("user3", u3.getUserName()); - assertNotNull(membershipModule.getRoles(u3)); - Assert.assertEquals(1, membershipModule.getRoles(u3).size()); - Assert.assertEquals("role1", ((Role)membershipModule.getRoles(u3).iterator().next()).getName()); - ctx.commit(); - } - - // public void testCreateDuplicateUser() throws Exception - // { - // try - // { - // userModule.createUser("user1"); - // fail("Expected exception on duplicate user"); - // } - // catch (ModuleException expected) - // { - // } - // } - - public void testCreateRole() throws Exception - { - ctx.begin(); - Role g3 = roleModule.createRole("role3", "roleName"); - Assert.assertEquals("role3", g3.getName()); - ctx.commit(); - - ctx.begin(); - g3 = roleModule.findRoleByName("role3"); - assertNotNull(g3); - Assert.assertEquals("role3", g3.getName()); - ctx.commit(); - } - - // public void testCreateDuplicateRole() throws Exception - // { - // try - // { - // roleModule.createRole("user1"); - // fail("Expected exception on duplicate role"); - // } - // catch (ModuleException expected) - // { - // } - // } - - public void testCountUser() throws Exception - { - ctx.begin(); - Assert.assertEquals(2, userModule.getUserCount()); - ctx.commit(); - } - - public void testRemoveNonExistingRole() throws Exception - { - ctx.begin(); - try - { - roleModule.removeRole(new Long(Long.MAX_VALUE)); - fail("Expected exception"); - } - catch (IdentityException expected) - { - } - ctx.commit(); - } - - public void testRemoveRole() throws Exception - { - ctx.begin(); - Role g1 = roleModule.findRoleByName("role1"); - Object id = g1.getId(); - roleModule.removeRole(id); - try - { - roleModule.findRoleById(id); - fail("Expected exception"); - } - catch (IdentityException expected) - { - } - ctx.commit(); - - ctx.begin(); - try - { - roleModule.findRoleById(id); - fail("Expected exception"); - } - catch (IdentityException expected) - { - } - User u1 = userModule.findUserByUserName("user1"); - assertNotNull(u1); - Assert.assertEquals("user1", u1.getUserName()); - ctx.commit(); - } - - public void testRemoveUser() throws Exception - { - ctx.begin(); - User u1 = userModule.findUserByUserName("user1"); - Object id = u1.getId(); - userModule.removeUser(id); - try - { - userModule.findUserById(id); - fail("Expected exception"); - } - catch (IdentityException expected) - { - } - ctx.commit(); - - ctx.begin(); - try - { - userModule.findUserById(id); - fail("Expected exception"); - } - catch (IdentityException expected) - { - } - Role g1 = roleModule.findRoleByName("role1"); - assertNotNull(g1); - Assert.assertEquals("role1", g1.getName()); - Role g2 = roleModule.findRoleByName("role2"); - assertNotNull(g2); - Assert.assertEquals("role2", g2.getName()); - ctx.commit(); - } - - public void testFindRoles() throws Exception - { - ctx.begin(); - Set roleNames = new HashSet(Arrays.asList(new Object[]{"role1", "role2"})); - Set roles = roleModule.findRoles(); - assertEquals(2, roles.size()); - Iterator iterator = roles.iterator(); - assertTrue(roleNames.contains(((Role)iterator.next()).getName())); - assertTrue(roleNames.contains(((Role)iterator.next()).getName())); - ctx.commit(); - } - - public void testFindRoleMembers() throws Exception - { - ctx.begin(); - Set set1 = membershipModule.findRoleMembers("role1", 0, 10, "user"); - Set nameSet1 = new HashSet(); - for (Iterator i = set1.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet1.add(user.getUserName()); - } - Set expectedNameSet1 = new HashSet(); - expectedNameSet1.add("user1"); - expectedNameSet1.add("user2"); - assertEquals(expectedNameSet1, nameSet1); - - // - Set set2 = membershipModule.findRoleMembers("role1", 0, 10, "blah"); - assertEquals(0, set2.size()); - - // - Set set3 = membershipModule.findRoleMembers("role1", 0, 10, ""); - Set nameSet3 = new HashSet(); - for (Iterator i = set3.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet3.add(user.getUserName()); - } - Set expectedNameSet3 = new HashSet(); - expectedNameSet3.add("user1"); - expectedNameSet3.add("user2"); - assertEquals(expectedNameSet3, nameSet3); - - // - Set set4 = membershipModule.findRoleMembers("role1", 0, 10, "user1"); - Set nameSet4 = new HashSet(); - for (Iterator i = set4.iterator(); i.hasNext();) - { - User user = (User)i.next(); - nameSet4.add(user.getUserName()); - } - Set expectedNameSet4 = new HashSet(); - expectedNameSet4.add("user1"); - assertEquals(expectedNameSet4, nameSet4); - ctx.commit(); - } -// - public void populate() throws Exception - { - ctx.begin(); - User u1 = userModule.createUser("user1", ""); - User u2 = userModule.createUser("user2", ""); - Role g1 = roleModule.createRole("role1", "role1"); - Role g2 = roleModule.createRole("role2", "role2"); - membershipModule.assignRoles(u1, Collections.singleton(g1)); - membershipModule.assignRoles(u2, new CollectionBuilder().add(g1).add(g2).toHashSet()); - ctx.commit(); - } - - public interface Context - { - void begin(); - - void commit(); - } -} Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBIdentityTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -27,9 +27,7 @@ import org.jboss.portal.identity.service.UserProfileModuleService; import org.jboss.portal.identity.service.MembershipModuleService; import org.jboss.portal.identity.service.RoleModuleService; -import org.jboss.portal.test.identity.UserTest; import org.jboss.portal.test.identity.IdentityTest; -import org.jboss.portal.common.p3p.P3PConstants; import junit.framework.TestSuite; import java.util.Date; Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -24,7 +24,6 @@ import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; import org.jboss.portal.test.framework.TestRuntimeContext; -import org.jboss.portal.test.identity.UserTest; import org.jboss.portal.test.identity.IdentityTest; import org.jboss.portal.common.test.junit.POJOJUnitTest; import org.jboss.portal.common.test.junit.JUnitAdapter; Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPIdentityTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,18 +1,12 @@ package org.jboss.portal.test.identity.ldap; -import org.jboss.portal.test.identity.db.DBTestCase; -import org.jboss.portal.test.identity.db.DBIdentityTestCase; -import org.jboss.portal.test.identity.UserTest; import org.jboss.portal.test.identity.IdentityTest; import org.jboss.portal.identity.IdentityServiceControllerImpl; import org.jboss.portal.identity.IdentityContext; -import org.jboss.portal.identity.User; -import org.jboss.portal.identity.ProfileMap; import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.UserProfileModule; -import org.jboss.portal.identity.db.HibernateUserImpl; import org.jboss.portal.identity.service.UserModuleService; import org.jboss.portal.identity.service.RoleModuleService; import org.jboss.portal.identity.service.MembershipModuleService; @@ -34,7 +28,7 @@ */ public class LDAPIdentityTestCase extends LDAPTestCase implements IdentityTest.Context { - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DBTestCase.class); + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPIdentityTestCase.class); static { Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPMembershipModuleTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPMembershipModuleTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -32,27 +32,9 @@ public abstract class LDAPMembershipModuleTestCase extends LDAPTestCase { - /** . */ - //protected MembershipStrategyTest mstc; - public void setUp() throws Exception { - //mstc = new MembershipStrategyTest(); super.setUp(); } - /*public void testFirstSimple() throws Exception - { - mstc.testFirstSimple(); - } - - public void testSecondSimple() throws Exception - { - mstc.testSecondSimple(); - } - - public void testThirdSimple() throws Exception - { - mstc.testThirdSimple(); - }*/ } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -188,10 +188,6 @@ assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); assertTrue(names.contains((prefix + "=jduke4,ou=People," + suffix).toLowerCase())); - /*membershipModule.assignUsers(role,new HashSet()); - users = membershipModule.getUsers(role); - - assertEquals(0, users.size());*/ } Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -56,7 +56,7 @@ * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> * @version $Revision: 5247 $ */ -public abstract class LDAPTestCase extends junit.framework.TestCase //implements MembershipStrategyTest.Context +public abstract class LDAPTestCase extends junit.framework.TestCase { private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPTestCase.class); @@ -141,7 +141,6 @@ runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml"); runtimeContext.addBean("LDAPTestBean", this); - runtimeContext.addBean("DBTestBean", this); runtimeContext.addBean("HibernateSupport", hibernate); runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter); HibernateSupport.Config config = HibernateSupport.getConfig(dataSourceConfigParameter.getName()); Deleted: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserTestCase.java 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserTestCase.java 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,412 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.identity.ldap; - -import junit.framework.TestSuite; -//import org.apache.directory.server.protocol.shared.store.LdifFileLoader; -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.common.test.junit.POJOJUnitTest; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.test.framework.TestRuntimeContext; -import org.jboss.portal.test.framework.embedded.DSConfig; -import org.jboss.portal.test.identity.UserTest; - -import javax.naming.Binding; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import java.net.URL; -import java.util.Hashtable; -import java.util.Map; -import java.util.HashMap; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> - * @version $Revision: 5247 $ - */ -public class LDAPUserTestCase extends junit.framework.TestCase implements UserTest.Context -{ - - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPUserTestCase.class); - - public static TestSuite suite() throws Exception - { - URL configsURL = Thread.currentThread().getContextClassLoader().getResource("directories.xml"); - Map parameterMap = new HashMap(); - parameterMap.put("DirectoryServerConfig", DSConfig.fromXML2(configsURL)); - POJOJUnitTest abc = new POJOJUnitTest(LDAPUserTestCase.class); - JUnitAdapter adapter = new JUnitAdapter(abc, parameterMap); - TestSuite suite = new TestSuite(); - suite.addTest(adapter); - return suite; - } - - static - { - Appender appender = new ConsoleAppender(new SimpleLayout()); - Logger.getRoot().addAppender(appender); - Logger.getRoot().setLevel(Level.INFO); - } - - /** . */ - private TestRuntimeContext runtimeContext; - - /** . */ - private DSConfig directoryServerConfigParameter; - - /** . */ - private UserTest utc; - - /** . */ - //private HibernateUserModuleImpl userModule; - - public DSConfig getDirectoryServerConfigParameter() - { - return directoryServerConfigParameter; - } - - public void setDirectoryServerConfigParameter(DSConfig directoryServerConfigParameter) - { - this.directoryServerConfigParameter = directoryServerConfigParameter; - } - - /** . */ - //private HibernateRoleModuleImpl roleModule; - - - - public String getName() - { - return super.getName() + "," + directoryServerConfigParameter.getName() + "," + directoryServerConfigParameter.getDescription(); - } - - protected void setUp() throws Exception - { - runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml"); - runtimeContext.addBean("LDAPTestBean", this); - runtimeContext.start(); - - // - utc = new UserTest(); - /* - userModule = new HibernateUserModuleImpl(); - userModule.setSessionFactoryJNDIName("java:/SessionFactory"); - userModule.start(); - - // - roleModule = new HibernateRoleModuleImpl(); - roleModule.setSessionFactoryJNDIName("java:/SessionFactory"); - roleModule.start(); - - // - utc.setUserModule(userModule); - utc.setRoleModule(roleModule); - utc.setContext(this); - utc.populate();*/ - - try - { - //on start load the content into ldap - - DirContext ctx = getDirContext(); - ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - - URL ldif = tcl.getResource("ldap/ldif/example1.ldif"); - log.info("ldif to load by loader: " + ldif.getPath()); - - /*LdifFileLoader loader = new LdifFileLoader(ctx, ldif.getPath()); - loader.execute();*/ - } - catch (Exception e) - { - log.info("fail to import initial ldif for tests", e); - } - } - - protected void tearDown() throws Exception - { - - /*utc.setUserModule(null); - utc.setRoleModule(null); - utc.setContext(null); - utc = null; - - // - roleModule.destroy(); - userModule.destroy(); - roleModule = null; - userModule = null;*/ - - // - //on exit remove dc=jboss,dc=org - try - { - DirContext ctx = getDirContext(); - DirContext org = (DirContext)ctx.lookup("dc=org"); - removeContext(org, "dc=jboss"); - } - catch (Exception e) - { - log.info("fail to unbind content from tests", e); - } - - runtimeContext.stop(); - } - - - public void begin() - { - - } - - - public void commit() - { - - - } - - - public void testSimple() throws Exception - { - log.info("simple test"); - DirContext ctx = getDirContext(); - DirContext org = (DirContext)ctx.lookup("dc=org"); - NamingEnumeration bindings = ctx.listBindings("dc=org"); - log.info("listing before remove: "); - while (bindings.hasMore()) - { - - Binding bd = (Binding)bindings.next(); - //log.info("name enum element: " + bd.getClass().getName()); - log.info(bd.getName() + ": " + bd.getObject()); - } - - //removeContext(org,"dc=jboss"); - - bindings = ctx.listBindings("dc=org"); - log.info("listing after remove: "); - while (bindings.hasMore()) - { - Binding bd = (Binding)bindings.next(); - log.info(bd.getName() + ": " + bd.getObject()); - } - } - - public void testSecondSimple() throws Exception - { - log.info("second test"); - } - - public void testThirdSimple() throws Exception - { - log.info("third test"); - } - // - - /*public void testFindUsersUsingFilter() throws Exception - { - utc.testFindUsersUsingFilter(); - } - - public void testFindUser1() throws Exception - { - utc.testFindUser1(); - } - - public void testFindUser2() throws Exception - { - utc.testFindUser2(); - } - - public void testFindUsers() throws Exception - { - utc.testFindUsers(); - } - - public void testCreateUser() throws Exception - { - utc.testCreateUser(); - } - - public void testCreateRole() throws Exception - { - utc.testCreateRole(); - } - - public void testCountUser() throws Exception - { - utc.testCountUser(); - } - - public void testRemoveNonExistingRole() throws Exception - { - utc.testRemoveNonExistingRole(); - } - - public void testRemoveRole() throws Exception - { - utc.testRemoveRole(); - } - - public void testRemoveUser() throws Exception - { - utc.testRemoveUser(); - } - - public void testFindRoles() throws Exception - { - utc.testFindRoles(); - } - - public void testFindRoleMembers() throws Exception - { - utc.testFindRoleMembers(); - } - - public void testDynamicProperty() throws Exception - { - begin(); - User user = userModule.createUser("testname", "testpassword", "testemail"); - ProfileMap map = user.getProfile(); - assertNull(map.get("foo")); - assertFalse(map.isReadOnly("foo")); - map.put("foo", "value"); - assertEquals("value", map.get("foo")); - assertFalse(map.isReadOnly("foo")); - commit(); - - begin(); - user = userModule.findUserByUserName("testname"); - map = user.getProfile(); - assertEquals("value", map.get("foo")); - assertFalse(map.isReadOnly("foo")); - commit(); - } - - public void testStaticProperty() throws Exception - { - begin(); - - // - User user = userModule.createUser("testname", "testpassword", "testemail"); - ProfileMap map = user.getProfile(); - assertEquals("testname", map.get(P3PConstants.INFO_USER_NAME_NICKNAME)); - - // Test cannot remove a static property - try - { - map.remove(P3PConstants.INFO_USER_NAME_GIVEN); - fail("Should not be capable to remove static property"); - } - catch (IllegalArgumentException expected) - { - } - - // Test read only property - assertTrue(map.isReadOnly(P3PConstants.INFO_USER_NAME_NICKNAME)); - try - { - map.put(P3PConstants.INFO_USER_NAME_NICKNAME, "anothername"); - fail("Should not be capable to modify a read only static property"); - } - catch (IllegalArgumentException expected) - { - } - - // Test non nullable and writable property - try - { - map.put(User.INFO_USER_VIEW_EMAIL_VIEW_REAL, null); - fail("Should not be capable to nullify a non nullable static property"); - } - catch (NullPointerException expected) - { - } - map.put(User.INFO_USER_VIEW_EMAIL_VIEW_REAL, "true"); - assertEquals(true, user.getViewRealEmail()); - - // Test boolean property - map.put(User.INFO_USER_VIEW_EMAIL_VIEW_REAL, "false"); - assertEquals("false", map.get(User.INFO_USER_VIEW_EMAIL_VIEW_REAL)); - assertEquals(false, user.getViewRealEmail()); - map.put(User.INFO_USER_VIEW_EMAIL_VIEW_REAL, "true"); - assertEquals("true", map.get(User.INFO_USER_VIEW_EMAIL_VIEW_REAL)); - assertEquals(true, user.getViewRealEmail()); - user.setViewRealEmail(false); - assertEquals("false", map.get(User.INFO_USER_VIEW_EMAIL_VIEW_REAL)); - assertEquals(false, user.getViewRealEmail()); - user.setViewRealEmail(true); - assertEquals("true", map.get(User.INFO_USER_VIEW_EMAIL_VIEW_REAL)); - assertEquals(true, user.getViewRealEmail()); - try - { - map.put(User.INFO_USER_VIEW_EMAIL_VIEW_REAL, "truee"); - fail("Should not be capable to set a bad value to boolean property"); - } - catch (IllegalArgumentException expected) - { - } - - // Test date - Date date = user.getRegistrationDate(); - SimpleDateFormat sdf = new SimpleDateFormat(); - assertEquals(sdf.format(date), map.get(User.INFO_USER_REGISTRATION_DATE)); - - commit(); - }*/ - - private DirContext getDirContext() throws Exception - { - Hashtable env = new Hashtable(); - env.put(Context.INITIAL_CONTEXT_FACTORY, directoryServerConfigParameter.getContextFactory()); - env.put(Context.PROVIDER_URL, directoryServerConfigParameter.getHost()); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); - env.put(Context.SECURITY_PRINCIPAL, directoryServerConfigParameter.getAdminDN()); - env.put(Context.SECURITY_CREDENTIALS, directoryServerConfigParameter.getAdminPassword()); - return new InitialDirContext(env); - } - - //subsequent remove of javax.naming.Context - private void removeContext(Context mainCtx, String name) throws Exception - { - Context deleteCtx = (Context)mainCtx.lookup(name); - NamingEnumeration subDirs = mainCtx.listBindings(name); - - while (subDirs.hasMoreElements()) - { - Binding binding = (Binding)subDirs.nextElement(); - String subName = binding.getName(); - - removeContext(deleteCtx, subName); - } - - mainCtx.unbind(name); - } -} Modified: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml =================================================================== --- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml 2007-03-19 15:43:20 UTC (rev 6747) @@ -73,12 +73,11 @@ </bean> - <bean name="LDAPTestBean" class="org.jboss.portal.test.identity.ldap.LDAPUserTestCase"> + <bean name="LDAPTestBean" class="org.jboss.portal.test.identity.ldap.LDAPTestCase"> <constructor factoryMethod="getBean"> <factory bean="BeanFactory"/> <parameter>LDAPTestBean</parameter> </constructor> -  </bean> </deployment> Deleted: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml =================================================================== --- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/proto-beans.xml 2007-03-19 15:43:20 UTC (rev 6747) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"> - - <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"> - </bean> - - <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config"> -  - <property name="name">dummy</property> - <property name="connectionURL">jdbc:mysql://localhost:3306/portal_test</property> - <property name="driverClass">org.gjt.mm.mysql.Driver</property> - <property name="userName">root</property> -  - </bean> - - <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config"> - <constructor factoryMethod="getBean"> - <factory bean="BeanFactory"/> - <parameter>HibernateConfig</parameter> - </constructor> - </bean> - - <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport"> - </bean> - - <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport"> - <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - </bean> - - <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> - <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> - <property name="config"><inject bean="DataSourceConfig"/></property> - </bean> - - <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport"> - <property name="config"><inject bean="HibernateConfig"/></property> - <property name="jNDIName">java:/TestSessionFactory</property> - <property name="mappings"> - <list elementClass="java.lang.String"> - <value>domain-proto.hbm.xml</value> - </list> - </property> - </bean> - - <bean name="LDAPTestBean" class="org.jboss.portal.test.identity.UserProtoTestCase"> - <constructor factoryMethod="getBean"> - <factory bean="BeanFactory"/> - <parameter>LDAPTestBean</parameter> - </constructor> - <property name="hibernate"><inject bean="HibernateSupport"/></property> - </bean> - -</deployment> Modified: trunk/test/src/etc/directories-extrolemodule.xml =================================================================== --- trunk/test/src/etc/directories-extrolemodule.xml 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/test/src/etc/directories-extrolemodule.xml 2007-03-19 15:43:20 UTC (rev 6747) @@ -34,7 +34,7 @@ <populate-ldif>ldap/ldif/initial-tests-qa-opends.ldif</populate-ldif> <cleanup-dn>dc=example,dc=com</cleanup-dn> </directory> -  + </directory>  + </directory> <!--<directory> <directory-name>MSAD</directory-name> <description>Microsoft Active Directory in QA Labs (need vpn access)</description> Modified: trunk/test/src/etc/directories-staticrolemembership.xml =================================================================== --- trunk/test/src/etc/directories-staticrolemembership.xml 2007-03-19 14:54:27 UTC (rev 6746) +++ trunk/test/src/etc/directories-staticrolemembership.xml 2007-03-19 15:43:20 UTC (rev 6747) @@ -57,7 +57,7 @@ <description>OpenLDAP Directory in QA Labs (need vpn access)</description> <config-file>test/config/openldap-config.xml</config-file> - <host>dev09.qa.atl.jboss.com</host> + <host>dev39.qa.atl.jboss.com</host> <port>389</port> <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn>

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6746 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-03-19 10:54:27 -0400 (Mon, 19 Mar 2007) New Revision: 6746 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml Log: - Add submit and cancel buttons on instances security - Make cancel buttons work on security pages - Let the admin modify the Personalize security flag on instances Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-19 14:54:27 UTC (rev 6746) @@ -24,31 +24,29 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Comparator; -import java.util.Collections; import java.util.Set; +import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; -import javax.faces.application.FacesMessage; -import org.jboss.logging.Logger; +import org.jboss.portal.common.value.Value; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.NoSuchInstanceException; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.security.AuthorizationDomainRegistry; +import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.common.value.Value; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -58,9 +56,6 @@ public class InstanceManagerBean { - /** . */ - private Logger log = Logger.getLogger(getClass()); - // Wired services /** . */ @@ -410,7 +405,8 @@ public SelectItem[] getAvailableActions() { return new SelectItem[]{ - new SelectItem("view") + new SelectItem("view", "View"), + new SelectItem("personalize", "Personalize"), }; } } Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -11,7 +11,7 @@ <ui:define name="form_submit"> <h:form> <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true"> <f:param name="id" value="#{node.id}"/> </h:commandButton> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -12,7 +12,7 @@ <ui:define name="form_submit"> <h:form> <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"> + <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true"> <f:param name="id" value="#{node.id}"/> </h:commandButton> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -101,9 +101,16 @@ <c:if test="#{instancemgr.selectedPlugin == 'security'}"> <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> - <ui:include src="common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> - </ui:include> + + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + <ui:define name="form_submit"> + <h:form> + <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="instances" styleClass="portlet-form-button" immediate="true"/> + </h:form> + </ui:define> + </ui:decorate> </c:if> </c:if>

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2007