[portal-commits] JBoss Portal SVN: r8850 - in modules/portlet/trunk/portlet/src/main/org/jboss/portal: test/framework/portlet/components and 45 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Thu Nov 8 16:44:41 EST 2007
Author: julien at jboss.com
Date: 2007-11-08 16:44:40 -0500 (Thu, 08 Nov 2007)
New Revision: 8850
Added:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/MinimizedStateDontRenderTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModePortletTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPoint.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPointType.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestActor.java
Removed:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java
Modified:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP11.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateImmutableValueTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateMutableValueTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatchingFilterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/GetRequestURITestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/RequestHeaderAccessTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/TestLog4jTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java
Log:
portlet test cases improvements
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,97 +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;
-
-/**
- * Defines a binding point for component id and its method.
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 5510 $
- */
-public class Joinpoint
-{
-
- /** . */
- public static int PORTLET_RENDER = 0;
-
- /** . */
- public static int PORTLET_ACTION = 1;
-
- /** . */
- //public static int PORTLET_INIT = 1;
-
- /** . */
- public static int SERVLET_SERVICE = 2;
-
-
- /** Id of component like "portlet A", "Servlet B". */
- private final String id;
-
- /** method in component like "render" and etc. */
- private final int point;
-
- public Joinpoint(String id, int point)
- {
- if (id == null)
- {
- throw new IllegalArgumentException("Component id value cannot be 'null'");
- }
- else if (point < 0)
- {
- throw new IllegalArgumentException("Binding point has wrong value");
- }
- this.id = id;
- this.point = point;
- }
-
- public String getId()
- {
- return id;
- }
-
- public int getPoint()
- {
- return point;
- }
-
- public int hashCode()
- {
- return id.hashCode() * point;
- }
-
- public boolean equals(Object obj)
- {
- if (!(obj instanceof Joinpoint))
- {
- throw new IllegalArgumentException("Cannot compare with different object class");
- }
- Joinpoint j = (Joinpoint)obj;
- return id.equals(j.id) && point == j.point;
- }
-
- public String toString()
- {
- return id + "_" + point;
- }
-}
-
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,148 +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.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 at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 6752 $
- */
-public class PortletTest
-{
-
- /** . */
- private Map actionMap;
-
- /** . */
- Set parameters;
-
- public PortletTest()
- {
- this.actionMap = new HashMap();
- this.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;
- }
- }
-
- //
-
-}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java (from rev 8829, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTest.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,201 @@
+/******************************************************************************
+ * 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 org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.JoinPoint;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * A sequence of test actions.
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 6752 $
+ */
+public class PortletTestCase
+{
+
+ /** . */
+ private final Map<Key, TestAction> bindings;
+
+ /** . */
+ private final Set<String> parameters;
+
+ public PortletTestCase()
+ {
+ this.bindings = new HashMap<Key, TestAction>();
+ this.parameters = new HashSet<String>();
+ }
+
+ public void addParameter(String parameterName)
+ {
+ parameters.add(parameterName);
+ }
+
+ public void bindAction(JoinPoint joinPoint, TestAction action)
+ {
+ bindAction(NodeId.DEFAULT, joinPoint, action);
+ }
+
+ public void bindAction(NodeId nodeId, JoinPoint joinPoint, TestAction action)
+ {
+ internalBind(null, nodeId, joinPoint, action);
+ }
+
+ public void bindAction(int requestCount, JoinPoint joinPoint, TestAction action)
+ {
+ bindAction(requestCount, NodeId.DEFAULT, joinPoint, action);
+ }
+
+ public void bindAction(int requestCount, NodeId nodeId, JoinPoint joinPoint, TestAction action)
+ {
+ internalBind(requestCount, nodeId, joinPoint, action);
+ }
+
+ public void internalBind(Integer count, NodeId nodeId, JoinPoint joinPoint, TestAction action)
+ {
+ if (action == null)
+ {
+ throw new IllegalArgumentException("Action can't be null");
+ }
+
+ // Check any global binding first
+ if (bindings.containsKey(new Key(nodeId, joinPoint)))
+ {
+ throw new IllegalStateException("Action for this joinpoint already defined globally");
+ }
+
+ //
+ Key key = new Key(count, nodeId, joinPoint);
+
+ //
+ if (bindings.containsKey(key))
+ {
+ throw new IllegalStateException("Action for this joinpoint already defined in provided request count");
+ }
+ else
+ {
+ bindings.put(key, action);
+ }
+ }
+
+ public TestAction getAction(int count, JoinPoint joinPoint)
+ {
+ return getAction(count, NodeId.DEFAULT, joinPoint);
+ }
+
+ public String getActorId(int count, JoinPointType joinPointType)
+ {
+ for (Key key : bindings.keySet())
+ {
+ if (key.joinPoint.getType() == joinPointType)
+ {
+ if (key.count == null || key.count == count)
+ {
+ return key.joinPoint.getActorId();
+ }
+ }
+ }
+ return null;
+ }
+
+ public TestAction getAction(int count, NodeId nodeId, JoinPoint joinPoint)
+ {
+ // Try a timed action
+ TestAction action = bindings.get(new Key(count, nodeId, joinPoint));
+
+ // Try a global action
+ if (action == null)
+ {
+ action = bindings.get(new Key(nodeId, joinPoint));
+ }
+
+ //
+ return action;
+ }
+
+ private static class Key
+ {
+
+ /** . */
+ private final Integer count;
+
+ /** . */
+ private final NodeId nodeId;
+
+ /** . */
+ private final JoinPoint joinPoint;
+
+ public Key(NodeId nodeId, JoinPoint joinPoint)
+ {
+ this(null, nodeId, joinPoint);
+ }
+
+ public Key(Integer count, NodeId nodeId, JoinPoint joinPoint)
+ {
+ if (count != null && count < 0)
+ {
+ throw new IllegalArgumentException("Count value 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.count = count;
+ 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.count == null ? that.count == null : this.count == that.count) && this.joinPoint.equals(that.joinPoint) && this.nodeId.equals(that.nodeId);
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ int result;
+ result = count != null ? count : 0;
+ result = 29 * result + nodeId.hashCode();
+ result = 29 * result + joinPoint.hashCode();
+ return result;
+ }
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java
___________________________________________________________________
Name: svn:executable
+
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,6 +23,8 @@
package org.jboss.portal.test.framework.portlet;
import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.unit.JoinPointType;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.remote.RequestContext;
import org.jboss.unit.remote.ResponseContext;
@@ -42,18 +44,22 @@
final String testName;
/** . */
+ final PortletTestCase portletTestCase;
+
+ /** . */
RequestContext requestContext;
/** . */
ResponseContext responseContext;
- public PortletTestContext(String testName, RequestContext requestContext)
+ public PortletTestContext(String testName, PortletTestCase portletTestCase, RequestContext requestContext)
{
if (requestContext == null)
{
- throw new IllegalArgumentException("No HTTP test context to wrap");
+ throw new IllegalArgumentException("No request context to wrap");
}
this.testName = testName;
+ this.portletTestCase = portletTestCase;
this.requestContext = requestContext;
}
@@ -62,6 +68,11 @@
return testName;
}
+ public String getActorId(JoinPointType joinPointType)
+ {
+ return portletTestCase.getActorId(requestContext.getRequestCount(), joinPointType);
+ }
+
public void setResponse(DriverResponse response)
{
responseContext = new ResponseContext(response, new HashMap<String, Serializable>());
@@ -75,7 +86,7 @@
public String rewriteURLForNode(String url, NodeId nodeId) throws MalformedURLException
{
// return testContext.rewriteURLForNode(url, nodeId);
- return null;
+ throw new NotYetImplemented("todo");
}
public String getParameter(String parameterName)
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -84,20 +84,20 @@
/**
* Adding sequence to registry. Sequence can be null as this will clear the binding
*
- * @param testName
- * @param portletTest
+ * @param testCaseName
+ * @param portletTestCase
*/
- public void addSequence(String testName, PortletTest portletTest)
+ public void addTestCase(String testCaseName, PortletTestCase portletTestCase)
{
- if (testName == null)
+ if (testCaseName == null)
{
throw new IllegalArgumentException("Test name must be provided");
}
- if (portletTest == null)
+ if (portletTestCase == null)
{
throw new IllegalArgumentException("Portlet test can't be null");
}
- if (getSequence(testName) != null)
+ if (getTestCase(testCaseName) != null)
{
throw new IllegalArgumentException("Portlet test cannot be bound twice");
}
@@ -105,10 +105,10 @@
//
try
{
- Sequence sequence = new Sequence(testName, portletTest);
+ TestCaseEntry entry = new TestCaseEntry(testCaseName, portletTestCase);
//
- mount(sequence);
+ mount(entry);
}
catch (DriverException e)
{
@@ -116,7 +116,7 @@
}
}
- public void removeSequence(String testName)
+ public void removeTestCase(String testName)
{
TestDriver a = drivers.get(testName);
@@ -124,16 +124,16 @@
unmount(a);
}
- public PortletTest getSequence(String testName)
+ public PortletTestCase getTestCase(String testName)
{
if (testName == null)
{
throw new IllegalArgumentException("Test name can't be null");
}
- Sequence sequence = (Sequence)drivers.get(testName);
+ TestCaseEntry entry = (TestCaseEntry)drivers.get(testName);
//
- return sequence != null ? sequence.test : null;
+ return entry != null ? entry.portletTestCase : null;
}
/**
@@ -146,19 +146,19 @@
return context;
}
- private class Sequence implements RemoteTestDriver
+ private class TestCaseEntry implements RemoteTestDriver
{
/** . */
private final String name;
/** . */
- private final PortletTest test;
+ private final TestCaseInfo info;
/** . */
- private final TestCaseInfo info;
+ private final PortletTestCase portletTestCase;
- public Sequence(String name, PortletTest test)
+ public TestCaseEntry(String name, PortletTestCase portletTestCase)
{
// TestInfo info = new TestInfo(name);
// for (Iterator i = info.getParameterNames().iterator();i.hasNext();)
@@ -168,24 +168,22 @@
// }
//
+ this.portletTestCase = portletTestCase;
this.name = name;
- this.test = test;
this.info = new SimpleTestCaseInfo(name);
}
public void initDriver(DriverContext driverContext)
{
-
}
public void destroyDriver()
{
-
}
public void pushContext(TestId testId, RequestContext requestContext)
{
- context = new PortletTestContext(name, requestContext);
+ context = new PortletTestContext(name, getTestCase(name), requestContext);
}
public ResponseContext popContext(TestId testId)
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -36,15 +36,12 @@
import javax.servlet.ServletContextAttributeEvent;
import javax.servlet.ServletContext;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.lang.reflect.Constructor;
import java.lang.reflect.AnnotatedElement;
-import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Iterator;
-import java.util.regex.Pattern;
import java.net.URL;
import java.net.MalformedURLException;
import java.io.IOException;
@@ -52,30 +49,23 @@
/**
* Builder is invoked when web application initialization process is starting. It builds sequence of tests for this
- * action
+ * action.
*
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 6989 $
*/
-public class PortletTestSuite implements ServletContextListener, ServletContextAttributeListener
+public final class PortletTestSuite implements ServletContextListener, ServletContextAttributeListener
{
/** . */
private final Logger log = Logger.getLogger(getClass());
- /** Defines pattern for method names like createXXX. */
- public static String METHOD_PATTERN = "create.*";
-
/** . */
private PortletTestDriver driver;
/** . */
private ClassLoader loader;
- public PortletTestSuite()
- {
- }
-
/**
* Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into
* SequenceRegistry. Then SequenceRegistry is injected into ServletContext
@@ -106,25 +96,6 @@
driver = new PortletTestDriver(name, remoteDriver);
//
- 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 (Object method : methods)
- {
- Method m = (Method)method;
- try
- {
- log.info("Invoking method: '" + m.getName() + "' ");
- m.invoke(this, driver);
- }
- catch (Exception e)
- {
- log.info("Error during '" + m.getName() + "' method invocation: " + e.getMessage(), e);
- }
- }
-
- //
try
{
for (Class clazz : getClasses(event.getServletContext()))
@@ -151,11 +122,11 @@
{
try
{
- Constructor ctor = clazz.getConstructor(PortletTest.class);
- PortletTest testCase = new PortletTest();
- ctor.newInstance(testCase);
+ Constructor ctor = clazz.getConstructor(PortletTestCase.class);
+ PortletTestCase portletTestCase = new PortletTestCase();
+ ctor.newInstance(portletTestCase);
String testCaseName = clazz.getSimpleName();
- driver.addSequence(testCaseName, testCase);
+ driver.addTestCase(testCaseName, portletTestCase);
}
catch (Exception e)
{
@@ -298,28 +269,4 @@
driver = null;
}
}
-
- /**
- * 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<Method> methods = new ArrayList<Method>(allMethods.size());
- for (Object allMethod : allMethods)
- {
- Method m = (Method)allMethod;
- 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;
- }
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,8 @@
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.PortletTestDriver;
-import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.JoinPointType;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.Failure;
@@ -47,62 +48,77 @@
public abstract class AbstractTestGenericPortlet extends GenericPortlet
{
- /** The test id. */
- private final String testName;
+ /** Joinpoint for render phase. */
+ private final JoinPoint renderJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_RENDER);
- public AbstractTestGenericPortlet(Class testCase)
- {
- testName = testCase.getSimpleName();
- }
+ /** Joinpoint for action phase. */
+ private final JoinPoint actionJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_ACTION);
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
PortletTestContext context = PortletTestDriver.getPortletTestContext();
- if (testName.equals(context.getTestName()))
+
+ //
+ String actorId = context.getActorId(JoinPointType.PORTLET_ACTION);
+
+ //
+ DriverResponse response = new FailureResponse(Failure.createErrorFailure(""));
+
+ //
+ if (actorId != null)
{
- DriverResponse response;
- try
- {
- response = doProcessAction(req, resp, context);
- }
- catch (AssertionError e)
- {
- response = new FailureResponse(Failure.createFailure(e));
- }
+ JoinPoint tmp = new JoinPoint(actorId, JoinPointType.PORTLET_ACTION);
//
- if (response != null)
+ if (tmp.equals(actionJoinPoint))
{
- context.setResponse(response);
+ try
+ {
+ response = doProcessAction(req, resp, context);
+ }
+ catch (AssertionError e)
+ {
+ response = new FailureResponse(Failure.createFailure(e));
+ }
}
}
- else
- {
- context.setResponse(new FailureResponse(Failure.createErrorFailure("")));
- }
+
+ //
+ context.setResponse(response);
}
public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
PortletTestContext context = PortletTestDriver.getPortletTestContext();
- if (testName.equals(context.getTestName()))
+
+ //
+ String actorId = context.getActorId(JoinPointType.PORTLET_RENDER);
+
+ //
+ if (actorId != null)
{
- DriverResponse response;
- try
- {
- preRender(req, resp, context);
- super.render(req, resp);
- response = postRender(req, resp, context);
- }
- catch (AssertionError e)
- {
- response = new FailureResponse(Failure.createFailure(e));
- }
+ JoinPoint tmp = new JoinPoint(actorId, JoinPointType.PORTLET_RENDER);
//
- if (response != null)
+ if (tmp.equals(renderJoinPoint))
{
- context.setResponse(response);
+ DriverResponse response;
+ try
+ {
+ preRender(req, resp, context);
+ super.render(req, resp);
+ response = postRender(req, resp, context);
+ }
+ catch (AssertionError e)
+ {
+ response = new FailureResponse(Failure.createFailure(e));
+ }
+
+ //
+ if (response != null)
+ {
+ context.setResponse(response);
+ }
}
}
}
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,177 +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.components;
-
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
-import org.jboss.portal.test.framework.portlet.PortletTestDriver;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.Failure;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- */
-public abstract class AbstractTestPortlet implements Portlet
-{
-
- /** The test id. */
- private final String testName;
-
- /** To keep PortletConfig for some tests* */
- private PortletConfig config;
-
- /** Construct a test portlet with a test id computed with the method <code>getTestId(Class)</code>. */
- public AbstractTestPortlet()
- {
- testName = createTestName(getClass());
- }
-
- /**
- * Construct a test portlet with the specified id.
- *
- * @param testCaseId
- */
- public AbstractTestPortlet(String testCaseId)
- {
- if (testCaseId == null)
- {
- throw new IllegalArgumentException("No null test case id accepted");
- }
-
- //
- this.testName = testCaseId;
- }
-
- public void init(PortletConfig config) throws PortletException
- {
- this.config = config;
- }
-
- /**
- * Returns the PortletConfig object of this portlet.
- *
- * @return the PortletConfig object of this portlet
- */
- public PortletConfig getPortletConfig()
- {
- return config;
- }
-
- /**
- * Returns the <code>PortletContext</code> of the portlet application the portlet is in.
- *
- * @return the portlet application context
- */
- public PortletContext getPortletContext()
- {
- return config.getPortletContext();
- }
-
- public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
- {
- PortletTestContext context = PortletTestDriver.getPortletTestContext();
- if (testName.equals(context.getTestName()))
- {
- DriverResponse response;
- try
- {
- response = doProcessAction(req, resp, context);
- }
- catch (AssertionError e)
- {
- response = new FailureResponse(Failure.createFailure(e));
- }
-
- //
- if (response != null)
- {
- context.setResponse(response);
- }
- }
- else
- {
- context.setResponse(new FailureResponse(Failure.createErrorFailure("")));
- }
- }
-
- public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
- {
- PortletTestContext context = PortletTestDriver.getPortletTestContext();
- if (testName.equals(context.getTestName()))
- {
- DriverResponse response;
- try
- {
- response = doRender(req, resp, context);
- }
- catch (AssertionError e)
- {
- response = new FailureResponse(Failure.createFailure(e));
- }
-
- //
- if (response != null)
- {
- context.setResponse(response);
- }
- }
- }
-
- public void destroy()
- {
- }
-
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, PortletTestContext context) throws PortletException, IOException
- {
- throw new PortletException();
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
- {
- throw new PortletException();
- }
-
- /** Get the test id from the class name. It can be overriden. */
- protected String createTestName(Class clazz)
- {
- String s = clazz.getName();
- int index = s.lastIndexOf('.');
- if (index != -1)
- {
- s = s.substring(index + 1);
- }
- return s;
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,14 +23,15 @@
package org.jboss.portal.test.framework.portlet.components;
import org.apache.log4j.Logger;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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.PortletTestContext;
import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.unit.JoinPointType;
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.Failure;
@@ -58,14 +59,11 @@
/** . */
private final Logger log = createLogger();
- /** The component id. */
- private String componentId;
-
/** Joinpoint for render phase. */
- private Joinpoint renderJoinpoint;
+ private final JoinPoint renderJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_RENDER);
/** Joinpoint for action phase. */
- private Joinpoint actionJoinpoint;
+ private final JoinPoint actionJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_ACTION);
/** To keep PortletConfig for some tests*-. */
private PortletConfig config;
@@ -73,35 +71,11 @@
/** Construct a test portlet with a test id computed with the method <code>getComponentId()</code>. */
public AbstractUniversalTestPortlet()
{
- String componentId = createComponentId();
- init(componentId);
}
- /**
- * Construct a test portlet with the specified id.
- *
- * @param componentId
- */
- public AbstractUniversalTestPortlet(String componentId)
- {
- init(componentId);
- }
-
- private void init(String componentId)
- {
- if (componentId == null)
- {
- throw new IllegalArgumentException("No null component id accepted");
- }
- this.componentId = componentId;
- this.actionJoinpoint = new Joinpoint(componentId, Joinpoint.PORTLET_ACTION);
- this.renderJoinpoint = new Joinpoint(componentId, Joinpoint.PORTLET_RENDER);
- }
-
public void init(PortletConfig config) throws PortletException
{
this.config = config;
- log.debug("Component '" + getComponentId() + "' init() method invoked");
}
/**
@@ -138,31 +112,31 @@
PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
//
- log.debug("Component '" + getComponentId() + "' processAction() method invoked for '"
+ log.debug("JoinPoint '" + actionJoinPoint + "' invoked for '"
+ ctx.getTestName() + "' testId and '" +
+ctx.getRequestCount() + "' request count");
//
- PortletTest portletTest = getSequence(ctx.getTestName());
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
//
- if (portletTest != null)
+ if (portletTestCase != null)
{
//
- TestAction action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), actionJoinpoint);
+ TestAction action = portletTestCase.getAction(ctx.getRequestCount(), NodeId.locate(), actionJoinPoint);
//
if (action == null)
{
- ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("No action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint)));
+ ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("No action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinPoint)));
}
else if (action instanceof PortletActionTestAction == false)
{
- ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("Action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint + " is not an instance of " + PortletActionTestAction.class.getName() + " but is " + action.getClass().getName())));
+ ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("Action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinPoint + " is not an instance of " + PortletActionTestAction.class.getName() + " but is " + action.getClass().getName())));
}
else
{
- log.debug("Found action for jointpoint " + actionJoinpoint + " : " + action);
+ log.debug("Found action for jointpoint " + actionJoinPoint + " : " + action);
//
DriverResponse response = ((PortletActionTestAction)action).execute(this, req, resp, ctx);
@@ -188,7 +162,7 @@
PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
//
- log.debug("Component '" + getComponentId() + "' render() method invoked for '"
+ log.debug("JoinPoint '" + renderJoinPoint + " invoked for '"
+ ctx.getTestName() + "' testId and '" +
+ctx.getRequestCount() + "' request count");
@@ -201,17 +175,17 @@
// Get the action
TestAction action = null;
- PortletTest portletTest = getSequence(ctx.getTestName());
- if (portletTest != null)
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
+ if (portletTestCase != null)
{
- action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinpoint);
+ action = portletTestCase.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinPoint);
}
//
if (action != null)
{
- log.debug("Found action for jointpoint " + renderJoinpoint + " : " + action);
+ log.debug("Found action for joinpoint " + renderJoinPoint + " : " + action);
// Get the result
DriverResponse sr = ((PortletRenderTestAction)action).execute(this, req, resp, ctx);
@@ -234,18 +208,6 @@
{
}
- /** Get the componentId from the class name. */
- protected String createComponentId()
- {
- String s = getClass().getName();
- int index = s.lastIndexOf('.');
- if (index != -1)
- {
- s = s.substring(index + 1);
- }
- return s;
- }
-
/**
* Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
* in context
@@ -263,7 +225,7 @@
* @return
* @throws PortletException if there is no SequenceRegistry
*/
- private PortletTest getSequence(String testId) throws PortletException
+ private PortletTestCase getSequence(String testId) throws PortletException
{
PortletTestDriver registry = getSequenceRegistry();
if (registry == null)
@@ -271,24 +233,19 @@
log.error("No SequenceRegistry object found in current context");
throw new PortletException("No SequenceRegistry object found in context");
}
- return registry.getSequence(testId);
+ return registry.getTestCase(testId);
}
- protected String getComponentId()
+ public JoinPoint getActionJointpoint()
{
- return componentId;
+ return actionJoinPoint;
}
- public Joinpoint getActionJointpoint()
+ public JoinPoint getRenderJointpoint()
{
- return actionJoinpoint;
+ return renderJoinPoint;
}
- public Joinpoint getRenderJointpoint()
- {
- return renderJoinpoint;
- }
-
protected void reset()
{
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,13 +23,14 @@
package org.jboss.portal.test.framework.portlet.components;
import org.apache.log4j.Logger;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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.PortletTestContext;
import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.unit.JoinPointType;
import org.jboss.unit.driver.DriverResponse;
import javax.servlet.ServletException;
@@ -50,40 +51,15 @@
/** The logger. */
private final Logger log = Logger.getLogger(getClass());
- /** The component id. */
- private String componentId;
-
/** Jointpoint for service method. */
- protected Joinpoint serviceJoinpoint;
+ private final JoinPoint serviceJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.SERVLET_SERVICE);
/** Construct a test servlet with a test id computed with the method <code>getTestId(Class)</code>. */
public AbstractUniversalTestServlet()
{
- super();
- componentId = createComponentId(getClass());
- setServiceJointpoint(new Joinpoint(componentId, Joinpoint.SERVLET_SERVICE));
}
/**
- * Construct a test servlet with the specified id.
- *
- * @param componentId
- */
- public AbstractUniversalTestServlet(String componentId)
- {
- super();
- if (componentId == null)
- {
- throw new IllegalArgumentException("No null component id accepted");
- }
-
- //
- this.componentId = componentId;
- setServiceJointpoint(new Joinpoint(componentId, Joinpoint.SERVLET_SERVICE));
-
- }
-
- /**
* Standart implementation of service() method to handle requests and invoke actions from sequence
*
* @param request
@@ -96,7 +72,7 @@
PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
//
- log.info("Component '" + getComponentId() + "' service() method invoked for '"
+ log.info("JoinPoint " + serviceJoinPoint + " invoked for '"
+ ctx.getTestName() + "' testId and '" +
+ctx.getRequestCount() + "' request count");
@@ -106,10 +82,10 @@
reset();
}
- PortletTest portletTest = getSequence(ctx.getTestName());
- if (portletTest != null)
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
+ if (portletTestCase != null)
{
- TestAction action = portletTest.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint());
+ TestAction action = portletTestCase.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint());
if (action != null && action instanceof ServletServiceTestAction)
{
log.info("Found Action for this jointpoint");
@@ -123,19 +99,6 @@
}
}
- /** Get the componentId from the class name. */
- protected String createComponentId(Class clazz)
- {
- String s = clazz.getName();
- int index = s.lastIndexOf('.');
- if (index != -1)
- {
- s = s.substring(index + 1);
- }
- return s;
- }
-
-
/**
* Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
* in context
@@ -153,7 +116,7 @@
* @return
* @throws javax.servlet.ServletException if there is no SequenceRegistry
*/
- protected PortletTest getSequence(String testId) throws ServletException
+ protected PortletTestCase getSequence(String testId) throws ServletException
{
PortletTestDriver registry = getSequenceRegistry();
if (registry == null)
@@ -161,29 +124,14 @@
log.info("No SequenceRegistry object found in current context");
throw new ServletException("No SequenceRegistry object found in context");
}
- return registry.getSequence(testId);
+ return registry.getTestCase(testId);
}
- protected String getComponentId()
+ public JoinPoint getServiceJointpoint()
{
- return componentId;
+ return serviceJoinPoint;
}
- protected void setComponentId(String componentId)
- {
- this.componentId = componentId;
- }
-
- public Joinpoint getServiceJointpoint()
- {
- return serviceJoinpoint;
- }
-
- protected void setServiceJointpoint(Joinpoint serviceJoinpoint)
- {
- this.serviceJoinpoint = serviceJoinpoint;
- }
-
public abstract void reset();
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,14 +22,17 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP1.NAME)
public class UTP1 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
@@ -46,17 +49,12 @@
public static Object holder;
- public static String NAME = "Portlet1";
+ public static final String NAME = "Portlet1";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP10.NAME)
public class UTP10 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet10";
+ public static final String NAME = "Portlet10";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP10.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP10.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP10.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP10.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP11.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP11.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP11.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,29 +23,27 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP11.NAME)
public class UTP11 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet11";
+ public static final String NAME = "Portlet11";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP2.NAME)
public class UTP2 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet2";
+ public static final String NAME = "Portlet2";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP3.NAME)
public class UTP3 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet3";
+ public static final String NAME = "Portlet3";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP3.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP3.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP3.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP3.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP4.NAME)
public class UTP4 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet4";
+ public static final String NAME = "Portlet4";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP4.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP4.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP4.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP4.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP5.NAME)
public class UTP5 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet5";
+ public static final String NAME = "Portlet5";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP5.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP5.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP5.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP5.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP6.NAME)
public class UTP6 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet6";
+ public static final String NAME = "Portlet6";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP6.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP6.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP6.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP6.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP7.NAME)
public class UTP7 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet7";
+ public static final String NAME = "Portlet7";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP7.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP7.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP7.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP7.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP8.NAME)
public class UTP8 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet8";
+ public static final String NAME = "Portlet8";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP8.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP8.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP8.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP8.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTP9.NAME)
public class UTP9 extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
public static Object holder;
- public static String NAME = "Portlet9";
+ public static final String NAME = "Portlet9";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(UTP9.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(UTP9.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(UTP9.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return UTP9.NAME;
- }
-
/** Resets helper variables */
public void reset()
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,13 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTS1.NAME)
public class UTS1 extends AbstractUniversalTestServlet
{
/** The serialVersionUID */
@@ -36,9 +39,9 @@
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "ServletA";
+ public static final String NAME = "ServletA";
- public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS1.NAME, Joinpoint.SERVLET_SERVICE);
+ public final static JoinPoint SERVICE_JOIN_POINT = new JoinPoint(UTS1.NAME, JoinPointType.SERVLET_SERVICE);
protected String createComponentId(Class clazz)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,13 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 5568 $
*/
+ at TestActor(id=UTS2.NAME)
public class UTS2 extends AbstractUniversalTestServlet
{
/** The serialVersionUID */
@@ -36,9 +39,9 @@
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "ServletB";
+ public static final String NAME = "ServletB";
- public final static Joinpoint SERVICE_JOINPOINT = new Joinpoint(UTS2.NAME, Joinpoint.SERVLET_SERVICE);
+ public final static JoinPoint SERVICE_JOIN_POINT = new JoinPoint(UTS2.NAME, JoinPointType.SERVLET_SERVICE);
protected String createComponentId(Class clazz)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.ha.session;
import org.jboss.portal.unit.annotations.TestCase;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
@@ -51,9 +51,9 @@
@TestCase
public class TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase
{
- public TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase(PortletTest seq)
+ public TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase(PortletTestCase seq)
{
- seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, NodeId.PORTS_01, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -68,7 +68,7 @@
return new InvokeGetResponse(url);
}
});
- seq.addAction(1, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, NodeId.PORTS_01, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -84,7 +84,7 @@
return new InvokeGetResponse(url);
}
});
- seq.addAction(2, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, NodeId.PORTS_02, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateImmutableValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateImmutableValueTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateImmutableValueTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.ha.session;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
@@ -51,9 +51,9 @@
@TestCase
public class TestReplicateImmutableValueTestCase
{
- public TestReplicateImmutableValueTestCase(PortletTest seq)
+ public TestReplicateImmutableValueTestCase(PortletTestCase seq)
{
- seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, NodeId.PORTS_01, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
@@ -66,7 +66,7 @@
return new InvokeGetResponse(url);
}
});
- seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, NodeId.PORTS_02, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateMutableValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateMutableValueTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateMutableValueTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.ha.session;
import org.jboss.portal.unit.annotations.TestCase;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
@@ -49,9 +49,9 @@
@TestCase
public class TestReplicateMutableValueTestCase
{
- public TestReplicateMutableValueTestCase(PortletTest seq)
+ public TestReplicateMutableValueTestCase(PortletTestCase seq)
{
- seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, NodeId.PORTS_01, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -66,7 +66,7 @@
return new InvokeGetResponse(url);
}
});
- seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, NodeId.PORTS_02, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase
public class AttributeTestCase
{
- public AttributeTestCase(PortletTest seq)
+ public AttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -92,7 +92,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase
public class ConstantsTestCase
{
- public ConstantsTestCase(PortletTest seq)
+ public ConstantsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase
public class ParameterTestCase
{
- public ParameterTestCase(PortletTest seq)
+ public ParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase
public class PropertyTestCase
{
- public PropertyTestCase(PortletTest seq)
+ public PropertyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase
public class EncodeURLTestCase
{
- public EncodeURLTestCase(PortletTest seq)
+ public EncodeURLTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -56,7 +56,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase
public class PropertyTestCase
{
- public PropertyTestCase(PortletTest seq)
+ public PropertyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -56,7 +56,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -80,7 +80,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase
public class RenderParameterTestCase
{
- public RenderParameterTestCase(PortletTest seq)
+ public RenderParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -182,7 +182,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class PortalInfoTestCase
{
- public PortalInfoTestCase(PortletTest seq)
+ public PortalInfoTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class PropertyTestCase
{
- public PropertyTestCase(PortletTest seq)
+ public PropertyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase
public class SupportedPortletModesTestCase
{
- public SupportedPortletModesTestCase(PortletTest seq)
+ public SupportedPortletModesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase
public class SupportedWindowStatesTestCase
{
- public SupportedWindowStatesTestCase(PortletTest seq)
+ public SupportedWindowStatesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -50,9 +50,9 @@
@TestCase
public class InitParameterNamesTestCase
{
- public InitParameterNamesTestCase(PortletTest seq)
+ public InitParameterNamesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -47,9 +47,9 @@
@TestCase
public class InitParameterTestCase
{
- public InitParameterTestCase(PortletTest seq)
+ public InitParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,9 +45,9 @@
@TestCase
public class PortletContextTestCase
{
- public PortletContextTestCase(PortletTest seq)
+ public PortletContextTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,9 +45,9 @@
@TestCase
public class PortletNameTestCase
{
- public PortletNameTestCase(PortletTest seq)
+ public PortletNameTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -43,9 +43,9 @@
@TestCase
public class AttributeTestCase
{
- public AttributeTestCase(PortletTest seq)
+ public AttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -43,9 +43,9 @@
@TestCase
public class DispatcherTestCase
{
- public DispatcherTestCase(PortletTest seq)
+ public DispatcherTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -44,9 +44,9 @@
@TestCase
public class InitParameterTestCase
{
- public InitParameterTestCase(PortletTest seq)
+ public InitParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -44,9 +44,9 @@
@TestCase
public class MimeTypeTestCase
{
- public MimeTypeTestCase(PortletTest seq)
+ public MimeTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -43,9 +43,9 @@
@TestCase
public class PortletContextNameTestCase
{
- public PortletContextNameTestCase(PortletTest seq)
+ public PortletContextNameTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,9 +45,9 @@
@TestCase({})
public class ResourcePathsTestCase
{
- public ResourcePathsTestCase(PortletTest seq)
+ public ResourcePathsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,9 +45,9 @@
@TestCase
public class ResourceTestCase
{
- public ResourceTestCase(PortletTest seq)
+ public ResourceTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -51,9 +51,9 @@
/** . */
private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE);
- public ServerInfoTestCase(PortletTest seq)
+ public ServerInfoTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.TestContants;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
@@ -44,9 +44,9 @@
@TestCase
public class VersionTestCase
{
- public VersionTestCase(PortletTest seq)
+ public VersionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class ConstructorTestCase
{
- public ConstructorTestCase(PortletTest seq)
+ public ConstructorTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class EqualsTestCase
{
- public EqualsTestCase(PortletTest seq)
+ public EqualsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase
public class HashCodeTestCase
{
- public HashCodeTestCase(PortletTest seq)
+ public HashCodeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class ModesTestCase
{
- public ModesTestCase(PortletTest seq)
+ public ModesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ReadOnlyTestCase
{
- public ReadOnlyTestCase(PortletTest seq)
+ public ReadOnlyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class ResetNullKeyThrowsNPETestCase
{
- public ResetNullKeyThrowsNPETestCase(PortletTest seq)
+ public ResetNullKeyThrowsNPETestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws ReadOnlyException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase
public class ValueTestCase
{
- public ValueTestCase(PortletTest seq)
+ public ValueTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
@@ -150,7 +150,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase
public class ZeroLengthArrayValueTestCase
{
- public ZeroLengthArrayValueTestCase(PortletTest seq)
+ public ZeroLengthArrayValueTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -69,7 +69,7 @@
return new InvokeGetResponse(url.toString());
}
});
- seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -92,7 +92,7 @@
assertEquals(new String[0], prefs.getValues("dynamic", new String[]{"other"}));
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class AttributeNamesTestCase
{
- public AttributeNamesTestCase(PortletTest seq)
+ public AttributeNamesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class ConstantsTestCase
{
- public ConstantsTestCase(PortletTest seq)
+ public ConstantsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class CreationTimeTestCase
{
- public CreationTimeTestCase(PortletTest seq)
+ public CreationTimeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class GetAttributeTestCase
{
- public GetAttributeTestCase(PortletTest seq)
+ public GetAttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class InvalidateTestCase
{
- public InvalidateTestCase(PortletTest seq)
+ public InvalidateTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class NewTestCase
{
- public NewTestCase(PortletTest seq)
+ public NewTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class RemoveAttributeTestCase
{
- public RemoveAttributeTestCase(PortletTest seq)
+ public RemoveAttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class SetAttributeTestCase
{
- public SetAttributeTestCase(PortletTest seq)
+ public SetAttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class DecodeAttributeNameTestCase
{
- public DecodeAttributeNameTestCase(PortletTest seq)
+ public DecodeAttributeNameTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase
public class DecodeScopeTestCase
{
- public DecodeScopeTestCase(PortletTest seq)
+ public DecodeScopeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase
public class ParameterTestCase
{
- public ParameterTestCase(PortletTest seq)
+ public ParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class AttributeTestCase
{
- public AttributeTestCase(PortletTest seq)
+ public AttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ConstantsTestCase
{
- public ConstantsTestCase(PortletTest seq)
+ public ConstantsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ParameterTestCase
{
- public ParameterTestCase(PortletTest seq)
+ public ParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class PropertyTestCase
{
- public PropertyTestCase(PortletTest seq)
+ public PropertyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ConstantsTestCase
{
- public ConstantsTestCase(PortletTest seq)
+ public ConstantsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ContentTypeTestCase
{
- public ContentTypeTestCase(PortletTest seq)
+ public ContentTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class EncodeURLTestCase
{
- public EncodeURLTestCase(PortletTest seq)
+ public EncodeURLTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class PropertyTestCase
{
- public PropertyTestCase(PortletTest seq)
+ public PropertyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class ConstructorTestCase
{
- public ConstructorTestCase(PortletTest seq)
+ public ConstructorTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class EqualsTestCase
{
- public EqualsTestCase(PortletTest seq)
+ public EqualsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase
public class HashCodeTestCase
{
- public HashCodeTestCase(PortletTest seq)
+ public HashCodeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase
public class StatesTestCase
{
- public StatesTestCase(PortletTest seq)
+ public StatesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.common;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -55,13 +55,13 @@
public AbstractActionInvalidatesTestCase(
- PortletTest seq,
- Joinpoint p1renderjp,
- Joinpoint p1actionjp,
- Joinpoint p2renderjp)
+ PortletTestCase seq,
+ JoinPoint p1renderjp,
+ JoinPoint p1actionjp,
+ JoinPoint p2renderjp)
{
//
- seq.addAction(0, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(0, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -75,7 +75,7 @@
});
//
- seq.addAction(1, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -84,7 +84,7 @@
return null;
}
});
- seq.addAction(1, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -94,7 +94,7 @@
});
//
- seq.addAction(2, p1actionjp, new PortletActionTestAction()
+ seq.bindAction(2, p1actionjp, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -102,7 +102,7 @@
calls.add("2_action");
}
});
- seq.addAction(2, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(2, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.common;
-import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
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;
@@ -59,14 +59,14 @@
String url;
public AbstractCacheMarkupTestCase(
- PortletTest seq,
- Joinpoint p1renderjp,
- Joinpoint p1actionjp,
- Joinpoint p2renderjp,
+ PortletTestCase seq,
+ JoinPoint p1renderjp,
+ JoinPoint p1actionjp,
+ JoinPoint p2renderjp,
final NavigationalStateConfigurator configurator)
{
//
- seq.addAction(0, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(0, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -82,7 +82,7 @@
});
//
- seq.addAction(1, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -91,7 +91,7 @@
return null;
}
});
- seq.addAction(1, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -101,14 +101,14 @@
});
//
- seq.addAction(2, p1actionjp, new PortletActionTestAction()
+ seq.bindAction(2, p1actionjp, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
calls.add("2_action");
}
});
- seq.addAction(2, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(2, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -122,7 +122,7 @@
});
//
- seq.addAction(3, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(3, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -136,7 +136,7 @@
});
//
- seq.addAction(4, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(4, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -145,7 +145,7 @@
return null;
}
});
- seq.addAction(4, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(4, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -155,7 +155,7 @@
});
//
- seq.addAction(5, p1actionjp, new PortletActionTestAction()
+ seq.bindAction(5, p1actionjp, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -165,7 +165,7 @@
configurator.configureNavigationalState(response);
}
});
- seq.addAction(5, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(5, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -181,7 +181,7 @@
});
//
- seq.addAction(6, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(6, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.common;
-import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
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;
@@ -54,9 +54,9 @@
final Set calls = new HashSet();
- public AbstractDisableDuringRenderTestCase(PortletTest seq, Joinpoint renderjp, Joinpoint actionjp)
+ public AbstractDisableDuringRenderTestCase(PortletTestCase seq, JoinPoint renderjp, JoinPoint actionjp)
{
- seq.addAction(0, renderjp, new PortletRenderTestAction()
+ seq.bindAction(0, renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -71,7 +71,7 @@
});
//
- seq.addAction(1, renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -86,7 +86,7 @@
});
//
- seq.addAction(2, actionjp, new PortletActionTestAction()
+ seq.bindAction(2, actionjp, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -94,7 +94,7 @@
calls.add("2_action");
}
});
- seq.addAction(2, renderjp, new PortletRenderTestAction()
+ seq.bindAction(2, renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatchingFilterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatchingFilterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatchingFilterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
@@ -45,9 +45,9 @@
@TestCase
public class DispatchingFilterTestCase
{
- public DispatchingFilterTestCase(PortletTest seq)
+ public DispatchingFilterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -48,9 +48,9 @@
@TestCase
public class FiltersTestCase
{
- public FiltersTestCase(PortletTest seq)
+ public FiltersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/GetRequestURITestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/GetRequestURITestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/GetRequestURITestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -55,9 +55,9 @@
public static final String SERVLET_A_URI = "/test-jsr168-ext-dispatcher/universalServletA";
- public GetRequestURITestCase(PortletTest seq)
+ public GetRequestURITestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -69,7 +69,7 @@
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/RequestHeaderAccessTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/RequestHeaderAccessTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/RequestHeaderAccessTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -58,9 +58,9 @@
@TestCase
public class RequestHeaderAccessTestCase
{
- public RequestHeaderAccessTestCase(PortletTest seq)
+ public RequestHeaderAccessTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -77,7 +77,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -88,7 +88,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -25,7 +25,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.AbstractActionInvalidatesTestCase;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTP3;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -35,8 +35,8 @@
@TestCase
public class ActionInvalidatesExpiringCacheTestCase extends AbstractActionInvalidatesTestCase
{
- public ActionInvalidatesExpiringCacheTestCase(PortletTest seq)
+ public ActionInvalidatesExpiringCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP2.RENDER_JOINPOINT, UTP2.ACTION_JOINPOINT, UTP3.RENDER_JOINPOINT);
+ super(seq, UTP2.RENDER_JOIN_POINT, UTP2.ACTION_JOIN_POINT, UTP3.RENDER_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.AbstractDisableDuringRenderTestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -34,8 +34,8 @@
@TestCase
public class DisableDuringRenderExpiringCacheTestCase extends AbstractDisableDuringRenderTestCase
{
- public DisableDuringRenderExpiringCacheTestCase(PortletTest seq)
+ public DisableDuringRenderExpiringCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT);
+ super(seq, UTP1.RENDER_JOIN_POINT, UTP1.ACTION_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.expiringcache;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP10;
@@ -56,10 +56,10 @@
final Set calls = new HashSet();
String url;
- public ExpiringCacheTestCase(PortletTest seq)
+ public ExpiringCacheTestCase(PortletTestCase seq)
{
//
- seq.addAction(0, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -73,7 +73,7 @@
});
//
- seq.addAction(1, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -82,7 +82,7 @@
return null;
}
});
- seq.addAction(1, UTP11.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP11.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -92,7 +92,7 @@
});
//
- seq.addAction(2, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -104,7 +104,7 @@
return null;
}
});
- seq.addAction(2, UTP11.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP11.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -126,7 +126,7 @@
});
//
- seq.addAction(3, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -142,7 +142,7 @@
});
//
- seq.addAction(4, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(4, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -155,7 +155,7 @@
});
//
- seq.addAction(5, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(5, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -164,7 +164,7 @@
return null;
}
});
- seq.addAction(5, UTP11.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(5, UTP11.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -174,7 +174,7 @@
});
//
- seq.addAction(6, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(6, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -186,7 +186,7 @@
return null;
}
});
- seq.addAction(6, UTP11.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(6, UTP11.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -208,7 +208,7 @@
});
//
- seq.addAction(7, UTP10.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(7, UTP10.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP8;
import org.jboss.portal.test.portlet.framework.UTP9;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class ExpiringCacheWithPortletModeTestCase extends AbstractCacheMarkupTestCase
{
- public ExpiringCacheWithPortletModeTestCase(PortletTest seq)
+ public ExpiringCacheWithPortletModeTestCase(PortletTestCase seq)
{
- super(seq, UTP8.RENDER_JOINPOINT, UTP8.ACTION_JOINPOINT, UTP9.RENDER_JOINPOINT, NavigationalStateConfigurator.PORTLET_MODE_CONFIGURATOR);
+ super(seq, UTP8.RENDER_JOIN_POINT, UTP8.ACTION_JOIN_POINT, UTP9.RENDER_JOIN_POINT, NavigationalStateConfigurator.PORTLET_MODE_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.test.portlet.framework.UTP5;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class ExpiringCacheWithRenderParametersTestCase extends AbstractCacheMarkupTestCase
{
- public ExpiringCacheWithRenderParametersTestCase(PortletTest seq)
+ public ExpiringCacheWithRenderParametersTestCase(PortletTestCase seq)
{
- super(seq, UTP4.RENDER_JOINPOINT, UTP4.ACTION_JOINPOINT, UTP5.RENDER_JOINPOINT, NavigationalStateConfigurator.RENDER_PARAMETER_CONFIGURATOR);
+ super(seq, UTP4.RENDER_JOIN_POINT, UTP4.ACTION_JOIN_POINT, UTP5.RENDER_JOIN_POINT, NavigationalStateConfigurator.RENDER_PARAMETER_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP6;
import org.jboss.portal.test.portlet.framework.UTP7;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class ExpiringCacheWithWindowStateTestCase extends AbstractCacheMarkupTestCase
{
- public ExpiringCacheWithWindowStateTestCase(PortletTest seq)
+ public ExpiringCacheWithWindowStateTestCase(PortletTestCase seq)
{
- super(seq, UTP6.RENDER_JOINPOINT, UTP6.ACTION_JOINPOINT, UTP7.RENDER_JOINPOINT, NavigationalStateConfigurator.WINDOW_STATE_CONFIGURATOR);
+ super(seq, UTP6.RENDER_JOIN_POINT, UTP6.ACTION_JOIN_POINT, UTP7.RENDER_JOIN_POINT, NavigationalStateConfigurator.WINDOW_STATE_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -25,7 +25,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.AbstractActionInvalidatesTestCase;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTP3;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -35,8 +35,8 @@
@TestCase
public class ActionInvalidatesNeverExpiringCacheTestCase extends AbstractActionInvalidatesTestCase
{
- public ActionInvalidatesNeverExpiringCacheTestCase(PortletTest seq)
+ public ActionInvalidatesNeverExpiringCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP2.RENDER_JOINPOINT, UTP2.ACTION_JOINPOINT, UTP3.RENDER_JOINPOINT);
+ super(seq, UTP2.RENDER_JOIN_POINT, UTP2.ACTION_JOIN_POINT, UTP3.RENDER_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.AbstractDisableDuringRenderTestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -34,8 +34,8 @@
@TestCase
public class DisableDuringRenderNeverExpiringCacheTestCase extends AbstractDisableDuringRenderTestCase
{
- public DisableDuringRenderNeverExpiringCacheTestCase(PortletTest seq)
+ public DisableDuringRenderNeverExpiringCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT);
+ super(seq, UTP1.RENDER_JOIN_POINT, UTP1.ACTION_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP8;
import org.jboss.portal.test.portlet.framework.UTP9;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class NeverExpiringCacheWithPortletModeTestCase extends AbstractCacheMarkupTestCase
{
- public NeverExpiringCacheWithPortletModeTestCase(PortletTest seq)
+ public NeverExpiringCacheWithPortletModeTestCase(PortletTestCase seq)
{
- super(seq, UTP8.RENDER_JOINPOINT, UTP8.ACTION_JOINPOINT, UTP9.RENDER_JOINPOINT, NavigationalStateConfigurator.PORTLET_MODE_CONFIGURATOR);
+ super(seq, UTP8.RENDER_JOIN_POINT, UTP8.ACTION_JOIN_POINT, UTP9.RENDER_JOIN_POINT, NavigationalStateConfigurator.PORTLET_MODE_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.test.portlet.framework.UTP5;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class NeverExpiringCacheWithRenderParametersTestCase extends AbstractCacheMarkupTestCase
{
- public NeverExpiringCacheWithRenderParametersTestCase(PortletTest seq)
+ public NeverExpiringCacheWithRenderParametersTestCase(PortletTestCase seq)
{
- super(seq, UTP4.RENDER_JOINPOINT, UTP4.ACTION_JOINPOINT, UTP5.RENDER_JOINPOINT, NavigationalStateConfigurator.RENDER_PARAMETER_CONFIGURATOR);
+ super(seq, UTP4.RENDER_JOIN_POINT, UTP4.ACTION_JOIN_POINT, UTP5.RENDER_JOIN_POINT, NavigationalStateConfigurator.RENDER_PARAMETER_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -26,7 +26,7 @@
import org.jboss.portal.test.portlet.jsr168.ext.common.NavigationalStateConfigurator;
import org.jboss.portal.test.portlet.framework.UTP6;
import org.jboss.portal.test.portlet.framework.UTP7;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
@@ -36,8 +36,8 @@
@TestCase
public class NeverExpiringCacheWithWindowStateTestCase extends AbstractCacheMarkupTestCase
{
- public NeverExpiringCacheWithWindowStateTestCase(PortletTest seq)
+ public NeverExpiringCacheWithWindowStateTestCase(PortletTestCase seq)
{
- super(seq, UTP6.RENDER_JOINPOINT, UTP6.ACTION_JOINPOINT, UTP7.RENDER_JOINPOINT, NavigationalStateConfigurator.WINDOW_STATE_CONFIGURATOR);
+ super(seq, UTP6.RENDER_JOIN_POINT, UTP6.ACTION_JOIN_POINT, UTP7.RENDER_JOIN_POINT, NavigationalStateConfigurator.WINDOW_STATE_CONFIGURATOR);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
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;
@@ -58,13 +58,13 @@
String url;
public AbstractNoCacheTestCase(
- PortletTest seq,
- Joinpoint p1renderjp,
- Joinpoint p1actionjp,
- Joinpoint p2renderjp)
+ PortletTestCase seq,
+ JoinPoint p1renderjp,
+ JoinPoint p1actionjp,
+ JoinPoint p2renderjp)
{
//
- seq.addAction(0, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(0, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -78,7 +78,7 @@
});
//
- seq.addAction(1, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(1, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -92,7 +92,7 @@
});
//
- seq.addAction(2, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(2, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -106,7 +106,7 @@
});
//
- seq.addAction(3, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(3, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -115,7 +115,7 @@
return null;
}
});
- seq.addAction(3, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(3, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -125,7 +125,7 @@
});
//
- seq.addAction(4, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(4, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -133,7 +133,7 @@
return null;
}
});
- seq.addAction(4, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(4, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -153,7 +153,7 @@
});
//
- seq.addAction(5, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(5, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -166,7 +166,7 @@
});
//
- seq.addAction(6, p1actionjp, new PortletActionTestAction()
+ seq.bindAction(6, p1actionjp, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
{
@@ -174,7 +174,7 @@
calls.add("6_action");
}
});
- seq.addAction(6, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(6, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -185,7 +185,7 @@
});
//
- seq.addAction(7, p1renderjp, new PortletRenderTestAction()
+ seq.bindAction(7, p1renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -193,7 +193,7 @@
return null;
}
});
- seq.addAction(7, p2renderjp, new PortletRenderTestAction()
+ seq.bindAction(7, p2renderjp, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
@@ -35,8 +34,8 @@
@TestCase
public class ExplicitNoCacheTestCase extends AbstractNoCacheTestCase
{
- public ExplicitNoCacheTestCase(PortletTest seq)
+ public ExplicitNoCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP1.RENDER_JOINPOINT, UTP1.ACTION_JOINPOINT, UTP2.RENDER_JOINPOINT);
+ super(seq, UTP1.RENDER_JOIN_POINT, UTP1.ACTION_JOIN_POINT, UTP2.RENDER_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
@@ -34,8 +34,8 @@
@TestCase
public class ImplicitNoCacheTestCase extends AbstractNoCacheTestCase
{
- public ImplicitNoCacheTestCase(PortletTest seq)
+ public ImplicitNoCacheTestCase(PortletTestCase seq)
{
- super(seq, UTP3.RENDER_JOINPOINT, UTP3.ACTION_JOINPOINT, UTP4.RENDER_JOINPOINT);
+ super(seq, UTP3.RENDER_JOIN_POINT, UTP3.ACTION_JOIN_POINT, UTP4.RENDER_JOIN_POINT);
}
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
@@ -45,9 +45,9 @@
@TestCase
public class GetResourceBundleDuringInitTestCase
{
- public GetResourceBundleDuringInitTestCase(PortletTest seq)
+ public GetResourceBundleDuringInitTestCase(PortletTestCase seq)
{
- seq.addAction(0, GetResourceBundleDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, GetResourceBundleDuringInitPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -48,9 +48,9 @@
@TestCase
public class ResourceBundleCascadeTestCase
{
- public ResourceBundleCascadeTestCase(PortletTest seq)
+ public ResourceBundleCascadeTestCase(PortletTestCase seq)
{
- seq.addAction(0, ResourceBundleCascadePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, ResourceBundleCascadePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -46,9 +46,9 @@
@TestCase
public class ResourceBundleTestCase
{
- public ResourceBundleTestCase(PortletTest seq)
+ public ResourceBundleTestCase(PortletTestCase seq)
{
- seq.addAction(0, ResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, ResourceBundlePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
@@ -35,23 +37,19 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 5572 $
*/
+ at TestActor(id=GetResourceBundleDuringInitPortlet.NAME)
public class GetResourceBundleDuringInitPortlet extends AbstractUniversalTestPortlet
{
public static ResourceBundle bundle = null;
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "GetResourceBundleDuringInitPortlet";
+ public static final String NAME = "GetResourceBundleDuringInitPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
local.set(null);
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,30 +22,28 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 5448 $
*/
+ at TestActor(id=ResourceBundleCascadePortlet.NAME)
public class ResourceBundleCascadePortlet extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "ResourceBundleCascadePortlet";
+ public static final String NAME = "ResourceBundleCascadePortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
local.set(null);
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,29 +22,27 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 5448 $
*/
+ at TestActor(id=ResourceBundlePortlet.NAME)
public class ResourceBundlePortlet extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "ResourceBundlePortlet";
+ public static final String NAME = "ResourceBundlePortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
local = new ThreadLocal();
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase
public class TestActionWithPortletModeTestCase
{
- public TestActionWithPortletModeTestCase(PortletTest seq)
+ public TestActionWithPortletModeTestCase(PortletTestCase seq)
{
- seq.addAction(0, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, TestActionWithPortletModePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(1, TestActionWithPortletModePortlet.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, TestActionWithPortletModePortlet.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -70,7 +70,7 @@
}
});
- seq.addAction(1, TestActionWithPortletModePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, TestActionWithPortletModePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -45,9 +45,9 @@
*/
public class TestDuringActionTestCase
{
- public TestDuringActionTestCase(PortletTest seq)
+ public TestDuringActionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -57,7 +57,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletModeException
{
@@ -66,7 +66,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase
public class TestDuringRenderTestCase
{
- public TestDuringRenderTestCase(PortletTest seq)
+ public TestDuringRenderTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,28 +22,26 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 5448 $
*/
+ at TestActor(id=TestActionWithPortletModePortlet.NAME)
public class TestActionWithPortletModePortlet extends AbstractUniversalTestPortlet
{
- public static String NAME = "TestActionWithPortletModePortlet";
+ public static final String NAME = "TestActionWithPortletModePortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet.NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet.NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet.NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet.NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet.NAME;
- }
-
/*private AssertResult result;
protected void doProcessAction(final ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +53,9 @@
@TestCase
public class ActionRequestUseFormTestCase
{
- public ActionRequestUseFormTestCase(PortletTest seq)
+ public ActionRequestUseFormTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -74,7 +74,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -107,7 +107,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -59,9 +59,9 @@
private final byte[] byteContent = {65, 66, 67, 68, 69, 70};
- public ActionRequestUseInputStreamTestCase(PortletTest seq)
+ public ActionRequestUseInputStreamTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
@@ -78,7 +78,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
@@ -122,7 +122,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -56,9 +56,9 @@
private final byte[] byteContent = {65, 66, 67, 68, 69, 70};
- public ActionRequestUseReaderTestCase(PortletTest seq)
+ public ActionRequestUseReaderTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -74,7 +74,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -116,7 +116,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase
public class RequestAttributeScopingTestCase
{
- public RequestAttributeScopingTestCase(PortletTest seq)
+ public RequestAttributeScopingTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
@TestCase
public class RequestAttributeTestCase
{
- public RequestAttributeTestCase(PortletTest seq)
+ public RequestAttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -54,9 +54,9 @@
@TestCase
public class RequestHeaderAccessTestCase
{
- public RequestHeaderAccessTestCase(PortletTest seq)
+ public RequestHeaderAccessTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -73,7 +73,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -93,7 +93,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -108,7 +108,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -52,9 +52,9 @@
@TestCase
public class RequestParameterTestCase
{
- public RequestParameterTestCase(PortletTest seq)
+ public RequestParameterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -65,7 +65,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -93,7 +93,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +42,9 @@
@TestCase
public class ContentTypeTestCase
{
- public ContentTypeTestCase(PortletTest seq)
+ public ContentTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase
public class IsReadOnlyTestCase
{
- public IsReadOnlyTestCase(PortletTest seq)
+ public IsReadOnlyTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -65,7 +65,7 @@
}
});
- seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -78,7 +78,7 @@
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
@TestCase
public class MapTestCase
{
- public MapTestCase(PortletTest seq)
+ public MapTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP3.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
@@ -106,7 +106,7 @@
}
});
- seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase
public class StoreMustPersistAllChangesTestCase
{
- public StoreMustPersistAllChangesTestCase(PortletTest seq)
+ public StoreMustPersistAllChangesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -86,7 +86,7 @@
}
});
- seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -94,7 +94,7 @@
}
});
- seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -109,7 +109,7 @@
}
});
- seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -58,9 +58,9 @@
@TestCase
public class CrossContextSessionAttributeTestCase
{
- public CrossContextSessionAttributeTestCase(PortletTest seq)
+ public CrossContextSessionAttributeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -77,7 +77,7 @@
* the client to do it. This portlet should have put in the session an attribute that this servlet
* will assert the presence of.
*/
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase
public class ObtainNonNullSessionUsingCreateEqualsFalseTestCase
{
- public ObtainNonNullSessionUsingCreateEqualsFalseTestCase(PortletTest seq)
+ public ObtainNonNullSessionUsingCreateEqualsFalseTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -64,7 +64,7 @@
return igr;
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
@@ -74,7 +74,7 @@
session.setAttribute("foo_2", "bar_2");
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase
public class SessionDoesNotExistBeforeItIsRequestedTestCase
{
- public SessionDoesNotExistBeforeItIsRequestedTestCase(PortletTest seq)
+ public SessionDoesNotExistBeforeItIsRequestedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -23,17 +23,23 @@
package org.jboss.portal.test.portlet.jsr168.misc.log4j;
import org.apache.log4j.Logger;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
+ at TestActor(id=LoggingPortlet.NAME)
public class LoggingPortlet extends AbstractUniversalTestPortlet
{
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint("LoggingPortlet", Joinpoint.PORTLET_RENDER);
+ public static final String NAME = "LoggingPortlet";
+
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
+
protected Logger createLogger()
{
return Logger.getLogger(getClass().getName(), new CustomLoggerFactory());
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/TestLog4jTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/TestLog4jTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/TestLog4jTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.misc.log4j;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.unit.annotations.TestCase;
@@ -43,9 +43,9 @@
@TestCase
public class TestLog4jTestCase
{
- public TestLog4jTestCase(PortletTest seq)
+ public TestLog4jTestCase(PortletTestCase seq)
{
- seq.addAction(0, LoggingPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, LoggingPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -54,9 +54,9 @@
@TestCase({Assertion.JSR168_124, Assertion.JSR168_125})
public class DispatchedRequestTestCase
{
- public DispatchedRequestTestCase(PortletTest seq)
+ public DispatchedRequestTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -76,7 +76,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -56,9 +56,9 @@
public class ErrorHandlingTestCase
{
- public ErrorHandlingTestCase(PortletTest seq)
+ public ErrorHandlingTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -79,7 +79,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -93,7 +93,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException
{
@@ -113,7 +113,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -127,7 +127,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -151,7 +151,7 @@
}
});
- seq.addAction(2, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(2, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -165,7 +165,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -185,7 +185,7 @@
}
});
- seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(3, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -55,9 +55,9 @@
public class GETMethodTestCase
{
- public GETMethodTestCase(PortletTest seq)
+ public GETMethodTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -73,7 +73,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -54,9 +54,9 @@
@TestCase({Assertion.JSR168_128})
public class IncludedRequestAttributesTestCase
{
- public IncludedRequestAttributesTestCase(PortletTest seq)
+ public IncludedRequestAttributesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -98,7 +98,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -55,9 +55,9 @@
@TestCase({Assertion.JSR168_127})
public class IncludedRequestParametersTestCase
{
- public IncludedRequestParametersTestCase(PortletTest seq)
+ public IncludedRequestParametersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -111,7 +111,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase({Assertion.JSR168_121, Assertion.JSR168_122})
public class ObtainingDispatcherTestCase
{
- public ObtainingDispatcherTestCase(PortletTest seq)
+ public ObtainingDispatcherTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -59,9 +59,9 @@
@TestCase({Assertion.JSR168_123})
public class QueryStringInRequestDispatcherTestCase
{
- public QueryStringInRequestDispatcherTestCase(PortletTest seq)
+ public QueryStringInRequestDispatcherTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -69,7 +69,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -79,7 +79,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -97,7 +97,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -60,9 +60,9 @@
@TestCase({Assertion.JSR168_129, Assertion.JSR168_130, Assertion.JSR168_131, Assertion.JSR168_132, Assertion.JSR168_133, Assertion.JSR168_134, Assertion.JSR168_137})
public class RequestObjectTestCase
{
- public RequestObjectTestCase(PortletTest seq)
+ public RequestObjectTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -76,7 +76,7 @@
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -55,9 +55,9 @@
@TestCase({Assertion.JSR168_138, Assertion.JSR168_141})
public class ResponseObjectTestCase
{
- public ResponseObjectTestCase(PortletTest seq)
+ public ResponseObjectTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -70,7 +70,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -47,9 +47,9 @@
@TestCase({Assertion.JSR168_24})
public class InlineValuesNotInResourceBundleTestCase
{
- public InlineValuesNotInResourceBundleTestCase(PortletTest seq)
+ public InlineValuesNotInResourceBundleTestCase(PortletTestCase seq)
{
- seq.addAction(0, InlineValuesNotInResourceBundlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, InlineValuesNotInResourceBundlePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_24})
public class InlineValuesWithNoResourceBundleDefinedTestCase
{
- public InlineValuesWithNoResourceBundleDefinedTestCase(PortletTest seq)
+ public InlineValuesWithNoResourceBundleDefinedTestCase(PortletTestCase seq)
{
- seq.addAction(0, InlineValuesWithNoResourceBundleDefinedPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, InlineValuesWithNoResourceBundleDefinedPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -34,21 +36,17 @@
* values and the values are defined inline, the portlet container must add the inline values as resources of the root
* resource bundle.(xxi)"
*/
+ at TestActor(id=InlineValuesNotInResourceBundlePortlet.NAME)
public class InlineValuesNotInResourceBundlePortlet extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "InlineValuesNotInResourceBundlePortlet";
+ public static final String NAME = "InlineValuesNotInResourceBundlePortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
local.set(null);
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -33,22 +35,18 @@
* information is defined inline in the deployment descriptor, the portlet container must create a ResourceBundle and
* populate it, with the inline values, using the keys defined in the PLT.21.10 Resource Bundles Section.(xxv)"
*/
+ at TestActor(id=InlineValuesWithNoResourceBundleDefinedPortlet.NAME)
public class InlineValuesWithNoResourceBundleDefinedPortlet extends AbstractUniversalTestPortlet
{
public static ThreadLocal local = new ThreadLocal();
- public static String NAME = "InlineValuesWithNoResourceBundleDefinedPortlet";
+ public static final String NAME = "InlineValuesWithNoResourceBundleDefinedPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
local.set(null);
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
@@ -58,9 +58,9 @@
@TestCase({Assertion.JSR168_45})
public class AccessSameSetOfResourcesTestCase
{
- public AccessSameSetOfResourcesTestCase(PortletTest seq)
+ public AccessSameSetOfResourcesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -91,7 +91,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
@@ -56,9 +56,9 @@
@TestCase({Assertion.JSR168_44})
public class ContextAttributesTestCase
{
- public ContextAttributesTestCase(PortletTest seq)
+ public ContextAttributesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
@@ -58,9 +58,9 @@
@TestCase({Assertion.JSR168_43})
public class InitializationParametersTestCase
{
- public InitializationParametersTestCase(PortletTest seq)
+ public InitializationParametersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -81,7 +81,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
@@ -56,9 +56,9 @@
@TestCase({Assertion.JSR168_46})
public class TempDirTestCase
{
- public TempDirTestCase(PortletTest seq)
+ public TempDirTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
@@ -80,7 +80,7 @@
}
});
- seq.addAction(0, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
@@ -45,7 +45,7 @@
@TestCase({Assertion.JSR168_17, Assertion.JSR168_18, Assertion.JSR168_19})
public class ExceptionsDuringRequestHandlingTestCase
{
- public ExceptionsDuringRequestHandlingTestCase(PortletTest seq)
+ public ExceptionsDuringRequestHandlingTestCase(PortletTestCase seq)
{
// suite.addTest(new PortletTestCase("ExceptionsDuringRequestHandlingPortlet"));
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.PortletExceptionDuringInitPortlet;
@@ -47,10 +47,10 @@
@TestCase({Assertion.JSR168_5, Assertion.JSR168_6, Assertion.JSR168_8})
public class ExceptionsOnInitTestCase
{
- public ExceptionsOnInitTestCase(PortletTest seq)
+ public ExceptionsOnInitTestCase(PortletTestCase seq)
{
//PortletExceptionDuringInitPortlet
- seq.addAction(0, PortletExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, PortletExceptionDuringInitPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
});
//RuntimeExceptionDuringInitPortlet
- seq.addAction(0, RuntimeExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, RuntimeExceptionDuringInitPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -70,7 +70,7 @@
});
//UnavailableExceptionDuringInitPortlet
- seq.addAction(0, UnavailableExceptionDuringInitPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UnavailableExceptionDuringInitPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -80,7 +80,7 @@
});
//ControllerPortlet
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -88,7 +88,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -96,7 +96,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.InitializeBeforeHandlePortlet;
@@ -43,9 +43,9 @@
@TestCase({Assertion.JSR168_4})
public class InitializeBeforeHandleTestCase
{
- public InitializeBeforeHandleTestCase(PortletTest seq)
+ public InitializeBeforeHandleTestCase(PortletTestCase seq)
{
- seq.addAction(0, InitializeBeforeHandlePortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, InitializeBeforeHandlePortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
boolean actionInvoked;
- public InvokeActionFirstTestCase(PortletTest seq)
+ public InvokeActionFirstTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -68,7 +68,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -52,9 +52,9 @@
boolean actionInvoked;
- public InvokeRenderAfterActionURLTestCase(PortletTest seq)
+ public InvokeRenderAfterActionURLTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -72,7 +72,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -91,7 +91,7 @@
}
});
- seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -101,7 +101,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -112,7 +112,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase({Assertion.JSR168_11})
public class InvokeRenderAfterRenderURLTestCase
{
- public InvokeRenderAfterRenderURLTestCase(PortletTest seq)
+ public InvokeRenderAfterRenderURLTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -55,7 +55,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -63,7 +63,7 @@
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -73,7 +73,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Added: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/MinimizedStateDontRenderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/MinimizedStateDontRenderTestCase.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/MinimizedStateDontRenderTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * 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.portlet.jsr168.tck.portletinterface;
+
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
+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;
+import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.MinimizedStateDontRenderPortlet;
+import org.jboss.unit.driver.DriverResponse;
+
+import javax.portlet.Portlet;
+import javax.portlet.ActionRequest;
+import javax.portlet.PortletException;
+import javax.portlet.ActionResponse;
+import javax.portlet.RenderResponse;
+import javax.portlet.RenderRequest;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+ at TestCase
+public class MinimizedStateDontRenderTestCase
+{
+ public MinimizedStateDontRenderTestCase(PortletTestCase seq)
+ {
+ seq.bindAction(new JoinPoint(MinimizedStateDontRenderPortlet.NAME, JoinPointType.PORTLET_ACTION), new PortletActionTestAction()
+ {
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new AssertionError();
+ }
+ });
+ seq.bindAction(new JoinPoint(MinimizedStateDontRenderPortlet.NAME, JoinPointType.PORTLET_RENDER), new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new AssertionError();
+ }
+ });
+ }
+}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -57,9 +57,9 @@
@TestCase({Assertion.JSR168_12})
public class SendRedirectDuringActionTestCase
{
- public SendRedirectDuringActionTestCase(PortletTest seq)
+ public SendRedirectDuringActionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -67,7 +67,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, PortletSecurityException, IOException
{
@@ -76,7 +76,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -84,7 +84,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,105 +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.portlet.jsr168.tck.portletinterface.spec;
-
-import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
-import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
-import org.jboss.unit.remote.RequestContext;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.response.EndTestResponse;
-
-import static org.jboss.unit.api.Assert.*;
-
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * DISABLED - NOT CURRENTLY USED TEST CASE
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- * @portlet.specification assert="SPEC:17 -""
- * @portlet.specification assert="SPEC:18 - "
- * @portlet.specification assert="SPEC:19 - ""
- */
-public class ExceptionsDuringRequestHandlingControllerPortlet extends AbstractTestPortlet
-{
- //we override this to force 3 Portlets to have same test id
- protected String createTestName(Class clazz)
- {
- return "ExceptionsDuringRequestHandlingPortlet";
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, PortletSecurityException, IOException
- {
- if (context.getRequestCount() == 0)
- {
- //Just repaint
- PortletURL url = resp.createRenderURL();
- return new InvokeGetResponse(url.toString());
- }
- else if (context.getRequestCount() == 1)
- {
- //Invoke PortletExceptionDuringRequestHandlingPortlet action
- return new InvokeGetResponse(PortletExceptionDuringRequestHandlingPortlet.actionURL);
- }
- else if (context.getRequestCount() == 2)
- {
- //Invoke RuntimeExceptionDuringRequestHandlingPortlet action
- return new InvokeGetResponse(RuntimeExceptionDuringRequestHandlingPortlet.actionURL);
- }
- else if (context.getRequestCount() == 3)
- {
- //Invoke UnavailableExceptionDuringProcessActionPortlet action
- return new InvokeGetResponse(UnavailableExceptionDuringProcessActionPortlet.actionURL);
- }
- else if (context.getRequestCount() == 4)
- {
- //Just repaint
- PortletURL url = resp.createRenderURL();
- return new InvokeGetResponse(url.toString());
- }
- else if (context.getRequestCount() == 5)
- {
- //portlets that shouldn't render itself after Exception in Action Phase
- assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered);
- assertEquals(false, RuntimeExceptionDuringRequestHandlingPortlet.rendered);
- assertEquals(false, UnavailableExceptionDuringProcessActionPortlet.rendered);
-
- //and should be destroyed because of UnavailableException was throwed
- assertEquals(true, UnavailableExceptionDuringProcessActionPortlet.destroyed);
- assertEquals(true, UnavailableExceptionDuringRenderPortlet.destroyed);
-
- //
- return new EndTestResponse();
- }
- else
- {
- return null;
- }
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
@@ -34,15 +36,16 @@
* @portlet.specification assert="SPEC:4 - After the portlet object is instantiated, the portlet container must
* initialize the portlet before invoking it to handle requests"
*/
+ at TestActor(id=InitializeBeforeHandlePortlet.NAME)
public class InitializeBeforeHandlePortlet extends AbstractUniversalTestPortlet
{
public static boolean init = false;
- public static String NAME = "InitializeBeforeHandlePortlet";
+ public static final String NAME = "InitializeBeforeHandlePortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
public void init(PortletConfig config) throws PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,6 +24,7 @@
import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestActor;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
@@ -46,21 +47,16 @@
* @portlet.specification assert="SPEC:16 - If the window state of the portlet (see PLT.9 Window States Chapter) is
* MINIMIZED, the render method of the GenericPortlet does not invoke any of the portlet mode rendering methods"
*/
+ at TestActor(id=MinimizedStateDontRenderPortlet.NAME)
public class MinimizedStateDontRenderPortlet extends AbstractTestGenericPortlet
{
+ /** . */
+ public static final String NAME = "MinimizedStateDontRenderPortlet";
+
+ /** . */
private String rendered;
- // Error on purpose this does not seem used for now as it is hard to test
- // so if it will be used we'll be aware of that
- public MinimizedStateDontRenderPortlet()
- {
- super(MinimizedStateDontRenderPortlet.class);
-
- //
- throw new Error("");
- }
-
protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
// Shouldn't be here
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
@@ -37,25 +39,20 @@
* @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
* considered unsuccessful."
*/
+ at TestActor(id=PortletExceptionDuringInitPortlet.NAME)
public class PortletExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
{
- public static String NAME = "PortletExceptionDuringInitPortlet";
+ public static final String NAME = "PortletExceptionDuringInitPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
//This is static becouse value is shared beetween portlet instances
public static boolean rendered = false;
public static boolean destroyed = false;
- //we override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
- {
- return "ExceptionsOnInitPortlet";
- }
-
public void init(PortletConfig config) throws PortletException
{
super.init(config);
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,87 +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.portlet.jsr168.tck.portletinterface.spec;
-
-import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.remote.RequestContext;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * DISABLED - NOT CURRENTLY USED TEST CASE
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- * @portlet.specification assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
- * of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet
- * throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render
- * method must not be invoked within the current client request"
- */
-public class PortletExceptionDuringRequestHandlingPortlet extends AbstractTestPortlet
-{
- // This is static becouse value is shared beetween portlet instances
- public static boolean rendered;
- public static boolean destroyed;
- public static String actionURL = "";
-
- // We override this to force 3 Portlets to have same test id
- protected String createTestName(Class clazz)
- {
- return "ExceptionsDuringRequestHandlingPortlet";
- }
-
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(2))
- {
- throw new PortletException();
- }
- return null;
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(0))
- {
- PortletURL url = resp.createActionURL();
- actionURL = url.toString();
- }
- else if (context.isRequestCount(2))
- {
- PortletExceptionDuringRequestHandlingPortlet.rendered = true;
- }
- return null;
- }
-
- public void destroy()
- {
- PortletExceptionDuringRequestHandlingPortlet.destroyed = true;
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
@@ -41,24 +43,19 @@
* @portlet.specification assert="SPEC:8 - A RuntimeException thrown during initialization must be handled as a
* PortletException."
*/
+ at TestActor(id=RuntimeExceptionDuringInitPortlet.NAME)
public class RuntimeExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
{
- public static String NAME = "RuntimeExceptionDuringInitPortlet";
+ public static final String NAME = "RuntimeExceptionDuringInitPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
//This is static becouse value is shared beetween portlet instances
public static boolean rendered;
public static boolean destroyed;
- //we override this to force 3 Portlets to have same test id
- /*protected String createCaseTestId(Class clazz)
- {
- return "ExceptionsOnInitPortlet";
- }*/
-
public void init(PortletConfig config) throws PortletException
{
super.init(config);
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,89 +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.portlet.jsr168.tck.portletinterface.spec;
-
-import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.remote.RequestContext;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * DISABLED - NOT CURRENTLY USED TEST CASE
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- * @portlet.specification assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
- * of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet
- * throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render
- * method must not be invoked within the current client request"
- * @portlet.specification assert="SPEC:19 - "A RuntimeException thrown during the request handling must be handled as a
- * PortletException"
- */
-public class RuntimeExceptionDuringRequestHandlingPortlet extends AbstractTestPortlet
-{
- //This is static becouse value is shared beetween portlet instances
- public static boolean rendered;
- public static boolean destroyed;
- public static String actionURL = "";
-
- //we override this to force 3 Portlets to have same test id
- protected String createTestName(Class clazz)
- {
- return "ExceptionsDuringRequestHandlingPortlet";
- }
-
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(3))
- {
- //throw new RuntimeException();
- }
- return null;
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(0))
- {
- PortletURL url = resp.createActionURL();
- actionURL = url.toString();
- }
- if (context.isRequestCount(3))
- {
- RuntimeExceptionDuringRequestHandlingPortlet.rendered = true;
- }
- return null;
- }
-
- public void destroy()
- {
- RuntimeExceptionDuringRequestHandlingPortlet.destroyed = true;
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
@@ -38,25 +40,20 @@
* @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
* considered unsuccessful."
*/
+ at TestActor(id=UnavailableExceptionDuringInitPortlet.NAME)
public class UnavailableExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
{
- public static String NAME = "UnavailableExceptionDuringInitPortlet";
+ public static final String NAME = "UnavailableExceptionDuringInitPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
//This is static becouse value is shared beetween portlet instances
public static boolean rendered;
public static boolean destroyed;
- //we override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
- {
- return "ExceptionsOnInitPortlet";
- }
-
public void init(PortletConfig config) throws PortletException
{
super.init(config);
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,87 +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.portlet.jsr168.tck.portletinterface.spec;
-
-import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.remote.RequestContext;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * DISABLED - NOT CURRENTLY USED TEST CASE
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- * @portlet.specification assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException, the
- * portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release
- * the portlet object."
- */
-public class UnavailableExceptionDuringProcessActionPortlet extends AbstractTestPortlet
-{
-
- // This is static becouse value is shared beetween portlet instances
- public static boolean rendered;
- public static boolean destroyed;
- public static String actionURL = "";
-
- // We override this to force 3 Portlets to have same test id
- protected String createTestName(Class clazz)
- {
- return "ExceptionsDuringRequestHandlingPortlet";
- }
-
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(4))
- {
- //throw new UnavailableException("UnavailableException thrown during action phase for testing purposes");
- }
- return null;
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(0))
- {
- PortletURL url = resp.createActionURL();
- actionURL = url.toString();
- }
- if (context.isRequestCount(4))
- {
- UnavailableExceptionDuringProcessActionPortlet.rendered = true;
- }
- return null;
- }
-
- public void destroy()
- {
- UnavailableExceptionDuringProcessActionPortlet.destroyed = true;
- }
-}
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,68 +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.portlet.jsr168.tck.portletinterface.spec;
-
-import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.remote.RequestContext;
-
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.UnavailableException;
-import java.io.IOException;
-
-/**
- * DISABLED - NOT CURRENTLY USED TEST CASE
- *
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- * @portlet.specification assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException, the
- * portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release
- * the portlet object."
- */
-public class UnavailableExceptionDuringRenderPortlet extends AbstractTestPortlet
-{
- //This is static becouse value is shared beetween portlet instances
- public static boolean destroyed;
-
- //we override this to force 3 Portlets to have same test id
- protected String createTestName(Class clazz)
- {
- return "ExceptionsDuringRequestHandlingPortlet";
- }
-
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException
- {
- if (context.isRequestCount(0))
- {
- throw new UnavailableException("UnavailableException thrown during render phase for testing purposes");
- }
- return null;
- }
-
- public void destroy()
- {
- UnavailableExceptionDuringRenderPortlet.destroyed = true;
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletmode;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet;
@@ -48,9 +48,9 @@
@TestCase(Assertion.JSR168_38)
public class NotInvokeModeDeclaredForNotSupportedMarkupTestCase
{
- public NotInvokeModeDeclaredForNotSupportedMarkupTestCase(PortletTest seq)
+ public NotInvokeModeDeclaredForNotSupportedMarkupTestCase(PortletTestCase seq)
{
- seq.addAction(0, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -81,7 +81,7 @@
}
});
- seq.addAction(2, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletModeException
{
@@ -94,7 +94,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -102,7 +102,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Added: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModePortletTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModePortletTestCase.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModePortletTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * 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.portlet.jsr168.tck.portletmode;
+
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
+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;
+import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.RequestDispatchingDependingOnModePortlet;
+import org.jboss.unit.driver.DriverResponse;
+
+import javax.portlet.Portlet;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+ at TestCase({Assertion.JSR168_36, Assertion.JSR168_37})
+public class RequestDispatchingDependingOnModePortletTestCase
+{
+ public RequestDispatchingDependingOnModePortletTestCase(PortletTestCase seq)
+ {
+ seq.bindAction(new JoinPoint(RequestDispatchingDependingOnModePortlet.NAME, JoinPointType.PORTLET_ACTION), new PortletActionTestAction()
+ {
+ protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new AssertionError();
+ }
+ });
+ seq.bindAction(new JoinPoint(RequestDispatchingDependingOnModePortlet.NAME, JoinPointType.PORTLET_RENDER), new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new AssertionError();
+ }
+ });
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -1,40 +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.portlet.jsr168.tck.portletmode;
-
-import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.unit.annotations.TestCase;
-import org.jboss.portal.unit.Assertion;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
- at TestCase({Assertion.JSR168_36, Assertion.JSR168_37})
-public class RequestDispatchingDependingOnModeTestCase
-{
- public RequestDispatchingDependingOnModeTestCase(PortletTest seq)
- {
- // RequestDispatchingDependingOnModePortlet will do all the job
- }
-}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
import javax.portlet.PortletURL;
@@ -33,21 +35,17 @@
* @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"
*/
+ at TestActor(id=NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.NAME)
public class NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet extends AbstractUniversalTestPortlet
{
public static PortletURL url;
- public static String NAME = "NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet";
+ public static final String NAME = "NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet";
- public final static Joinpoint RENDER_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_RENDER);
+ public final static JoinPoint RENDER_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_RENDER);
- public final static Joinpoint ACTION_JOINPOINT = new Joinpoint(NAME, Joinpoint.PORTLET_ACTION);
+ public final static JoinPoint ACTION_JOIN_POINT = new JoinPoint(NAME, JoinPointType.PORTLET_ACTION);
- protected String createComponentId()
- {
- return NAME;
- }
-
protected void reset()
{
url = null;
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
-import org.jboss.portal.test.portlet.jsr168.tck.portletmode.RequestDispatchingDependingOnModeTestCase;
+import org.jboss.portal.unit.annotations.TestActor;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
@@ -45,20 +45,19 @@
* @version $Revision: 7954 $
* @portlet.specification assert="SPEC:36 - ."
*/
+ at TestActor(id=RequestDispatchingDependingOnModePortlet.NAME)
public class RequestDispatchingDependingOnModePortlet extends AbstractTestGenericPortlet
{
/** . */
+ public static final String NAME = "RequestDispatchingDependingOnModePortlet";
+
+ /** . */
private String methodCall;
/** . */
private PortletTestContext context;
- public RequestDispatchingDependingOnModePortlet()
- {
- super(RequestDispatchingDependingOnModeTestCase.class);
- }
-
protected void doView(final RenderRequest request, RenderResponse response) throws PortletException, IOException
{
if (context.getRequestCount() == 1)
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase(Assertion.JSR168_52)
public class ActionToRenderParametersTestCase
{
- public ActionToRenderParametersTestCase(PortletTest seq)
+ public ActionToRenderParametersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -69,7 +69,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase(Assertion.JSR168_50)
public class ActionToRequestParametersNotPropagatedTestCase
{
- public ActionToRequestParametersNotPropagatedTestCase(PortletTest seq)
+ public ActionToRequestParametersNotPropagatedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -72,7 +72,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase(Assertion.JSR168_60)
public class AuthTypeTestCase
{
- public AuthTypeTestCase(PortletTest seq)
+ public AuthTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -68,7 +68,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase(Assertion.JSR168_61)
public class ContentTypeTestCase
{
- public ContentTypeTestCase(PortletTest seq)
+ public ContentTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase({Assertion.JSR168_58, Assertion.JSR168_59})
public class ContextPathTestCase
{
- public ContextPathTestCase(PortletTest seq)
+ public ContextPathTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -75,7 +75,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase(Assertion.JSR168_63)
public class ObtainingInputStreamAndReaderTestCase
{
- public ObtainingInputStreamAndReaderTestCase(PortletTest seq)
+ public ObtainingInputStreamAndReaderTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -78,7 +78,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -87,7 +87,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -105,7 +105,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase({Assertion.JSR168_55, Assertion.JSR168_56})
public class ParameterAccessMethodTestCase
{
- public ParameterAccessMethodTestCase(PortletTest seq)
+ public ParameterAccessMethodTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -76,7 +76,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
@@ -50,9 +50,9 @@
String url;
- public ParametersDuringRenderNotTargetedTestCase(PortletTest seq)
+ public ParametersDuringRenderNotTargetedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -64,7 +64,7 @@
}
});
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -78,7 +78,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -87,7 +87,7 @@
}
});
- seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -97,7 +97,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -118,7 +118,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase({Assertion.JSR168_83})
public class BufferResetTestCase
{
- public BufferResetTestCase(PortletTest seq)
+ public BufferResetTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -58,7 +58,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase({Assertion.JSR168_80, Assertion.JSR168_81})
public class BufferSizeTestCase
{
- public BufferSizeTestCase(PortletTest seq)
+ public BufferSizeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase({Assertion.JSR168_78})
public class GetContentTypeTestCase
{
- public GetContentTypeTestCase(PortletTest seq)
+ public GetContentTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -56,9 +56,9 @@
@TestCase({Assertion.JSR168_71})
public class IllegalStateExceptionAfterSendRedirectTestCase
{
- public IllegalStateExceptionAfterSendRedirectTestCase(PortletTest seq)
+ public IllegalStateExceptionAfterSendRedirectTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -67,7 +67,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -77,7 +77,7 @@
}
});
- seq.addAction(1, UTS2.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS2.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -85,7 +85,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +44,9 @@
@TestCase({Assertion.JSR168_86, Assertion.JSR168_87, Assertion.JSR168_88})
public class NamespaceEncodingTestCase
{
- public NamespaceEncodingTestCase(PortletTest seq)
+ public NamespaceEncodingTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
@TestCase({Assertion.JSR168_67})
public class NotAllowedModeTestCase
{
- public NotAllowedModeTestCase(PortletTest seq)
+ public NotAllowedModeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -77,7 +77,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
@TestCase({Assertion.JSR168_68})
public class NotSupportedWindowStateTestCase
{
- public NotSupportedWindowStateTestCase(PortletTest seq)
+ public NotSupportedWindowStateTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -77,7 +77,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase({Assertion.JSR168_79})
public class OutputStreamOrWriterTestCase
{
- public OutputStreamOrWriterTestCase(PortletTest seq)
+ public OutputStreamOrWriterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -67,7 +67,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -59,9 +59,9 @@
@TestCase({Assertion.JSR168_74, Assertion.JSR168_75})
public class ParametersSetAfterSendRedirectTestCase
{
- public ParametersSetAfterSendRedirectTestCase(PortletTest seq)
+ public ParametersSetAfterSendRedirectTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -70,7 +70,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -100,7 +100,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -108,7 +108,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_72, Assertion.JSR168_73})
public class RenderParametersTestCase
{
- public RenderParametersTestCase(PortletTest seq)
+ public RenderParametersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -90,7 +90,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -55,9 +55,9 @@
@TestCase({Assertion.JSR168_66})
public class SendRedirectAfterChangeStateMethodsTestCase
{
- public SendRedirectAfterChangeStateMethodsTestCase(PortletTest seq)
+ public SendRedirectAfterChangeStateMethodsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -66,7 +66,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletModeException, IOException
{
@@ -83,7 +83,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -92,7 +92,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException, WindowStateException
{
@@ -109,7 +109,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -118,7 +118,7 @@
}
});
- seq.addAction(3, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(3, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -135,7 +135,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -144,7 +144,7 @@
}
});
- seq.addAction(4, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(4, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -163,7 +163,7 @@
}
});
- seq.addAction(4, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_65})
public class SendRedirectWithRelativeURLTestCase
{
- public SendRedirectWithRelativeURLTestCase(PortletTest seq)
+ public SendRedirectWithRelativeURLTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException
{
@@ -76,7 +76,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +45,9 @@
@TestCase({Assertion.JSR168_77})
public class SetContentTypeBeforeOutputStreamOrWriterTestCase
{
- public SetContentTypeBeforeOutputStreamOrWriterTestCase(PortletTest seq)
+ public SetContentTypeBeforeOutputStreamOrWriterTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
@@ -64,7 +64,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -43,9 +43,9 @@
@TestCase({Assertion.JSR168_76})
public class SetNotSupportedContentTypeTestCase
{
- public SetNotSupportedContentTypeTestCase(PortletTest seq)
+ public SetNotSupportedContentTypeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -61,9 +61,9 @@
@TestCase({Assertion.JSR168_69, Assertion.JSR168_70})
public class StateChangesAfterRedirectionSendTestCase
{
- public StateChangesAfterRedirectionSendTestCase(PortletTest seq)
+ public StateChangesAfterRedirectionSendTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -72,7 +72,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws IOException, PortletModeException, WindowStateException
{
@@ -100,7 +100,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -108,7 +108,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -50,9 +50,9 @@
@TestCase({Assertion.JSR168_115})
public class HTTPSessionInvalidatesPortletSessionTestCase
{
- public HTTPSessionInvalidatesPortletSessionTestCase(PortletTest seq)
+ public HTTPSessionInvalidatesPortletSessionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -52,9 +52,9 @@
@TestCase({Assertion.JSR168_113, Assertion.JSR168_114})
public class HTTPSessionRelationsTestCase
{
- public HTTPSessionRelationsTestCase(PortletTest seq)
+ public HTTPSessionRelationsTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -67,7 +67,7 @@
}
});
- seq.addAction(1, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
@@ -83,7 +83,7 @@
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +48,9 @@
@TestCase({Assertion.JSR168_116})
public class PortletSessionInvalidatesHTTPSessionTestCase
{
- public PortletSessionInvalidatesHTTPSessionTestCase(PortletTest seq)
+ public PortletSessionInvalidatesHTTPSessionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -62,9 +62,9 @@
@TestCase({Assertion.JSR168_110, Assertion.JSR168_111, Assertion.JSR168_112, Assertion.JSR168_117, Assertion.JSR168_118, Assertion.JSR168_119})
public class SessionAttributesTestCase
{
- public SessionAttributesTestCase(PortletTest seq)
+ public SessionAttributesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -75,7 +75,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -84,7 +84,7 @@
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -95,7 +95,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -106,7 +106,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -116,7 +116,7 @@
}
});
- seq.addAction(3, UTS1.SERVICE_JOINPOINT, new ServletServiceTestAction()
+ seq.bindAction(3, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction()
{
protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +48,9 @@
@TestCase({Assertion.JSR168_106, Assertion.JSR168_107})
public class SessionCreateTestCase
{
- public SessionCreateTestCase(PortletTest seq)
+ public SessionCreateTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -71,7 +71,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -33,7 +33,7 @@
@TestCase({Assertion.JSR168_120})
public class SessionInvalidationTestCase
{
- public SessionInvalidationTestCase(PortletTest seq)
+ public SessionInvalidationTestCase(PortletTestCase seq)
{
// seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
// {
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase({Assertion.JSR168_27, Assertion.JSR168_28, Assertion.JSR168_29})
public class PortletURLParametersTestCase
{
- public PortletURLParametersTestCase(PortletTest seq)
+ public PortletURLParametersTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -70,7 +70,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -79,7 +79,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -99,7 +99,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -113,7 +113,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -131,7 +131,7 @@
}
});
- seq.addAction(3, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase({Assertion.JSR168_32})
public class PortletURLWithNotSupportedModeTestCase
{
- public PortletURLWithNotSupportedModeTestCase(PortletTest seq)
+ public PortletURLWithNotSupportedModeTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -46,9 +46,9 @@
@TestCase({Assertion.JSR168_34})
public class PortletURLWithNotSupportedStateTestCase
{
- public PortletURLWithNotSupportedStateTestCase(PortletTest seq)
+ public PortletURLWithNotSupportedStateTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase({Assertion.JSR168_26})
public class RenderURLNotInvokeActionTestCase
{
- public RenderURLNotInvokeActionTestCase(PortletTest seq)
+ public RenderURLNotInvokeActionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -68,7 +68,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -48,9 +48,9 @@
@TestCase({Assertion.JSR168_35})
public class SecurityLevelTestCase
{
- public SecurityLevelTestCase(PortletTest seq)
+ public SecurityLevelTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -68,7 +68,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase({Assertion.JSR168_99})
public class CanModifyNonReadOnlyPreferenceTestCase
{
- public CanModifyNonReadOnlyPreferenceTestCase(PortletTest seq)
+ public CanModifyNonReadOnlyPreferenceTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -90,7 +90,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -98,7 +98,7 @@
}
});
- seq.addAction(2, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -111,7 +111,7 @@
}
});
- seq.addAction(2, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_96})
public class ChangesMadeButNotStoredAreDiscardedTestCase
{
- public ChangesMadeButNotStoredAreDiscardedTestCase(PortletTest seq)
+ public ChangesMadeButNotStoredAreDiscardedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP3.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException
{
@@ -86,7 +86,7 @@
}
});
- seq.addAction(1, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -94,7 +94,7 @@
}
});
- seq.addAction(2, UTP3.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP3.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -109,7 +109,7 @@
}
});
- seq.addAction(2, UTP3.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP3.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP6;
@@ -44,9 +44,9 @@
@TestCase({Assertion.JSR168_101})
public class CreateASingleInstanceOfValidatorTestCase
{
- public CreateASingleInstanceOfValidatorTestCase(PortletTest seq)
+ public CreateASingleInstanceOfValidatorTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP6.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP6.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase({Assertion.JSR168_100})
public class DynamicPreferenceTreatedLikeModifiablePreferenceTestCase
{
- public DynamicPreferenceTreatedLikeModifiablePreferenceTestCase(PortletTest seq)
+ public DynamicPreferenceTreatedLikeModifiablePreferenceTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -89,7 +89,7 @@
}
});
- seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -97,7 +97,7 @@
}
});
- seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -125,7 +125,7 @@
}
});
- seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -133,7 +133,7 @@
}
});
- seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(3, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -146,7 +146,7 @@
}
});
- seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -52,9 +52,9 @@
@TestCase({Assertion.JSR168_104})
public class InvalidationCancelsStoreTestCase
{
- public InvalidationCancelsStoreTestCase(PortletTest seq)
+ public InvalidationCancelsStoreTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP7.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -62,7 +62,7 @@
}
});
- seq.addAction(1, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP7.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException
{
@@ -92,7 +92,7 @@
}
});
- seq.addAction(1, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP7.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -100,7 +100,7 @@
}
});
- seq.addAction(2, UTP7.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP7.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -114,7 +114,7 @@
}
});
- seq.addAction(2, UTP7.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP7.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase({Assertion.JSR168_90})
public class PreferencesCanBeSetToNullTestCase
{
- public PreferencesCanBeSetToNullTestCase(PortletTest seq)
+ public PreferencesCanBeSetToNullTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -90,7 +90,7 @@
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -98,7 +98,7 @@
}
});
- seq.addAction(2, UTP2.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP2.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -111,7 +111,7 @@
}
});
- seq.addAction(2, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_91})
public class PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase
{
- public PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase(PortletTest seq)
+ public PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -59,7 +59,7 @@
}
});
- seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -84,7 +84,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -50,9 +50,9 @@
@TestCase({Assertion.JSR168_93})
public class ReadOnlyPreferenceCannotBeModifiedTestCase
{
- public ReadOnlyPreferenceCannotBeModifiedTestCase(PortletTest seq)
+ public ReadOnlyPreferenceCannotBeModifiedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -60,7 +60,7 @@
}
});
- seq.addAction(1, UTP5.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP5.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -133,7 +133,7 @@
}
});
- seq.addAction(1, UTP5.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -51,9 +51,9 @@
@TestCase({Assertion.JSR168_92})
public class ResetPreferenceHavingNoDefaultValueDeletesItTestCase
{
- public ResetPreferenceHavingNoDefaultValueDeletesItTestCase(PortletTest seq)
+ public ResetPreferenceHavingNoDefaultValueDeletesItTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -82,7 +82,7 @@
}
});
- seq.addAction(1, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -90,7 +90,7 @@
}
});
- seq.addAction(2, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -114,7 +114,7 @@
}
});
- seq.addAction(2, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -122,7 +122,7 @@
}
});
- seq.addAction(3, UTP4.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(3, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -134,7 +134,7 @@
}
});
- seq.addAction(3, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(3, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
import org.jboss.portal.test.framework.portlet.PortletTestContext;
import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
@@ -46,9 +46,9 @@
@TestCase({Assertion.JSR168_97})
public class StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase
{
- public StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase(PortletTest seq)
+ public StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP4.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, ValidatorException
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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,9 +53,9 @@
@TestCase({Assertion.JSR168_103, Assertion.JSR168_105})
public class ValidationStoresTestCase
{
- public ValidationStoresTestCase(PortletTest seq)
+ public ValidationStoresTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP8.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -63,7 +63,7 @@
}
});
- seq.addAction(1, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(1, UTP8.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws ReadOnlyException, IOException, ValidatorException
{
@@ -95,7 +95,7 @@
}
});
- seq.addAction(1, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP8.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -103,7 +103,7 @@
}
});
- seq.addAction(2, UTP8.ACTION_JOINPOINT, new PortletActionTestAction()
+ seq.bindAction(2, UTP8.ACTION_JOIN_POINT, new PortletActionTestAction()
{
protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context)
{
@@ -116,7 +116,7 @@
}
});
- seq.addAction(2, UTP8.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(2, UTP8.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.windowstates;
-import org.jboss.portal.test.framework.portlet.PortletTest;
+import org.jboss.portal.test.framework.portlet.PortletTestCase;
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;
@@ -49,9 +49,9 @@
@TestCase({Assertion.JSR168_40})
public class CustomStateNotMappedNotInvokedTestCase
{
- public CustomStateNotMappedNotInvokedTestCase(PortletTest seq)
+ public CustomStateNotMappedNotInvokedTestCase(PortletTestCase seq)
{
- seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws WindowStateException
{
@@ -61,7 +61,7 @@
}
});
- seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
@@ -70,7 +70,7 @@
}
});
- seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+ seq.bindAction(1, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
{
protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context)
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java 2007-11-08 15:29:04 UTC (rev 8849)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -115,7 +115,8 @@
" declared as supported for a given markup type", Status.disabled("spec?")),
JSR168_40(new TCK(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."),
+ " mapped to a custom window state provided by the portal, portlets must not be invoked in that window state.",
+ Status.disabled("PortletURL.setWindowState throws an exception because it is not mapped")),
JSR168_43(new TCK(43), "The initialization parameters accessible through the PortletContext must" +
" be the same that are accessible through the ServletContext of the portlet application."),
Added: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPoint.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPoint.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPoint.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,108 @@
+/******************************************************************************
+ * 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.unit;
+
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.annotations.TestActor;
+
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * Defines a binding point for component id and its method.
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 5510 $
+ */
+public class JoinPoint
+{
+
+ /** Id of actor like "portlet A", "Servlet B". */
+ private final String actorId;
+
+ /** method in component like "render" and etc. */
+ private final JoinPointType type;
+
+ public JoinPoint(String actorId, JoinPointType type)
+ {
+ if (actorId == null)
+ {
+ throw new IllegalArgumentException("Actor id value cannot be null");
+ }
+ if (type == null)
+ {
+ throw new IllegalArgumentException("Type cannot be null");
+ }
+
+ //
+ this.actorId = actorId;
+ this.type = type;
+ }
+
+ public String getActorId()
+ {
+ return actorId;
+ }
+
+ public JoinPointType getType()
+ {
+ return type;
+ }
+
+ public int hashCode()
+ {
+ return actorId.hashCode() * 43 + type.hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof JoinPoint))
+ {
+ throw new IllegalArgumentException("Cannot compare with different object class");
+ }
+ JoinPoint j = (JoinPoint)obj;
+ return actorId.equals(j.actorId) && type == j.type;
+ }
+
+ public String toString()
+ {
+ return actorId + "_" + type;
+ }
+
+ public static JoinPoint createJoinPoint(Class annotatedClass, JoinPointType type)
+ {
+ TestActor testActorAnnotation = ((AnnotatedElement)annotatedClass).getAnnotation(TestActor.class);
+
+ //
+ if (testActorAnnotation == null)
+ {
+ throw new IllegalStateException("No annotation @TestPortlet found on portlet class " + annotatedClass.getName());
+ }
+
+ //
+ String actorId = testActorAnnotation.id();
+
+ //
+ return new JoinPoint(actorId, type);
+ }
+}
+
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPoint.java
___________________________________________________________________
Name: svn:executable
+ *
Added: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPointType.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPointType.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/JoinPointType.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * 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.unit;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public enum JoinPointType
+{
+
+ PORTLET_ACTION("portlet.action"),
+ PORTLET_RENDER("portlet.render"),
+ SERVLET_SERVICE("servlet.service");
+
+ /** . */
+ private final String name;
+
+ private JoinPointType(String name)
+ {
+ this.name = name;
+ }
+
+ public String toString()
+ {
+ return name;
+ }
+}
Added: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestActor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestActor.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestActor.java 2007-11-08 21:44:40 UTC (rev 8850)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * 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.unit.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/**
+ * Annotate an actor in the test.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(ElementType.TYPE)
+public @interface TestActor
+{
+ /**
+ * The actor id.
+ * @return
+ */
+ String id();
+}
More information about the portal-commits
mailing list