[portal-commits] JBoss Portal SVN: r8851 - in modules/portlet/trunk/portlet: src/main/org/jboss/portal/test/framework and 82 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Thu Nov 8 17:14:23 EST 2007
Author: julien at jboss.com
Date: 2007-11-08 17:14:22 -0500 (Thu, 08 Nov 2007)
New Revision: 8851
Added:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestCase.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestContext.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestDriver.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestParameters.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestSuite.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestContants.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractTestGenericPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestServlet.java
Removed:
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java
Modified:
modules/portlet/trunk/portlet/build.xml
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/MinimizedStateDontRenderTestCase.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/RequestDispatchingDependingOnModePortletTestCase.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/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/expiringcache-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/neverexpiringcache-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/nocache-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
Log:
- moved the package name of the portlet test framework extension to org.jboss.portal.unit
Modified: modules/portlet/trunk/portlet/build.xml
===================================================================
--- modules/portlet/trunk/portlet/build.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/build.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -154,13 +154,14 @@
</jar>
<!-- Portlet test lib jar -->
+<!--
<jar jarfile="${build.lib}/portal-portlet-test-lib.jar" manifest="${build.etc}/portal-portlet-lib-jar.mf">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/**"/>
</jar>
+-->
<!-- Portlet test framework lib jar -->
<jar jarfile="${build.lib}/portal-portlet-test-framework-lib.jar" manifest="${build.etc}/portal-portlet-lib-jar.mf">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
<fileset dir="${build.classes}" includes="org/jboss/portal/unit/**"/>
</jar>
</target>
@@ -250,7 +251,6 @@
<jar jarfile="${build.lib}/test-ha-session.war">
<fileset dir="${build.resources}/test/ha/test-session-war"/>
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/ha/session/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</jar>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP1.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP10.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP11.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.framework;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPoint;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP2.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP3.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP4.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP5.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP6.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP7.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP8.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTP9.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS1.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/framework/UTS2.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.framework;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,9 +23,10 @@
package org.jboss.portal.test.portlet.ha.session;
import org.jboss.portal.unit.annotations.TestCase;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateImmutableValueTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.ha.session;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/TestReplicateMutableValueTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,9 +23,10 @@
package org.jboss.portal.test.portlet.ha.session;
import org.jboss.portal.unit.annotations.TestCase;
-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.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.framework.server.NodeId;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/AttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ConstantsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/PropertyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/EncodeURLTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/PropertyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/RenderParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalInfoTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertTrue;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PropertyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedPortletModesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/SupportedWindowStatesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterNamesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/InitParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletContextTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletNameTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/AttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/DispatcherTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/InitParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/MimeTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextNameTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourcePathsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ResourceTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/VersionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.TestContants;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.TestContants;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ConstructorTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/EqualsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/HashCodeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/ModesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ReadOnlyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ResetNullKeyThrowsNPETestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ValueTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/ZeroLengthArrayValueTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/AttributeNamesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/ConstantsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/CreationTimeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/GetAttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/InvalidateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/NewTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/RemoveAttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/SetAttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsession;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeAttributeNameTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/DecodeScopeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/ParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.portleturl;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/AttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ConstantsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/ParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/PropertyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ConstantsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/ContentTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/EncodeURLTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/PropertyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/ConstructorTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/EqualsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/HashCodeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/StatesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api.windowstate;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractActionInvalidatesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,10 +23,11 @@
package org.jboss.portal.test.portlet.jsr168.ext.common;
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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheMarkupTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.common;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractDisableDuringRenderTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.common;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatchingFilterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/FiltersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/GetRequestURITestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,14 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/RequestHeaderAccessTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertFalse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ActionInvalidatesExpiringCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/DisableDuringRenderExpiringCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,8 +24,9 @@
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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.expiringcache;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP10;
import org.jboss.portal.test.portlet.framework.UTP11;
import org.jboss.portal.common.util.CollectionBuilder;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithPortletModeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithRenderParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -26,8 +26,9 @@
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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheWithWindowStateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/ActionInvalidatesNeverExpiringCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/DisableDuringRenderNeverExpiringCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,8 +24,9 @@
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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithPortletModeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -26,8 +26,9 @@
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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithRenderParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
/**
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheWithWindowStateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -26,8 +26,9 @@
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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/AbstractNoCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
@@ -50,8 +51,7 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
- at TestCase
-public class AbstractNoCacheTestCase
+public abstract class AbstractNoCacheTestCase
{
final Set calls = new HashSet();
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ExplicitNoCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/ImplicitNoCacheTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.nocache;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/GetResourceBundleDuringInitTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleCascadeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/ResourceBundleTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestActionWithPortletModeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringActionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/TestDuringRenderTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseFormTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseInputStreamTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.common.io.IOTools;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/ActionRequestUseReaderTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,14 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokePostResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeScopingTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestAttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestHeaderAccessTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertFalse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/RequestParameterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/ContentTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/IsReadOnlyTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/MapTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/StoreMustPersistAllChangesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/CrossContextSessionAttributeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/ObtainNonNullSessionUsingCreateEqualsFalseTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionDoesNotExistBeforeItIsRequestedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext.session;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,7 +24,7 @@
import org.apache.log4j.Logger;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/TestLog4jTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.misc.log4j;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,17 +22,18 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNotNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
-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;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestServlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.PortletExceptionDuringInitPortlet;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.RuntimeExceptionDuringInitPortlet;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.UnavailableExceptionDuringInitPortlet;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.InitializeBeforeHandlePortlet;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertTrue;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
Modified: 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 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/MinimizedStateDontRenderTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -25,10 +25,11 @@
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.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.MinimizedStateDontRenderPortlet;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.driver.response.FailureResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractTestGenericPortlet;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.annotations.TestActor;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletmode;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
Modified: 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 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModePortletTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -26,10 +26,11 @@
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.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.RequestDispatchingDependingOnModePortlet;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
import org.jboss.portal.unit.JoinPoint;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
import org.jboss.portal.unit.JoinPointType;
import org.jboss.portal.unit.annotations.TestActor;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
-import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet;
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractTestGenericPortlet;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.portal.unit.annotations.TestActor;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,10 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,10 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,10 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,11 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,12 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,11 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,11 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,9 +24,9 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertNull;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,17 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,11 +22,11 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,15 +22,16 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.driver.response.FailureResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,11 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,10 +24,10 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTS1;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,9 +24,9 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,11 +24,11 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.test.portlet.framework.UTS1;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,9 +24,10 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.unit.driver.DriverResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -24,7 +24,7 @@
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
-import org.jboss.portal.test.framework.portlet.PortletTestCase;
+import org.jboss.portal.unit.PortletTestCase;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.fail;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP3;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP6;
import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.CreateASingleInstanceOfValidatorValidator;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import static org.jboss.unit.api.Assert.assertEquals;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP7;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestCase;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP5;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP4;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,14 +22,15 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.preferences;
-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;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
import org.jboss.portal.test.portlet.framework.UTP8;
import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.ValidationStoresValidator;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.EndTestResponse;
import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
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 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -22,13 +22,14 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.windowstates;
-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.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
import org.jboss.portal.test.portlet.framework.UTP1;
import org.jboss.portal.test.portlet.framework.UTP2;
import org.jboss.portal.unit.annotations.TestCase;
import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.PortletTestContext;
import org.jboss.unit.driver.DriverResponse;
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.driver.response.EndTestResponse;
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestCase.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestCase.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestCase.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestCase.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -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.unit;
+
+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/unit/PortletTestCase.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestContext.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestContext.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestContext.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,100 @@
+/******************************************************************************
+ * 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.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;
+
+import java.net.MalformedURLException;
+import java.io.Serializable;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class PortletTestContext
+{
+
+ /** . */
+ final String testName;
+
+ /** . */
+ final PortletTestCase portletTestCase;
+
+ /** . */
+ RequestContext requestContext;
+
+ /** . */
+ ResponseContext responseContext;
+
+ public PortletTestContext(String testName, PortletTestCase portletTestCase, RequestContext requestContext)
+ {
+ if (requestContext == null)
+ {
+ throw new IllegalArgumentException("No request context to wrap");
+ }
+ this.testName = testName;
+ this.portletTestCase = portletTestCase;
+ this.requestContext = requestContext;
+ }
+
+ public String getTestName()
+ {
+ 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>());
+ }
+
+ public int getRequestCount()
+ {
+ return requestContext.getRequestCount();
+ }
+
+ public String rewriteURLForNode(String url, NodeId nodeId) throws MalformedURLException
+ {
+// return testContext.rewriteURLForNode(url, nodeId);
+ throw new NotYetImplemented("todo");
+ }
+
+ public String getParameter(String parameterName)
+ {
+ if (parameterName == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ return requestContext.getParametrization().get(parameterName);
+ }
+}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestDriver.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestDriver.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestDriver.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,204 @@
+/******************************************************************************
+ * 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.unit.remote.driver.RemoteTestDriver;
+import org.jboss.unit.remote.driver.RemoteTestDriverServer;
+import org.jboss.unit.remote.driver.CompositeRemoteTestDriver;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+import org.jboss.unit.remote.RequestContext;
+import org.jboss.unit.remote.ResponseContext;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.TestDriver;
+import org.jboss.unit.driver.DriverContext;
+import org.jboss.unit.driver.DriverCommand;
+import org.jboss.unit.driver.DriverException;
+import org.jboss.unit.driver.impl.composite.CompositeTestDriver;
+import org.jboss.unit.info.TestCaseInfo;
+import org.jboss.unit.info.TestInfo;
+import org.jboss.unit.info.impl.SimpleTestCaseInfo;
+import org.jboss.unit.TestId;
+
+/**
+ * Registry of action sequences. Every sequence is binded with test id
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 6720 $
+ */
+public class PortletTestDriver extends CompositeTestDriver
+{
+
+ /** . */
+ private static PortletTestContext context;
+
+ /** . */
+ private final RemoteTestDriverServer server;
+
+ /** . */
+ private String path;
+
+ public PortletTestDriver(String name, RemoteTestDriverServer parent)
+ {
+ this(name, parent, "/test");
+ }
+
+ public PortletTestDriver(String name, RemoteTestDriverServer parent, String path)
+ {
+ super(name);
+
+ //
+ this.server = parent;
+ this.path = path;
+ }
+
+ public void start()
+ {
+ server.setDelegate(new CompositeRemoteTestDriver(this));
+ }
+
+ public void stop()
+ {
+ server.setDelegate(null);
+ }
+
+ /**
+ * Adding sequence to registry. Sequence can be null as this will clear the binding
+ *
+ * @param testCaseName
+ * @param portletTestCase
+ */
+ public void addTestCase(String testCaseName, PortletTestCase portletTestCase)
+ {
+ if (testCaseName == null)
+ {
+ throw new IllegalArgumentException("Test name must be provided");
+ }
+ if (portletTestCase == null)
+ {
+ throw new IllegalArgumentException("Portlet test can't be null");
+ }
+ if (getTestCase(testCaseName) != null)
+ {
+ throw new IllegalArgumentException("Portlet test cannot be bound twice");
+ }
+
+ //
+ try
+ {
+ TestCaseEntry entry = new TestCaseEntry(testCaseName, portletTestCase);
+
+ //
+ mount(entry);
+ }
+ catch (DriverException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public void removeTestCase(String testName)
+ {
+ TestDriver a = drivers.get(testName);
+
+ //
+ unmount(a);
+ }
+
+ public PortletTestCase getTestCase(String testName)
+ {
+ if (testName == null)
+ {
+ throw new IllegalArgumentException("Test name can't be null");
+ }
+ TestCaseEntry entry = (TestCaseEntry)drivers.get(testName);
+
+ //
+ return entry != null ? entry.portletTestCase : null;
+ }
+
+ /**
+ * The current portlet test context statically available.
+ *
+ * @return the portlet test context.
+ */
+ public static PortletTestContext getPortletTestContext()
+ {
+ return context;
+ }
+
+ private class TestCaseEntry implements RemoteTestDriver
+ {
+
+ /** . */
+ private final String name;
+
+ /** . */
+ private final TestCaseInfo info;
+
+ /** . */
+ private final PortletTestCase portletTestCase;
+
+ public TestCaseEntry(String name, PortletTestCase portletTestCase)
+ {
+// TestInfo info = new TestInfo(name);
+// for (Iterator i = info.getParameterNames().iterator();i.hasNext();)
+// {
+// String parameterName = (String)i.next();
+// info.addParameter(new TestParameterInfo(parameterName));
+// }
+
+ //
+ this.portletTestCase = portletTestCase;
+ this.name = name;
+ this.info = new SimpleTestCaseInfo(name);
+ }
+
+ public void initDriver(DriverContext driverContext)
+ {
+ }
+
+ public void destroyDriver()
+ {
+ }
+
+ public void pushContext(TestId testId, RequestContext requestContext)
+ {
+ context = new PortletTestContext(name, getTestCase(name), requestContext);
+ }
+
+ public ResponseContext popContext(TestId testId)
+ {
+ return context.responseContext;
+ }
+
+ public DriverResponse invoke(TestId testId, DriverCommand driverCommand)
+ {
+ return new InvokeGetResponse("/portlet-test");
+ }
+
+ public TestInfo getInfo()
+ {
+ return info;
+ }
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestDriver.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestParameters.java (from rev 8829, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestParameters.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestParameters.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestParameters.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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 class PortletTestParameters
+{
+
+ /**
+ * Defines the behavior of the portal with respect to the state management behavior
+ * when the portal calls the portlet container. Legal values are "mutable" and "immutable".
+ * The "mutable" literal means that the portal will allow the portlet container to modify
+ * the state and take in account any clone operation done during the request. The "immutable"
+ * literal means that the portal will call the portlet container without allowing him to
+ * perform cloning operations. When the parameter is not specific explicitely the default
+ * behavior should be to treat the value a mutable.
+ */
+ public static final String PORTAL_PORTLET_STATE_MANAGEMENT = "portal.portlet_state_management";
+
+}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestSuite.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestSuite.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestSuite.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,272 @@
+/******************************************************************************
+ * 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.apache.log4j.Logger;
+import org.jboss.unit.remote.driver.RemoteTestDriverServer;
+import org.jboss.portal.common.net.URLNavigator;
+import org.jboss.portal.common.net.URLVisitor;
+import org.jboss.portal.common.net.URLFilter;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextAttributeListener;
+import javax.servlet.ServletContextAttributeEvent;
+import javax.servlet.ServletContext;
+import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.io.IOException;
+import java.io.File;
+
+/**
+ * Builder is invoked when web application initialization process is starting. It builds sequence of tests for this
+ * action.
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 6989 $
+ */
+public final class PortletTestSuite implements ServletContextListener, ServletContextAttributeListener
+{
+
+ /** . */
+ private final Logger log = Logger.getLogger(getClass());
+
+ /** . */
+ private PortletTestDriver driver;
+
+ /** . */
+ private ClassLoader loader;
+
+ /**
+ * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into
+ * SequenceRegistry. Then SequenceRegistry is injected into ServletContext
+ */
+ public void attributeAdded(ServletContextAttributeEvent event)
+ {
+ if (event.getName().equals("TestDriverServer"))
+ {
+ RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue();
+
+ // It is only in servlet 2.5, for now we use reflection
+ String name = null;
+ try
+ {
+ Method m = ServletContext.class.getMethod("getContextPath");
+ ServletContext servletContext = event.getServletContext();
+ name = (String)m.invoke(servletContext);
+ name = name.substring(1); // We remove the leading '/'
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot get application context path", e);
+ }
+
+ //
+ if (name != null)
+ {
+ driver = new PortletTestDriver(name, remoteDriver);
+
+ //
+ try
+ {
+ for (Class clazz : getClasses(event.getServletContext()))
+ {
+ TestCase testCaseAnnotation = ((AnnotatedElement)clazz).getAnnotation(TestCase.class);
+
+ //
+ if (testCaseAnnotation != null)
+ {
+ boolean active = true;
+
+ //
+ for (Assertion assertion : testCaseAnnotation.value())
+ {
+ if (assertion.getStatus() instanceof Assertion.Inactive)
+ {
+ active = false;
+ log.error("Skip test case " + clazz.getName() + " because the assertion " + assertion.getRef() + " is not enabled");
+ }
+ }
+
+ //
+ if (active)
+ {
+ try
+ {
+ Constructor ctor = clazz.getConstructor(PortletTestCase.class);
+ PortletTestCase portletTestCase = new PortletTestCase();
+ ctor.newInstance(portletTestCase);
+ String testCaseName = clazz.getSimpleName();
+ driver.addTestCase(testCaseName, portletTestCase);
+ }
+ catch (Exception e)
+ {
+ log.error("Cannot obtain test case constructor " + clazz, e);
+ }
+ }
+ }
+ else
+ {
+ log.error("Skip test case " + clazz.getName() + " because it is not annotated as a test case");
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ log.error("Cannot get load test cases", e);
+ }
+
+ //
+ driver.start();
+
+ //
+ event.getServletContext().setAttribute("SequenceRegistry", driver);
+ }
+ }
+ }
+
+ protected List<Class> getClasses(ServletContext ctx) throws IOException
+ {
+ TestCaseScanner collector = new TestCaseScanner(loader, ctx);
+ collector.collect();
+ return collector.classes;
+ }
+
+ private static class TestCaseScanner implements URLVisitor, URLFilter
+ {
+
+ /** . */
+ private List<Class> classes = new ArrayList<Class>();
+
+ /** . */
+ private LinkedList<String> packages = new LinkedList<String>();
+
+ /** . */
+ private ClassLoader loader;
+
+ /** . */
+ private URL classesURL;
+
+ public TestCaseScanner(ClassLoader loader, ServletContext ctx) throws MalformedURLException
+ {
+ this.loader = loader;
+
+ // Need to use that because tomcat use a jndi based implementation for resources that will not
+ // be accepted by the URLNavigator. 2 solutions either rely on JBoss new VFS or implement jndi
+ // in URLNavigator
+ this.classesURL = new File(ctx.getRealPath("/WEB-INF/classes/")).toURL();
+ }
+
+ public void collect() throws IOException
+ {
+ URLNavigator.visit(classesURL, this, this);
+ }
+
+ public void startDir(URL url, String name)
+ {
+ packages.addLast(name);
+ }
+
+ public void endDir(URL url, String name)
+ {
+ packages.removeLast();
+ }
+
+ public void file(URL url, String name)
+ {
+ try
+ {
+ StringBuffer tmp = new StringBuffer();
+ Iterator<String> i = packages.iterator();
+
+ // Skip "classes"
+ i.next();
+
+ // Iterate package names
+ while (i.hasNext())
+ {
+ tmp.append(i.next());
+ tmp.append('.');
+ }
+
+ // Append class name
+ tmp.append(name.substring(0, name.length() - ".class".length()));
+
+ //
+ String classname = tmp.toString();
+ Class clazz = loader.loadClass(classname);
+ classes.add(clazz);
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public boolean acceptFile(URL url)
+ {
+ return url.getFile().endsWith("TestCase.class");
+ }
+
+ public boolean acceptDir(URL url)
+ {
+ return true;
+ }
+ }
+
+ public void attributeRemoved(ServletContextAttributeEvent event)
+ {
+
+ }
+
+ public void attributeReplaced(ServletContextAttributeEvent event)
+ {
+
+ }
+
+ public void contextInitialized(ServletContextEvent sce)
+ {
+ loader = Thread.currentThread().getContextClassLoader();
+ }
+
+ public void contextDestroyed(ServletContextEvent sce)
+ {
+ sce.getServletContext().removeAttribute("SequenceRegistry");
+
+ //
+ if (driver != null)
+ {
+ driver.stop();
+ driver = null;
+ }
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/PortletTestSuite.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestAction.java (from rev 8829, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestAction.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestAction.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * 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:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7018 $
+ */
+public abstract class TestAction
+{
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestAction.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestContants.java (from rev 8829, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestContants.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestContants.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * 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;
+
+/**
+ * Constants for test asserts
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 5510 $
+ */
+public final class TestContants
+{
+
+ /** String from <code>PortletContext.getServerInfo()</code/>. */
+ public static final String SERVER_INVO = "JBossPortal/1.0";
+
+ /** int for <code>PortletContext.getMinorVersion()</code/>. */
+ public static final int MINOR_VERSION = 0;
+
+ /** int for <code>PortletContext.getMajorVersion()</code/>. */
+ public static final int MAJOR_VERSION = 1;
+
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TestContants.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions (from rev 8829, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions)
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2007-11-06 07:18:27 UTC (rev 8829)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -1,59 +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.actions;
-
-import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
-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.PortletException;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- */
-public abstract class PortletActionTestAction extends TestAction
-{
-
- public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
- {
- try
- {
- run(portlet, request, response, context);
- return null;
- }
- catch (AssertionError t)
- {
- return new FailureResponse(Failure.createFailure(t));
- }
- }
-
- protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException;
-
-}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletActionTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,59 @@
+/******************************************************************************
+ * 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.actions;
+
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.TestAction;
+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.PortletException;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class PortletActionTestAction extends TestAction
+{
+
+ public DriverResponse execute(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ try
+ {
+ run(portlet, request, response, context);
+ return null;
+ }
+ catch (AssertionError t)
+ {
+ return new FailureResponse(Failure.createFailure(t));
+ }
+ }
+
+ protected abstract void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException;
+
+}
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2007-11-06 07:18:27 UTC (rev 8829)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -1,57 +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.actions;
-
-import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.Failure;
-
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- */
-public abstract class PortletRenderTestAction extends TestAction
-{
-
- public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException
- {
- try
- {
- return run(servlet, request, response, context);
- }
- catch (AssertionError t)
- {
- return new FailureResponse(Failure.createFailure(t));
- }
- }
-
- protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException;
-}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/PortletRenderTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * 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.actions;
+
+import org.jboss.portal.unit.TestAction;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.Failure;
+
+import javax.portlet.Portlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class PortletRenderTestAction extends TestAction
+{
+
+ public DriverResponse execute(Portlet servlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ try
+ {
+ return run(servlet, request, response, context);
+ }
+ catch (AssertionError t)
+ {
+ return new FailureResponse(Failure.createFailure(t));
+ }
+ }
+
+ protected abstract DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException;
+}
Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2007-11-06 07:18:27 UTC (rev 8829)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -1,56 +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.actions;
-
-import org.jboss.portal.test.framework.portlet.TestAction;
-import org.jboss.portal.test.framework.portlet.PortletTestContext;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.Failure;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 7954 $
- */
-public abstract class ServletServiceTestAction extends TestAction
-{
- protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException;
-
- public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
- {
- try
- {
- return run(servlet, request, response, context);
- }
- catch (Throwable t)
- {
- return new FailureResponse(Failure.createFailure(t));
- }
- }
-}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/actions/ServletServiceTestAction.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * 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.actions;
+
+import org.jboss.portal.unit.TestAction;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.Failure;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class ServletServiceTestAction extends TestAction
+{
+ protected abstract DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException;
+
+ public DriverResponse execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException
+ {
+ try
+ {
+ return run(servlet, request, response, context);
+ }
+ catch (Throwable t)
+ {
+ return new FailureResponse(Failure.createFailure(t));
+ }
+ }
+}
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractTestGenericPortlet.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractTestGenericPortlet.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractTestGenericPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * 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.base;
+
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.PortletTestDriver;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.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.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+
+/**
+ * Abstract test class for testing GenericPortlet implementation
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class AbstractTestGenericPortlet extends GenericPortlet
+{
+
+ /** Joinpoint for render phase. */
+ private final JoinPoint renderJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_RENDER);
+
+ /** 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();
+
+ //
+ String actorId = context.getActorId(JoinPointType.PORTLET_ACTION);
+
+ //
+ DriverResponse response = new FailureResponse(Failure.createErrorFailure(""));
+
+ //
+ if (actorId != null)
+ {
+ JoinPoint tmp = new JoinPoint(actorId, JoinPointType.PORTLET_ACTION);
+
+ //
+ if (tmp.equals(actionJoinPoint))
+ {
+ try
+ {
+ response = doProcessAction(req, resp, context);
+ }
+ catch (AssertionError e)
+ {
+ response = new FailureResponse(Failure.createFailure(e));
+ }
+ }
+ }
+
+ //
+ context.setResponse(response);
+ }
+
+ public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ {
+ PortletTestContext context = PortletTestDriver.getPortletTestContext();
+
+ //
+ String actorId = context.getActorId(JoinPointType.PORTLET_RENDER);
+
+ //
+ if (actorId != null)
+ {
+ JoinPoint tmp = new JoinPoint(actorId, JoinPointType.PORTLET_RENDER);
+
+ //
+ if (tmp.equals(renderJoinPoint))
+ {
+ 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);
+ }
+ }
+ }
+ }
+
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new PortletException();
+ }
+
+ /**
+ * Invoked by render() method if current test is running. After this method GenericPortlet.render() will be called.
+ *
+ * @param req
+ * @param resp
+ * @param context
+ * @throws PortletException
+ * @throws PortletSecurityException
+ * @throws IOException
+ */
+ protected void preRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
+ {
+ throw new PortletException();
+ }
+
+ /**
+ * Invoked by render() method after GenericPortlet.render() invocation.
+ *
+ * @param req
+ * @param resp
+ * @param context
+ * @throws PortletException
+ * @throws PortletSecurityException
+ * @throws IOException
+ */
+ protected DriverResponse postRender(RenderRequest req, RenderResponse resp, PortletTestContext context) throws PortletException, IOException
+ {
+ return null;
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractTestGenericPortlet.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestPortlet.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestPortlet.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestPortlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,269 @@
+/******************************************************************************
+ * 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.base;
+
+import org.apache.log4j.Logger;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.TestAction;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.PortletTestDriver;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.driver.DriverResponse;
+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.PortletSecurityException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+
+/**
+ * Universal test portlet that enables to reuse portlet instances across several tests
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class AbstractUniversalTestPortlet implements Portlet
+{
+
+ /** . */
+ private final Logger log = createLogger();
+
+ /** Joinpoint for render phase. */
+ private final JoinPoint renderJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_RENDER);
+
+ /** Joinpoint for action phase. */
+ private final JoinPoint actionJoinPoint = JoinPoint.createJoinPoint(getClass(), JoinPointType.PORTLET_ACTION);
+
+ /** To keep PortletConfig for some tests*-. */
+ private PortletConfig config;
+
+ /** Construct a test portlet with a test id computed with the method <code>getComponentId()</code>. */
+ public AbstractUniversalTestPortlet()
+ {
+ }
+
+ 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();
+ }
+
+ /**
+ * invokes current action from Sequence
+ *
+ * @param req
+ * @param resp
+ * @throws PortletException
+ * @throws PortletSecurityException
+ * @throws IOException
+ */
+ public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ {
+ PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
+
+ //
+ log.debug("JoinPoint '" + actionJoinPoint + "' invoked for '"
+ + ctx.getTestName() + "' testId and '" +
+ +ctx.getRequestCount() + "' request count");
+
+ //
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
+
+ //
+ if (portletTestCase != null)
+ {
+ //
+ 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)));
+ }
+ 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())));
+ }
+ else
+ {
+ log.debug("Found action for jointpoint " + actionJoinPoint + " : " + action);
+
+ //
+ DriverResponse response = ((PortletActionTestAction)action).execute(this, req, resp, ctx);
+
+ //
+ ctx.setResponse(response);
+ }
+ }
+ }
+
+ /**
+ * Invokes current action from Sequence. If failed AssertResult was returned in previouse portlet action phase it
+ * will be marshalled.
+ *
+ * @param req
+ * @param resp
+ * @throws PortletException
+ * @throws PortletSecurityException
+ * @throws IOException
+ */
+ public final void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ {
+ PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
+
+ //
+ log.debug("JoinPoint '" + renderJoinPoint + " invoked for '"
+ + ctx.getTestName() + "' testId and '" +
+ +ctx.getRequestCount() + "' request count");
+
+ // Reset AssertResult at begining of test
+ if (ctx.getRequestCount() == 0)
+ {
+ reset();
+ }
+
+
+ // Get the action
+ TestAction action = null;
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
+ if (portletTestCase != null)
+ {
+ action = portletTestCase.getAction(ctx.getRequestCount(), NodeId.locate(), renderJoinPoint);
+
+ }
+
+ //
+ if (action != null)
+ {
+ log.debug("Found action for joinpoint " + renderJoinPoint + " : " + action);
+
+ // Get the result
+ DriverResponse sr = ((PortletRenderTestAction)action).execute(this, req, resp, ctx);
+
+ // If we have one result it is meant to be returned to the client
+ if (sr != null)
+ {
+ ctx.setResponse(sr);
+ }
+ }
+ else
+ {
+ // As we are not involved we don't want content to be cached that would prevent
+ // the test to run when it should be invoked
+ resp.setProperty(RenderResponse.EXPIRATION_CACHE, "0");
+ }
+ }
+
+ public void destroy()
+ {
+ }
+
+ /**
+ * Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
+ * in context
+ *
+ * @return SequenceRegistry
+ */
+ private PortletTestDriver getSequenceRegistry()
+ {
+ return (PortletTestDriver)getPortletContext().getAttribute("SequenceRegistry");
+ }
+
+ /**
+ * Returns Sequence for current testId Returns null if there is no Sequence for current testId
+ *
+ * @return
+ * @throws PortletException if there is no SequenceRegistry
+ */
+ private PortletTestCase getSequence(String testId) throws PortletException
+ {
+ PortletTestDriver registry = getSequenceRegistry();
+ if (registry == null)
+ {
+ log.error("No SequenceRegistry object found in current context");
+ throw new PortletException("No SequenceRegistry object found in context");
+ }
+ return registry.getTestCase(testId);
+ }
+
+ public JoinPoint getActionJointpoint()
+ {
+ return actionJoinPoint;
+ }
+
+ public JoinPoint getRenderJointpoint()
+ {
+ return renderJoinPoint;
+ }
+
+ protected void reset()
+ {
+ }
+
+ /** Can be subclassed to provide an alternative way to create the logger. */
+ protected Logger createLogger()
+ {
+ if (log != null)
+ {
+ throw new IllegalStateException("The logger should not be re");
+ }
+ return Logger.getLogger(getClass());
+ }
+
+ /** Return the logger. */
+ public final Logger getLogger()
+ {
+ return log;
+ }
+}
+
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestPortlet.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestServlet.java (from rev 8850, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestServlet.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestServlet.java 2007-11-08 22:14:22 UTC (rev 8851)
@@ -0,0 +1,137 @@
+/******************************************************************************
+ * 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.base;
+
+import org.apache.log4j.Logger;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.TestAction;
+import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.unit.JoinPointType;
+import org.jboss.portal.unit.PortletTestDriver;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.unit.driver.DriverResponse;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Universal test servlet that enables to reuse servlet instances across several tests
+ *
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
+ * @version $Revision: 7954 $
+ */
+public abstract class AbstractUniversalTestServlet extends HttpServlet
+{
+
+ /** The logger. */
+ private final Logger log = Logger.getLogger(getClass());
+
+ /** Jointpoint for service method. */
+ 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()
+ {
+ }
+
+ /**
+ * Standart implementation of service() method to handle requests and invoke actions from sequence
+ *
+ * @param request
+ * @param response
+ * @throws ServletException
+ * @throws IOException
+ */
+ protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ PortletTestContext ctx = PortletTestDriver.getPortletTestContext();
+
+ //
+ log.info("JoinPoint " + serviceJoinPoint + " invoked for '"
+ + ctx.getTestName() + "' testId and '" +
+ +ctx.getRequestCount() + "' request count");
+
+ // Reset instance state
+ if (ctx.getRequestCount() == 0)
+ {
+ reset();
+ }
+
+ PortletTestCase portletTestCase = getSequence(ctx.getTestName());
+ if (portletTestCase != null)
+ {
+ TestAction action = portletTestCase.getAction(ctx.getRequestCount(), NodeId.locate(), getServiceJointpoint());
+ if (action != null && action instanceof ServletServiceTestAction)
+ {
+ log.info("Found Action for this jointpoint");
+ DriverResponse dr = ((ServletServiceTestAction)action).execute(this, request, response, ctx);
+ if (dr != null)
+ {
+ ctx.setResponse(dr);
+ }
+ }
+
+ }
+ }
+
+ /**
+ * Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
+ * in context
+ *
+ * @return SequenceRegistry
+ */
+ private PortletTestDriver getSequenceRegistry()
+ {
+ return (PortletTestDriver)getServletContext().getAttribute("SequenceRegistry");
+ }
+
+ /**
+ * Returns Sequence for current testId Returns null if there is no Sequence for current testId
+ *
+ * @return
+ * @throws javax.servlet.ServletException if there is no SequenceRegistry
+ */
+ protected PortletTestCase getSequence(String testId) throws ServletException
+ {
+ PortletTestDriver registry = getSequenceRegistry();
+ if (registry == null)
+ {
+ log.info("No SequenceRegistry object found in current context");
+ throw new ServletException("No SequenceRegistry object found in context");
+ }
+ return registry.getTestCase(testId);
+ }
+
+ public JoinPoint getServiceJointpoint()
+ {
+ return serviceJoinPoint;
+ }
+
+ public abstract void reset();
+
+}
Property changes on: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/base/AbstractUniversalTestServlet.java
___________________________________________________________________
Name: svn:executable
+
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,6 +28,6 @@
<web-app>
<display-name>PortletContext WebApp</display-name>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -149,7 +149,7 @@
</filter-mapping>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/expiringcache-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/expiringcache-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/expiringcache-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/neverexpiringcache-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/neverexpiringcache-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/neverexpiringcache-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/nocache-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/nocache-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/nocache-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -29,7 +29,7 @@
<portlet>
<portlet-name>PortletA</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.basictests.PortletA</portlet-class>
+ <portlet-class>org.jboss.portal.unit.basictests.PortletA</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -40,7 +40,7 @@
<portlet>
<portlet-name>PortletB</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.basictests.PortletB</portlet-class>
+ <portlet-class>org.jboss.portal.unit.basictests.PortletB</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.basictests.BasicTestSequenceBuilder</listener-class>
+ <listener-class>org.jboss.portal.unit.basictests.BasicTestSequenceBuilder</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<servlet>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -28,7 +28,7 @@
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
<listener>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -200,7 +200,7 @@
<!--<portlet>
<portlet-name>UniversalTestPortlet9</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP9</portlet-class>
+ <portlet-class>org.jboss.portal.unit.universal.UTP9</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -222,7 +222,7 @@
<!--<portlet>
<portlet-name>UniversalTestPortlet10</portlet-name>
- <portlet-class>org.jboss.portal.test.framework.portlet.universal.UTP10</portlet-class>
+ <portlet-class>org.jboss.portal.unit.universal.UTP10</portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
Modified: modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml 2007-11-08 21:44:40 UTC (rev 8850)
+++ modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml 2007-11-08 22:14:22 UTC (rev 8851)
@@ -27,6 +27,6 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.jboss.portal.test.framework.portlet.PortletTestSuite</listener-class>
+ <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-class>
</listener>
</web-app>
More information about the portal-commits
mailing list