Author: julien(a)jboss.com Date: 2007-08-16 10:51:00 -0400 (Thu, 16 Aug 2007) New Revision: 7954 Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParametrization.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverCommand.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/ParameterNotBoundException.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriver.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverContainer.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverException.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestSuite.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/command/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/command/StartTestCommand.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/EndTestResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/ErrorResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/FailureResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestContainerInfo.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestInfo.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestItemInfo.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestParameterInfo.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/POJOJUnitTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ThrowableDecoder.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JBossServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JNDIServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookupFailedException.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestBeanFactory.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/InfoTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParameterValueTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParametrizationTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/BaseTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/POJOJunitTestTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleInheritedTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleSuperTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleInheritedTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleSuperTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleInheritedTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleSuperTest.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleTest.java Removed: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookupFailedException.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/TestRequestController.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/GetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/response/EncodeResponseTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java branches/JBoss_Portal_Branch_2_6/test/build.xml branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriver.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverClient.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestSuite.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestConversation.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/command/RemoteDriverCommandContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/response/RemoteDriverResponseContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestCase.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverClient.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/PerformClickCommand.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommand.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommandContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/PerformClickResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponse.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponseContext.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/WebTestRunner.java branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTest.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/MyTest.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestServlet.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormGetRefreshIsNotPartialWindowTest.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormPartialRefreshWindowTest.java branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/LinkPartialRefreshWindowTest.java branches/JBoss_Portal_Branch_2_6/tools/lib/explode.jar branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java Log: integrate the migration of the test stuff from common to the test module Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-16 14:51:00 UTC (rev 7954) @@ -268,6 +268,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/test/test.iml 2007-08-16 14:51:00 UTC (rev 7954) @@ -298,6 +298,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,9 +24,9 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jboss.portal.common.test.junit.POJOJUnitTest; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -27,10 +27,10 @@ import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.AbstractServerURL; Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -28,10 +28,10 @@ import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.server.driver.AbstractTest; import org.jboss.portal.test.framework.driver.http.HttpTestContext; Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -69,7 +69,7 @@ import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.test.framework.AbstractPortalTestCase; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.framework.embedded.HibernateSupport; import java.util.Collection; Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -31,9 +31,8 @@ import org.apache.log4j.SimpleLayout; import org.jboss.portal.Mode; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.common.value.StringValue; import org.jboss.portal.core.impl.portlet.state.PersistentRegistration; import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; @@ -66,9 +65,10 @@ import org.jboss.portal.registration.ConsumerGroup; import org.jboss.portal.registration.Consumer; import org.jboss.portal.registration.Registration; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; +import org.jboss.portal.test.framework.TestParametrization; import javax.xml.namespace.QName; import java.net.URL; Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -29,14 +29,14 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; import org.jboss.portal.registration.RegistrationPersistenceManager; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; +import org.jboss.portal.test.framework.TestParametrization; import org.jboss.portal.test.registration.AbstractRegistrationPersistenceManagerTestCase; import java.net.URL; Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/db/DBTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,10 +23,10 @@ import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.identity.IdentityTest; -import org.jboss.portal.common.test.junit.POJOJUnitTest; -import org.jboss.portal.common.test.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.service.UserProfileModuleService; import org.jboss.portal.identity.service.MembershipModuleService; Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -29,12 +29,12 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; import org.jboss.portal.identity.IdentityContext; -import org.jboss.portal.test.framework.TestRuntimeContext; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.framework.embedded.DSConfig; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.opends.server.tools.LDAPModify; //import org.jboss.portal.test.framework.embedded.apacheds.ApacheDSService; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.TestParameterValue; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.TestParameterValue; import java.net.MalformedURLException; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -import org.jboss.portal.common.test.info.TestInfo; -import org.jboss.portal.common.test.info.TestContainerInfo; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.info.TestParameterInfo; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestContainerInfo; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.info.TestParameterInfo; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.http.HttpTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -import org.jboss.portal.common.test.driver.TestDriverContainer; +import org.jboss.portal.test.framework.driver.TestDriverContainer; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.junit.ThrowableDecoder; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.junit.ThrowableDecoder; import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import junit.framework.TestCase; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,9 +25,9 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,9 +24,9 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTestDriver; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.framework.portlet.components; import org.apache.log4j.Logger; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,7 +23,7 @@ package org.jboss.portal.test.framework.portlet.components; import org.apache.log4j.Logger; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.Joinpoint; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.ha.session; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.util.Tools; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,15 +23,15 @@ package org.jboss.portal.test.portlet.info; import org.jboss.portal.portlet.container.PortletApplicationRegistry; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.TestDriverContainer; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.command.StartTestCommand; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.info.TestInfo; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.TestDriverContainer; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.info.TestInfo; import org.jboss.portal.test.framework.driver.http.HttpTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,7 +25,6 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.CacheInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.junit.ExtendedAssert; /** Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -26,7 +26,6 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.CapabilitiesInfo; import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.common.test.driver.response.EndTestResponse; import org.jboss.portal.common.junit.ExtendedAssert; import java.util.HashSet; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionrequest; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionresponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portalcontext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletconfig; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletcontext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletmode; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletpreferences; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsession; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portleturl; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderrequest; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderresponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.windowstate; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -30,8 +30,8 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.util.CollectionBuilder; import javax.portlet.PortletURL; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,9 +24,9 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.util.CollectionBuilder; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -39,9 +39,9 @@ import org.jboss.portal.test.portlet.framework.UTP10; import org.jboss.portal.test.portlet.framework.UTP11; import org.jboss.portal.test.portlet.jsr168.ext.common.AbstractCacheSequenceBuilder; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.util.CollectionBuilder; import javax.portlet.Portlet; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -34,9 +34,9 @@ import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP3; import org.jboss.portal.test.portlet.framework.UTP4; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.common.util.CollectionBuilder; import javax.portlet.Portlet; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletconfig; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletmode; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,9 +23,9 @@ package org.jboss.portal.test.portlet.jsr168.ext.portletrequests; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletresponses; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.preferences; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.session; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.misc.log4j; import org.apache.log4j.Logger; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.dispatcher; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletconfig; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletcontext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.util.Tools; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; import org.jboss.portal.test.framework.driver.http.HttpTestContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import org.jboss.portal.test.framework.driver.http.HttpTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import org.jboss.portal.test.framework.driver.http.HttpTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import org.jboss.portal.test.framework.driver.http.HttpTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import org.jboss.portal.test.framework.driver.http.HttpTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import javax.portlet.PortletException; import javax.portlet.RenderRequest; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletmode; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -26,9 +26,9 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import javax.portlet.PortletException; import javax.portlet.RenderRequest; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletrequests; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletresponses; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletsession; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portleturl; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.preferences; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.windowstates; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.framework.server.driver; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.test.framework.driver.http.HttpTestCase; import org.jboss.portal.test.framework.driver.remote.TestContext; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/TestRequestController.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,10 +25,10 @@ import org.jboss.portal.server.RequestController; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerException; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer; import org.jboss.portal.test.framework.server.driver.AbstractTest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/GetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,11 +25,11 @@ import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import javax.servlet.http.HttpServletRequest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -29,8 +29,8 @@ import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -26,10 +26,10 @@ import org.jboss.portal.server.PortalConstants; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.test.framework.server.driver.AbstractTest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,8 +25,8 @@ import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -29,8 +29,8 @@ import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -26,10 +26,10 @@ import org.jboss.portal.server.PortalConstants; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.test.framework.server.driver.AbstractTest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,10 +25,10 @@ import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.server.driver.AbstractTest; import org.jboss.portal.test.server.Utils; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,12 +25,12 @@ import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; import org.jboss.portal.test.server.Utils; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,11 +25,11 @@ import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.http.HttpRequest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/response/EncodeResponseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/response/EncodeResponseTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/response/EncodeResponseTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -27,17 +27,16 @@ import org.jboss.portal.test.framework.driver.http.response.SendResponseResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.server.Utils; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.server.ServerInvocation; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.IOException; -import java.io.UnsupportedEncodingException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,11 +24,11 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.server.driver.AbstractTest; Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,12 +24,12 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.driver.AbstractTest; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.junit.ExtendedAssert; /** Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -26,9 +26,9 @@ import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.server.driver.AbstractTest; Modified: branches/JBoss_Portal_Branch_2_6/test/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/build.xml 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/build.xml 2007-08-16 14:51:00 UTC (rev 7954) @@ -301,6 +301,13 @@ <!-- ============================= --> +<!-- + <test todir="${test.reports}" name="org.jboss.portal.test.common.test.junit.POJOJunitTestTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.common.test.InfoTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParameterValueTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.common.test.TestParametrizationTestCase"/> +--> + <!-- Run jbossretro on the classes --> <target name="retro" depends="_default:most"> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/AbstractPortalTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -31,12 +31,11 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.common.test.TestParameterValue; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import java.net.URL; Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,65 +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; - -import org.jboss.mx.util.MBeanProxy; -import org.jboss.portal.test.framework.server.Node; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class JBossServiceLookup extends ServiceLookup -{ - - /** . */ - private String name; - - /** . */ - private String proxyClassName; - - public JBossServiceLookup(String name, String proxyClassName) - { - this.name = name; - this.proxyClassName = proxyClassName; - } - - public Object getService(Node node) throws ServiceLookupFailedException - { - try - { - Class proxyClass = Thread.currentThread().getContextClassLoader().loadClass(proxyClassName); - ObjectName name = new ObjectName(this.name); - MBeanServer server = node.getMBeanServer(); - return MBeanProxy.get(proxyClass, name, server); - } - catch (Exception e) - { - throw new ServiceLookupFailedException(e); - } - } -} Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,99 +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; - -import org.jboss.portal.test.framework.server.Node; - -import javax.naming.NamingException; -import javax.naming.Context; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class JNDIServiceLookup extends ServiceLookup -{ - - /** . */ - private String jndiName; - -// public String getJNDIName() -// { -// return jndiName; -// } -// -// public void setJNDIName(String jndiName) -// { -// this.jndiName = jndiName; -// } - - - public JNDIServiceLookup(String jndiName) - { - this.jndiName = jndiName; - } - - public Object getService(Node node) - { - Context ctx = null; - try - { - ctx = node.getNamingContext(); - return ctx.lookup(jndiName); - } - catch (NamingException e) - { - throw new ServiceLookupFailedException(e); - } - finally - { - if (ctx != null) - { - try - { - ctx.close(); - } - catch (NamingException ignore) - { - } - } - } - } - - public void create() - { - } - - public void start() - { - } - - public void stop() - { - } - - public void destroy() - { - } -} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,46 @@ +/****************************************************************************** + * 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; + +/** + * A mono value. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class MonoValuedTestParameterValue extends TestParameterValue +{ + + /** The value. */ + protected final Object value; + + public MonoValuedTestParameterValue(Object value) + { + this.value = value; + } + + public Object get() + { + return value; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,91 @@ +/****************************************************************************** + * 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; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; + +/** + * A multi value. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class MultiValuedTestParameterValue extends TestParameterValue +{ + + /** . */ + protected final Collection value; + + public MultiValuedTestParameterValue(Object[] value) throws IllegalArgumentException + { + if (value == null) + { + throw new IllegalArgumentException(); + } + + // + this.value = Arrays.asList(value); + } + + public MultiValuedTestParameterValue(Collection value) throws IllegalArgumentException + { + if (value == null) + { + throw new IllegalArgumentException(); + } + + // + this.value = value; + } + + public Object get() + { + return value; + } + + /** Return an iterator over the values. */ + public Iterator iterator() + { + return new Iterator() + { + Iterator i = value.iterator(); + + public boolean hasNext() + { + return i.hasNext(); + } + + public Object next() + { + return new MonoValuedTestParameterValue(i.next()); + } + + public void remove() + { + throw new UnsupportedOperationException(); + } + }; + } +} Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,42 +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; - -import org.jboss.portal.test.framework.server.Node; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public abstract class ServiceLookup -{ - /** - * Perform a service lookup for a given node. - * - * @param node the target node - * @return the service proxy - * @throws ServiceLookupFailedException if the lookup fails - */ - public abstract Object getService(Node node) throws ServiceLookupFailedException; -} Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookupFailedException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookupFailedException.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookupFailedException.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,49 +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; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class ServiceLookupFailedException extends RuntimeException -{ - public ServiceLookupFailedException() - { - } - - public ServiceLookupFailedException(String message) - { - super(message); - } - - public ServiceLookupFailedException(String message, Throwable cause) - { - super(message, cause); - } - - public ServiceLookupFailedException(Throwable cause) - { - super(cause); - } -} Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,62 +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; - -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class TestBeanFactory -{ - - private Map beans; - - public TestBeanFactory(Map beans) - { - this.beans = beans; - } - - public Object getBean(String id) - { - return beans.get(id); - } - - public void create() - { - } - - public void start() - { - } - - public void stop() - { - } - - public void destroy() - { - } -} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,63 @@ +/****************************************************************************** + * 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; + +import java.io.Serializable; + +/** + * The value of a test parameter. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public abstract class TestParameterValue implements Serializable +{ + /** + * Return the actual value. + * + * @return + */ + public abstract Object get(); + + public int hashCode() + { + Object o = get(); + return o == null ? 0 : o.hashCode(); + } + + public boolean equals(Object obj) + { + if (obj == this) + { + return true; + } + if (obj instanceof TestParameterValue) + { + TestParameterValue that = (TestParameterValue)obj; + Object thisO = get(); + Object thatO = that.get(); + return thisO == null ? thatO == null : thisO.equals(thatO); + } + return false; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParametrization.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParametrization.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestParametrization.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,195 @@ +/****************************************************************************** + * 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; + +import org.jboss.portal.test.framework.info.TestInfo; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +/** + * The parametrization of a test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7230 $ + */ +public class TestParametrization implements Serializable +{ + + /** . */ + private Map parameterValues; + + public TestParametrization() + { + parameterValues = new HashMap(); + } + + public TestParametrization(Map parameterValues) throws IllegalArgumentException + { + this(); + + // + if (parameterValues == null) + { + throw new IllegalArgumentException(); + } + + // + for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String parameterName = (String)entry.getKey(); + TestParameterValue parameterValue = (TestParameterValue)entry.getValue(); + setParameterValue(parameterName, parameterValue); + } + } + + /** + * Set a parameter value, using a null value will remove the parameter. + * + * @param parameterName the parameter name + * @param parameterValue the parameter value + * @throws IllegalArgumentException if the parameter name is null + */ + public void setParameterValue(String parameterName, TestParameterValue parameterValue) throws IllegalArgumentException + { + if (parameterName == null) + { + throw new IllegalArgumentException(); + } + if (parameterValue == null) + { + parameterValues.remove(parameterName); + } + else + { + parameterValues.put(parameterName, parameterValue); + } + } + + /** + * Return a parameter value. + * + * @param parameterName the parameter name + * @return the parameter value or null if it does not exist + * @throws IllegalArgumentException if the parameter name is null + */ + public TestParameterValue getParameterValue(String parameterName) throws IllegalArgumentException + { + if (parameterName == null) + { + throw new IllegalArgumentException(); + } + return (TestParameterValue)parameterValues.get(parameterName); + } + + public boolean isEmpty() + { + return parameterValues.isEmpty(); + } + + public String toString() + { + StringBuffer tmp = new StringBuffer(); + for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String parameterName = (String)entry.getKey(); + TestParameterValue value = (TestParameterValue)entry.getValue(); + tmp.append(parameterName).append('=').append(value.get()).append(i.hasNext() ? "," : ""); + } + return tmp.toString(); + } + + /** + * Build a collection of parametrization that satisfies the parameters exposed by the test meta information and the + * parameter provided by the map. + */ + public Collection create(TestInfo info) + { + ArrayList c = new ArrayList(); + c.add(new HashMap()); + + Set expectedParameters = new HashSet(info.getParameterNames()); + + // + for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String parameterName = (String)entry.getKey(); + TestParameterValue value = (TestParameterValue)entry.getValue(); + + // + if (expectedParameters.contains(parameterName)) + { + expectedParameters.remove(parameterName); + + // + if (value instanceof MultiValuedTestParameterValue) + { + MultiValuedTestParameterValue multiValue = (MultiValuedTestParameterValue)value; + ArrayList tmp = new ArrayList(); + for (Iterator j = multiValue.iterator(); j.hasNext();) + { + TestParameterValue o = (TestParameterValue)j.next(); + ArrayList copy = new ArrayList(c.size()); + for (Iterator k = c.iterator(); k.hasNext();) + { + Map parametrization = (Map)k.next(); + parametrization = new HashMap(parametrization); + parametrization.put(parameterName, o); + copy.add(parametrization); + } + tmp.addAll(copy); + } + c = tmp; + } + else + { + for (int j = 0; j < c.size(); j++) + { + Map parametrization = (Map)c.get(j); + parametrization.put(parameterName, value); + } + } + } + } + + // + for (int i = 0; i < c.size(); i++) + { + Map parametrization = (Map)c.get(i); + TestParametrization ctx = new TestParametrization(parametrization); + c.set(i, ctx); + } + + // + return c; + } +} Deleted: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -1,165 +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; - -import org.apache.log4j.Logger; -import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; -import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; -import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; -import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; -import org.jboss.kernel.spi.deployment.KernelDeployment; - -import java.net.URL; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -/** - * The test context offered to the test. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class TestRuntimeContext -{ - - /** . */ - private Logger log; - - /** . */ - private BasicBootstrap bootstrap; - - /** . */ - BeanXMLDeployer beanDeployer; - - /** . */ - private URL beansURL; - - /** The beans that will be defined by a factory in the container. */ - private Map beans; - - /** - * - */ - private boolean started; - - /** - * - */ - private KernelDeployment deployment; - - /** - * Constructs a new TestRuntimeContext. - * - * @param beansDD the location of the microcontainer beans descriptor for the beans to be wired for this test - * @throws IllegalArgumentException if <var>beansDD</var> is null or not valid - */ - public TestRuntimeContext(String beansDD) throws IllegalArgumentException - { - if (beansDD == null) - { - throw new IllegalArgumentException("No beans descriptor provided"); - } - this.log = Logger.getLogger(getClass()); - this.beansURL = Thread.currentThread().getContextClassLoader().getResource(beansDD); - this.beans = new HashMap(); - if (beansURL == null) - { - throw new IllegalArgumentException("Bean url is not valid " + beansDD); - } - } - - public void addBean(String id, Object bean) throws IllegalStateException, IllegalArgumentException - { - if (id == null) - { - throw new IllegalArgumentException("The bean id is null"); - } - if (bean == null) - { - throw new IllegalArgumentException("The bean is null"); - } - if (started) - { - throw new IllegalStateException("Runtime context already active"); - } - if (beans.containsKey(id)) - { - throw new IllegalArgumentException("The bean " + id + " is already here"); - } - beans.put(id, bean); - } - - public void start() throws Exception - { - try - { - bootstrap = new BasicBootstrap(); - - // - bootstrap.run(); - - // - AbstractBeanMetaData testBeanFactoryMD = new AbstractBeanMetaData("BeanFactory", TestBeanFactory.class.getName()); - AbstractConstructorMetaData testBeanCtorFactoryMD = new AbstractConstructorMetaData(); - testBeanCtorFactoryMD.setParameters(Collections.singletonList(new AbstractParameterMetaData(Map.class.getName(), beans))); - testBeanFactoryMD.setConstructor(testBeanCtorFactoryMD); - bootstrap.getKernel().getController().install(testBeanFactoryMD); - - // - beanDeployer = new BeanXMLDeployer(bootstrap.getKernel()); - - // - deployment = beanDeployer.deploy(beansURL); - - // - beanDeployer.validate(deployment); - - // - started = true; - } - catch (Throwable throwable) - { -// log.error("Got a throwable", throwable); - if (throwable instanceof Error) - { - throw(Error)throwable; - } - if (throwable instanceof Exception) - { - throw(Exception)throwable; - } - throw new Error(throwable); - } - } - - public void stop() - { - if (deployment != null) - { - beanDeployer.undeploy(deployment); - } - } -} Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ package org.jboss.portal.test.framework.deployment; import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.test.framework.ServiceLookup; +import org.jboss.portal.test.framework.lookup.ServiceLookup; import java.net.MalformedURLException; import java.net.URL; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -28,7 +28,7 @@ import org.jboss.deployment.DeploymentException; import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.test.framework.ServiceLookup; +import org.jboss.portal.test.framework.lookup.ServiceLookup; import java.io.IOException; import java.net.URL; Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverCommand.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverCommand.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.driver; + +import java.io.Serializable; + +/** + * The command in the test protocol. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class DriverCommand implements Serializable +{ +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverResponse.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/DriverResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.driver; + +import java.io.Serializable; + +/** + * The response in the test protocol. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public abstract class DriverResponse implements Serializable +{ +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/ParameterNotBoundException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/ParameterNotBoundException.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/ParameterNotBoundException.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.driver; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class ParameterNotBoundException extends TestDriverException +{ + public ParameterNotBoundException(String parameterName) + { + super("Parameter " + parameterName + " not bound"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriver.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriver.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,40 @@ +/****************************************************************************** + * 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.driver; + +import org.jboss.portal.test.framework.info.TestItemInfo; + +/** + * The contract that defines what a testable system is and its usage. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public interface TestDriver +{ + /** Returns the meta information exposed by the driver. */ + TestItemInfo getInfo(); + + /** Execute a command of the testing protocol. */ + DriverResponse invoke(String testId, DriverCommand command) throws TestDriverException; +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverContainer.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverContainer.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,57 @@ +/****************************************************************************** + * 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.driver; + +/** + * Provides an interface for a test driver container. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public interface TestDriverContainer extends TestDriver +{ + /** + * Add a driver. + * + * @param driver + * @throws IllegalArgumentException if the driver is null or already registered + */ + void addDriver(TestDriver driver) throws IllegalArgumentException; + + /** + * Remove a driver. + * + * @param driver + * @throws IllegalArgumentException if the driver is null or does not exist + */ + void removeDriver(TestDriver driver) throws IllegalArgumentException; + + /** + * Return a driver that is able to understand the specified id. + * + * @param testId + * @return + * @throws IllegalArgumentException + */ + TestDriver getDriver(String testId) throws IllegalArgumentException; +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverException.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestDriverException.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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.driver; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class TestDriverException extends Exception +{ + public TestDriverException() + { + } + + public TestDriverException(String message) + { + super(message); + } + + public TestDriverException(String message, Throwable cause) + { + super(message, cause); + } + + public TestDriverException(Throwable cause) + { + super(cause); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestSuite.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestSuite.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/TestSuite.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,143 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.driver; + +import org.jboss.portal.test.framework.info.TestContainerInfo; +import org.jboss.portal.test.framework.info.TestItemInfo; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * A test suite is a test driver container that expose itself as a test driver. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class TestSuite implements TestDriverContainer +{ + + /** . */ + protected final Map entries; + + /** . */ + protected final TestContainerInfo info; + + public TestSuite(String id) + { + entries = new LinkedHashMap(); + info = new TestContainerInfo(id); + } + + public TestDriver getDriver(String testId) + { + TestItemInfo itemInfo = info.findItem(testId); + if (itemInfo == null) + { + return null; + } + + // Find original parent + TestItemInfo currentInfo = itemInfo; + while (true) + { + TestContainerInfo parentInfo = currentInfo.getParent(); + if (parentInfo == null) + { + // + return null; + } + else if (parentInfo == info) + { + break; + } + else + { + currentInfo = parentInfo; + } + } + + // + return (TestDriver)entries.get(currentInfo.getName()); + } + + public void addDriver(TestDriver test) throws IllegalArgumentException + { + if (test == null) + { + throw new IllegalArgumentException("Cannot add null test"); + } + TestItemInfo itemInfo = test.getInfo(); + String entryKey = itemInfo.getName(); + if (entries.containsKey(entryKey)) + { + throw new IllegalArgumentException("Cannot have two tests with the same id " + entryKey); + } + + // + info.addChild(itemInfo); + entries.put(entryKey, test); + } + + public void removeDriver(TestDriver test) throws IllegalArgumentException + { + if (test == null) + { + throw new IllegalArgumentException("Cannot add null test"); + } + String entryKey = test.getInfo().getName(); + if (!entries.containsKey(entryKey)) + { + throw new IllegalArgumentException("Cannot remove test that was not added previously " + entryKey); + } + + // + entries.remove(entryKey); + info.removeChild(entryKey); + } + + // TestDriver implementation **************************************************************************************** + + public TestItemInfo getInfo() + { + return info; + } + + public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException + { + TestItemInfo item = info.findItem(testId); + if (item == null) + { + throw new TestDriverException("Driver not found for " + testId); + } + + // Get associated test driver + TestDriver driver = getDriver(testId); + + // Get new relative id + String newTestId = item.getId(driver.getInfo()); + + // Route the command to the target driver + return driver.invoke(newTestId, cmd); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/command/StartTestCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/command/StartTestCommand.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/command/StartTestCommand.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,67 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.driver.command; + +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.TestParametrization; + +/** + * Start the test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7373 $ + */ +public class StartTestCommand extends DriverCommand +{ + + /** . */ + private TestParametrization parametrization; + + /** + * @param parametrization the test parametrization + * @throws IllegalArgumentException if the test name or the parametrization is null + */ + public StartTestCommand(TestParametrization parametrization) throws IllegalArgumentException + { + if (parametrization == null) + { + throw new IllegalArgumentException(); + } + this.parametrization = parametrization; + } + + public StartTestCommand() throws IllegalArgumentException + { + this(new TestParametrization()); + } + + /** + * Return the test parametrization. + * + * @return the test parametrization + */ + public TestParametrization getParametrization() + { + return parametrization; + } +} Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -51,12 +51,12 @@ import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.TestParametrization; import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.common.http.HttpHeaders; import org.jboss.portal.common.http.HttpHeader; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.http; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.command.StartTestCommand; -import org.jboss.portal.common.test.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.driver.remote.RemoteTestCase; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,18 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.http; -import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.deployment.DeploymentException; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.TestParametrization; -import java.io.Serializable; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - /** * The test context seen from the server side. * @todo make a client side context and a server side context, basically (server side context == client side context + services) Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.http.command; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.http.command; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.http.response; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,7 +23,7 @@ package org.jboss.portal.test.framework.driver.http.response; import org.apache.commons.httpclient.HttpMethod; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; /** Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.info.TestInfo; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.driver.TestDriverContainer; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.driver.TestDriverContainer; /** * Defines an http test case working from the server side point of view. Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriver.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriver.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.driver.TestDriver; +import org.jboss.portal.test.framework.driver.TestDriver; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverClient.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverClient.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverClient.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,12 +25,12 @@ import org.jboss.portal.test.framework.server.NodeId; import org.jboss.portal.test.framework.server.NodeManager; import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.test.framework.ServiceLookup; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.TestDriver; +import org.jboss.portal.test.framework.lookup.ServiceLookup; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.TestDriver; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestDriverServer.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.TestDriver; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverContainer; -import org.jboss.portal.common.test.info.TestItemInfo; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.TestDriver; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverContainer; +import org.jboss.portal.test.framework.info.TestItemInfo; import org.jboss.portal.test.framework.driver.AbstractTestDriverServer; /** Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestSuite.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestSuite.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/RemoteTestSuite.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.driver.TestSuite; -import org.jboss.portal.common.test.info.TestItemInfo; +import org.jboss.portal.test.framework.driver.TestSuite; +import org.jboss.portal.test.framework.info.TestItemInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.TestParametrization; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.agent.TestAgent; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.TestParametrization; import org.jboss.deployment.DeploymentException; import java.io.Serializable; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestConversation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestConversation.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/TestConversation.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/command/RemoteDriverCommandContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/command/RemoteDriverCommandContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/command/RemoteDriverCommandContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote.command; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; /** Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/response/RemoteDriverResponseContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/response/RemoteDriverResponseContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/remote/response/RemoteDriverResponseContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.remote.response; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/EndTestResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/EndTestResponse.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/EndTestResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -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.test.framework.driver.response; + +import org.jboss.portal.test.framework.driver.DriverResponse; + +/** + * Terminate the test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class EndTestResponse extends DriverResponse +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = 5213703287701969049L; + + public String toString() + { + return "EndTest[]"; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/ErrorResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/ErrorResponse.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/ErrorResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,71 @@ +/****************************************************************************** + * 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.driver.response; + +import junit.framework.AssertionFailedError; +import org.jboss.portal.test.framework.driver.DriverResponse; + +/** + * An error occured during the execution of the test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class ErrorResponse extends DriverResponse +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = -7343495299222478388L; + + /** . */ + private Throwable throwable; + + public ErrorResponse() + { + this(new Exception()); + } + + public ErrorResponse(String msg) + { + this(new AssertionFailedError(msg)); + } + + public ErrorResponse(Throwable throwable) + { + if (throwable == null) + { + throw new IllegalArgumentException(); + } + this.throwable = throwable; + } + + public Throwable getThrowable() + { + return throwable; + } + + public String toString() + { + return throwable != null ? "Error[throwable=" + throwable + "]" : "Error[]"; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/FailureResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/FailureResponse.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/response/FailureResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,71 @@ +/****************************************************************************** + * 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.driver.response; + +import junit.framework.AssertionFailedError; +import org.jboss.portal.test.framework.driver.DriverResponse; + +/** + * A failure occured during the execution of the test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class FailureResponse extends DriverResponse +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = -7343495299222478388L; + + /** . */ + private Throwable throwable; + + public FailureResponse() + { + this(new AssertionFailedError()); + } + + public FailureResponse(String msg) + { + this(new AssertionFailedError(msg)); + } + + public FailureResponse(Throwable throwable) + { + if (throwable == null) + { + throw new IllegalArgumentException(); + } + this.throwable = throwable; + } + + public Throwable getThrowable() + { + return throwable; + } + + public String toString() + { + return throwable != null ? "Failure[throwable=" + throwable + "]" : "ErrorResponse[]"; + } +} Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestCase.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,11 +25,11 @@ import org.jboss.portal.test.framework.driver.remote.RemoteTestCase; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.driver.web.response.GetPageResponse; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.response.ErrorResponse; -import org.jboss.portal.common.test.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; /** * Defines an http test case working from the server side point of view. Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -36,10 +36,10 @@ import org.jboss.portal.test.framework.driver.web.command.GetPageCommand; import org.jboss.portal.test.framework.driver.web.command.DnDCommand; import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; import org.apache.log4j.Logger; import com.thoughtworks.selenium.Selenium; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverClient.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverClient.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverClient.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,9 +25,6 @@ import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverClient; import org.jboss.portal.test.framework.driver.remote.TestConversation; import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; import com.thoughtworks.selenium.Selenium; import com.thoughtworks.selenium.DefaultSelenium; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/PerformClickCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/PerformClickCommand.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/PerformClickCommand.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.web.command; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommand.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommand.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.web.command; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommandContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommandContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/command/WebDriverCommandContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,7 +24,7 @@ import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; -import org.jboss.portal.common.test.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverCommand; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/PerformClickResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/PerformClickResponse.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/PerformClickResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.web.response; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponse.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponse.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.framework.driver.web.response; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponseContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponseContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/driver/web/response/WebDriverResponseContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,7 +23,7 @@ package org.jboss.portal.test.framework.driver.web.response; import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,8 +24,8 @@ package org.jboss.portal.test.framework.embedded; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.test.MultiValuedTestParameterValue; import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.test.framework.MultiValuedTestParameterValue; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,8 +24,8 @@ package org.jboss.portal.test.framework.embedded; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.test.MultiValuedTestParameterValue; import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.test.framework.MultiValuedTestParameterValue; import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource; import org.jboss.resource.connectionmanager.CachedConnectionManagerReference; import org.w3c.dom.Document; Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestContainerInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestContainerInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestContainerInfo.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,215 @@ +/****************************************************************************** + * 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.info; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +/** + * Container for items. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class TestContainerInfo extends TestItemInfo +{ + + /** The map of children. */ + private final Map children; + + /** + * Create a named container. + * + * @param name the container name + * @throws IllegalArgumentException if the name is null + */ + public TestContainerInfo(String name) throws IllegalArgumentException + { + this(name, null); + } + + /** + * Create a named container. + * + * @param name the container name + * @param description the container description + * @throws IllegalArgumentException if the name is null + */ + public TestContainerInfo(String name, String description) throws IllegalArgumentException + { + super(name, description); + this.children = new HashMap(); + } + + /** + * Copy constructor which performs a deep copy of the structure. + * + * @param that the structure to deep copy + * @throws IllegalArgumentException if the container to copy is null + */ + public TestContainerInfo(TestContainerInfo that) throws IllegalArgumentException + { + super(that); + this.children = new HashMap(that.children.size()); + for (Iterator i = that.children.values().iterator(); i.hasNext();) + { + TestItemInfo child = (TestItemInfo)i.next(); + TestItemInfo childClone = child.createClone(); + addChild(childClone); + } + } + + public TestItemInfo createClone() + { + return new TestContainerInfo(this); + } + + protected void internalVisit(Visitor visitor) + { + visitor.enter(this); + + // + for (Iterator i = children.values().iterator(); i.hasNext();) + { + TestItemInfo child = (TestItemInfo)i.next(); + child.internalVisit(visitor); + } + + // + visitor.leave(this); + } + + /** + * Add a child to this container + * + * @param child the child to add + * @throws IllegalArgumentException if the child is null or already in the container + */ + public void addChild(TestItemInfo child) throws IllegalArgumentException + { + if (child == null) + { + throw new IllegalArgumentException("No null child accepted"); + } + if (children.containsKey(child.getName())) + { + throw new IllegalArgumentException("Duplicate child " + child.getName()); + } + if (child.parent != null) + { + throw new IllegalArgumentException("Child is already attached"); + } + + // Perform attachment + children.put(child.getName(), child); + child.parent = this; + } + + /** + * Remove a child from this container. + * + * @param childName the name of the child to remove + * @throws IllegalArgumentException if the child name is null or the child does not exist + */ + public void removeChild(String childName) throws IllegalArgumentException + { + if (childName == null) + { + throw new IllegalArgumentException("No null child name accepted"); + } + TestItemInfo child = (TestItemInfo)children.remove(childName); + if (child == null) + { + throw new IllegalArgumentException("No such child " + childName); + } + child.parent = null; + } + + /** + * Retrieve a specified child + * + * @param childName the child name to retrieve + * @return the child or null if it cant be found + * @throws IllegalArgumentException if the child name is null + */ + public TestItemInfo getChild(String childName) throws IllegalArgumentException + { + if (childName == null) + { + throw new IllegalArgumentException("No null child name"); + } + return (TestItemInfo)children.get(childName); + } + + /** + * Return the set of child names. + * + * @return the child names + */ + public Set getChildNames() + { + return children.keySet(); + } + + public TestItemInfo findItem(String itemId) + { + if (itemId == null) + { + throw new IllegalArgumentException("No null item name"); + } + if (itemId.length() == 0) + { + return this; + } + int index = itemId.indexOf('/'); + String name = index != -1 ? itemId.substring(0, index) : itemId; + String next = index != -1 ? itemId.substring(index + 1) : ""; + for (Iterator i = children.values().iterator(); i.hasNext();) + { + TestItemInfo child = (TestItemInfo)i.next(); + if (name.equals(child.getName())) + { + return child.findItem(next); + } + } + return null; + } + + public String toString() + { + StringBuffer buffer = new StringBuffer("TestContainerInfo[" + getName()).append(","); + for (Iterator i = children.values().iterator(); i.hasNext();) + { + TestItemInfo child = (TestItemInfo)i.next(); + buffer.append(child); + if (i.hasNext()) + { + buffer.append(','); + } + } + buffer.append("]"); + return buffer.toString(); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestInfo.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,145 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.framework.info; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Meta information that describe a test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class TestInfo extends TestItemInfo +{ + + /** The parameters that the test requires. */ + private final Map parameters; + + /** + * Copy constructor. + * + * @param that the structure to copy + * @throws IllegalArgumentException if the test to copy is null + */ + public TestInfo(TestInfo that) throws IllegalArgumentException + { + super(that); + this.parameters = new HashMap(that.parameters); + } + + /** + * Create a named test. + * + * @param name the test name + * @throws IllegalArgumentException if the name is null + */ + public TestInfo(String name) throws IllegalArgumentException + { + this(name, null); + } + + /** + * Create a named test. + * + * @param name the test name + * @param description the test description + * @throws IllegalArgumentException if the name is null + */ + public TestInfo(String name, String description) throws IllegalArgumentException + { + super(name, description); + this.parameters = new HashMap(); + } + + public TestItemInfo createClone() + { + return new TestInfo(this); + } + + /** + * Add a test required to execute the test. + * + * @param parameter the parameter to add + * @throws IllegalArgumentException if the parameter is null or already exising + */ + public void addParameter(TestParameterInfo parameter) throws IllegalArgumentException + { + if (parameter == null) + { + throw new IllegalArgumentException("No null accepted"); + } + if (parameters.containsKey(parameter.getName())) + { + throw new IllegalArgumentException("Duplicate parameter " + parameter.getName()); + } + parameters.put(parameter.getName(), parameter); + } + + /** + * Return the set of parameter names. + * + * @return the parameter names + */ + public Set getParameterNames() + { + return parameters.keySet(); + } + + /** + * Return a specified parameter. + * + * @param parameterName the parameter name to retrieve + * @return the parameter or null if it does not exist + * @throws IllegalArgumentException if the parameter name is null + */ + public TestParameterInfo getParameter(String parameterName) throws IllegalArgumentException + { + if (parameterName == null) + { + throw new IllegalArgumentException("No null parameter name"); + } + return (TestParameterInfo)parameters.get(parameterName); + } + + public TestItemInfo findItem(String itemId) + { + if (itemId == null) + { + throw new IllegalArgumentException("No null item id"); + } + return itemId.length() == 0 ? this : null; + } + + protected void internalVisit(Visitor visitor) + { + visitor.visit(this); + } + + public String toString() + { + return "TestInfo[" + getName() + "]"; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestItemInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestItemInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestItemInfo.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,250 @@ +/****************************************************************************** + * 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.info; + +import java.io.Serializable; + +/** + * A test item info is the abstraction over a test info and a test container info as both of them contains similarities. + * It is a data structure which describes a collection of tests. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public abstract class TestItemInfo implements Serializable +{ + + /** The test name. */ + protected final String name; + + /** The optional test description. */ + protected final String description; + + /** The optional parent. */ + protected TestContainerInfo parent; + + /** + * Clone constructor. + * + * @param that the item to clone + * @throws IllegalArgumentException if the argument is null + */ + protected TestItemInfo(TestItemInfo that) throws IllegalArgumentException + { + if (that == null) + { + throw new IllegalArgumentException("No null item accepted"); + } + this.name = that.name; + this.description = that.description; + } + + /** + * Create an item with the specified name. + * + * @param name the test name + * @throws IllegalArgumentException if the name is null + */ + protected TestItemInfo(String name) throws IllegalArgumentException + { + this(name, null); + } + + /** + * Create an item with the specified name. + * + * @param name the test name + * @param description the test description + * @throws IllegalArgumentException if the name is null + */ + protected TestItemInfo(String name, String description) throws IllegalArgumentException + { + if (name == null) + { + throw new IllegalArgumentException("No null item name accepted"); + } + this.name = name; + this.description = description; + } + + /** + * Return the item name. + * + * @return the item name. + */ + public String getName() + { + return name; + } + + /** + * Return the item description. + * + * @return the item description + */ + public String getDescription() + { + return description; + } + + /** + * Return the parent or null if it does not exist. + * + * @return the parent + */ + public TestContainerInfo getParent() + { + return parent; + } + + /** + * Return the id relative to a parent context. + * + * @return the id relative + */ + public String getId(TestItemInfo context) + { + if (context != null) + { + StringBuffer buffer = internalGetId(context); + return buffer.toString(); + } + else + { + StringBuffer buffer = internalGetId(); + return buffer.toString(); + } + } + + protected StringBuffer internalGetId(TestItemInfo context) + { + if (this == context) + { + return new StringBuffer(""); + } + else if (parent == null) + { + throw new IllegalArgumentException("Context is not an ancestor of the item"); + } + else if (parent == context) + { + return new StringBuffer(name); + } + else + { + StringBuffer buffer = parent.internalGetId(context); + return buffer.append('/').append(name); + } + } + + protected StringBuffer internalGetId() + { + if (parent == null) + { + return new StringBuffer("/"); + } + else + { + StringBuffer buffer = parent.internalGetId(); + if (buffer.length() > 1) + { + return buffer.append('/').append(name); + } + else + { + return buffer.append(name); + } + } + } + + /** + * Find an item within the scope of the current item. + * + * @param itemId the item id to find + * @return the item or null if not found + * @throws IllegalArgumentException if the id is null + */ + public abstract TestItemInfo findItem(String itemId) throws IllegalArgumentException; + + /** + * Create a deep clone of the current item in a detyped manner. + * + * @return a deep clone of the current item + */ + public abstract TestItemInfo createClone(); + + protected abstract void internalVisit(Visitor visitor); + + /** + * Visit the structure following the GOF visitor pattern. + * + * @param visitor + * @throws IllegalArgumentException if the visitor is null + */ + public void visit(Visitor visitor) throws IllegalArgumentException + { + if (visitor == null) + { + throw new IllegalArgumentException(); + } + internalVisit(visitor); + } + + /** Visitor interface for the item structure. */ + public interface Visitor + { + /** Enter a container. */ + void enter(TestContainerInfo testContainerInfo); + + /** Leave a container. */ + void leave(TestContainerInfo testContainerInfo); + + /** Visit a test. */ + void visit(TestInfo testInfo); + } + + /** Boiler plate visitor. */ + public static class AbstractVisitor implements Visitor + { + /** + * + */ + public void enter(TestContainerInfo testContainerInfo) + { + } + + /** + * + */ + public void leave(TestContainerInfo testContainerInfo) + { + } + + /** + * + */ + public void visit(TestInfo testInfo) + { + } + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestParameterInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestParameterInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/info/TestParameterInfo.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,89 @@ +/****************************************************************************** + * 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.info; + +import java.io.Serializable; + +/** + * Meta information of a test parameter. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class TestParameterInfo implements Serializable +{ + + /** The parameter name. */ + private final String name; + + /** The optional parameter description. */ + private final String description; + + /** + * Create a test parameter with the specified name. + * + * @param name the parameter name + * @throws IllegalArgumentException if the name is null + */ + public TestParameterInfo(String name) throws IllegalArgumentException + { + this(name, null); + } + + /** + * Create a test parameter with the specified name. + * + * @param name the parameter name + * @param description the parameter description + * @throws IllegalArgumentException if the name is null + */ + public TestParameterInfo(String name, String description) throws IllegalArgumentException + { + if (name == null) + { + throw new IllegalArgumentException(); + } + this.name = name; + this.description = description; + } + + /** + * Return the parameter name. + * + * @return the parameter name + */ + public String getName() + { + return name; + } + + /** + * Return the parameter description. + * + * @return the parameter description + */ + public String getDescription() + { + return description; + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,174 @@ +/****************************************************************************** + * 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.junit; + +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; +import junit.framework.TestResult; +import org.jboss.portal.common.junit.ant.TestParameter; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.TestDriver; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.TestParametrization; +import org.jboss.portal.test.framework.MonoValuedTestParameterValue; +import org.jboss.portal.test.framework.MultiValuedTestParameterValue; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * An runner that adapts the <code>junit.framework.Test</code> interface to the <code>TestDriver</code> protocol. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class JUnitAdapter implements junit.framework.Test +{ + + /** . */ + private TestDriver driver; + + /** . */ + private TestParametrization parametrization; + + public JUnitAdapter(TestDriver test, Map parameterMap) throws Exception + { + this.driver = test; + this.parametrization = new TestParametrization(parameterMap); + } + + public JUnitAdapter(TestDriver test, TestParametrization parametrization) throws Exception + { + this.driver = test; + this.parametrization = parametrization; + } + + public JUnitAdapter(TestDriver test) throws Exception + { + this(test, new TestParametrization()); + } + + public int countTestCases() + { + return 1; + } + + public void run(TestResult result) + { + try + { + TestItemInfo info = driver.getInfo(); + run(info, result); + } + catch (final Exception e) + { + TestCase tc = new TestCase() + { + public void runBare() throws Throwable + { + throw e; + } + }; + tc.run(result); + } + } + + private void run(final TestItemInfo info, final TestResult result) + { + TestItemInfo.Visitor visitor = new TestItemInfo.AbstractVisitor() + { + public void visit(final TestInfo testInfo) + { + Collection contexts = parametrization.create(testInfo); + for (Iterator i = contexts.iterator(); i.hasNext();) + { + final TestParametrization parametrization = (TestParametrization)i.next(); + String name = parametrization.isEmpty() ? testInfo.getName() : testInfo.getName() + "_" + parametrization; + TestCase tc = new TestCase(name) + { + public void runBare() throws Throwable + { + String testId = testInfo.getId(info); + StartTestCommand st = new StartTestCommand(parametrization); + DriverResponse resp = driver.invoke(testId, st); + if (resp instanceof FailureResponse) + { + FailureResponse fr = (FailureResponse)resp; + AssertionFailedError afe = new AssertionFailedError(); + afe.initCause(fr.getThrowable()); + throw afe; + } + else if (resp instanceof ErrorResponse) + { + ErrorResponse er = (ErrorResponse)resp; + throw er.getThrowable(); + } + } + }; + tc.run(result); + } + } + }; + info.visit(visitor); + } + + public static TestParametrization getParametrization() + { + Map parameterMap = TestParameter.readExternalParameters(); + if (parameterMap == null) + { + parameterMap = Collections.EMPTY_MAP; + } + else + { + Map tmp = new HashMap(); + for (Iterator i = parameterMap.entrySet().iterator(); i.hasNext();) + { + Map.Entry entry = (Map.Entry)i.next(); + String parameterName = (String)entry.getKey(); + String[] parameterValue = (String[])entry.getValue(); + if (parameterValue.length == 0) + { + // Should not be possible + } + else if (parameterValue.length == 1) + { + tmp.put(parameterName, new MonoValuedTestParameterValue(parameterValue[0])); + } + else + { + tmp.put(parameterName, new MultiValuedTestParameterValue(parameterValue)); + } + } + parameterMap = tmp; + } + return new TestParametrization(parameterMap); + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/JUnitAdapter.java ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/POJOJUnitTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/POJOJUnitTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/POJOJUnitTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,307 @@ +/****************************************************************************** + * 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.junit; + +import junit.framework.AssertionFailedError; +import junit.framework.TestSuite; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.ParameterNotBoundException; +import org.jboss.portal.test.framework.driver.TestDriver; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.info.TestContainerInfo; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.info.TestParameterInfo; +import org.jboss.portal.test.framework.TestParametrization; +import org.jboss.portal.test.framework.TestParameterValue; +import org.jboss.portal.common.reflect.Reflection; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * Test an object based on junit infrastructure + some conventions. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7373 $ + */ +public class POJOJUnitTest implements TestDriver +{ + + /** . */ + private Class testClass; + + /** . */ + private TestContainerInfo containerInfo; + + /** . */ + private Map testMap; + + /** . */ + private Map setterMap; + + /** . */ + private Object test; + + public POJOJUnitTest(Object test) + { + if (test == null) + { + throw new IllegalArgumentException(); + } + this.test = test; + this.testClass = test.getClass(); + this.setterMap = new HashMap(); + this.testMap = new HashMap(); + + // + buildInfo(); + } + + public POJOJUnitTest(Class testClass) + { + if (testClass == null) + { + throw new IllegalArgumentException(); + } + this.test = null; + this.testClass = testClass; + this.setterMap = new HashMap(); + this.testMap = new HashMap(); + + // + buildInfo(); + } + + public TestItemInfo getInfo() + { + return containerInfo; + } + + public DriverResponse invoke(String testId, DriverCommand command) throws TestDriverException + { + StartTestCommand start = (StartTestCommand)command; + + // + Object test = null; + + // + try + { + // Reuse instance already provided if it exists otherwise instantiate it from class + test = this.test; + if (test == null) + { + test = testClass.newInstance(); + } + + // Get corresponding test info + TestInfo testInfo = (TestInfo)containerInfo.findItem(testId); + + // Contextualize + TestParametrization parametrization = start.getParametrization(); + for (Iterator i = testInfo.getParameterNames().iterator(); i.hasNext();) + { + String parameterName = (String)i.next(); + TestParameterValue value = parametrization.getParameterValue(parameterName); + if (value == null) + { + throw new ParameterNotBoundException(parameterName); + } + + // Bind parameter + Method setter = (Method)setterMap.get(parameterName); + if (setter != null) + { + setter.invoke(test, new Object[]{value.get()}); + } + } + + // Invoke setUp() if it exists + Method setUp = Reflection.findMethod(testClass, "setUp", new Class[0]); + if (setUp != null && (setUp.getModifiers() & (Modifier.PRIVATE | Modifier.STATIC | Modifier.ABSTRACT)) == 0) + { + invokeNoArg(test, setUp, true); + } + + // Invoke test joinpoint + Method method = (Method)testMap.get(testId); + method.invoke(test, new Object[0]); + return new EndTestResponse(); + } + catch (InstantiationException e) + { + return new ErrorResponse(e); + } + catch (IllegalAccessException e) + { + return new ErrorResponse(e); + } + catch (InvocationTargetException e) + { + Throwable cause = e.getCause(); + + // + if (cause instanceof AssertionFailedError) + { + return new FailureResponse(cause); + } + else + { + return new ErrorResponse(cause); + } + } + finally + { + // Invoke tearDown() if it exists + try + { + Method tearDown = Reflection.findMethod(testClass, "tearDown", new Class[0]); + if (tearDown != null && (tearDown.getModifiers() & (Modifier.PRIVATE | Modifier.STATIC | Modifier.ABSTRACT)) == 0) + { + invokeNoArg(test, tearDown, true); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + } + + private void buildInfo() + { + TestContainerInfo containerInfo = new TestContainerInfo(testClass.getName()); + + // + try + { + Method[] methods = testClass.getMethods(); + for (int j = 0; j < methods.length; j++) + { + Method method = methods[j]; + + // + int modifiers = method.getModifiers(); + if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers) && !Modifier.isStatic(modifiers)) + { + String methodName = method.getName(); + if (methodName.startsWith("test") && + method.getParameterTypes().length == 0) + { + TestInfo childInfo = new TestInfo(method.getName()); + containerInfo.addChild(childInfo); + testMap.put(method.getName(), method); + } + else if (methodName.startsWith("set") && + methodName.endsWith("Parameter") && + method.getParameterTypes().length == 1) + { + String parameterName = methodName.substring(3, methodName.length() - 9); + setterMap.put(parameterName, method); + } + } + } + + // Set all parameters on children + for (Iterator i = setterMap.keySet().iterator(); i.hasNext();) + { + String parameterName = (String)i.next(); + for (Iterator j = testMap.keySet().iterator(); j.hasNext();) + { + String childName = (String)j.next(); + TestInfo childInfo = (TestInfo)containerInfo.getChild(childName); + childInfo.addParameter(new TestParameterInfo(parameterName)); + } + } + } + catch (Exception e) + { + IllegalArgumentException iae = new IllegalArgumentException(); + iae.initCause(e); + throw iae; + } + + // + this.containerInfo = containerInfo; + } + + /** + * Invoke a method that takes no argument. + * + * @param m the method to invoke + * @param allowProtected enable the invocation of non accessible methods + * @throws IllegalAccessException + * @throws InvocationTargetException + */ + private static void invokeNoArg(Object test, Method m, boolean allowProtected) throws IllegalAccessException, InvocationTargetException + { + int modifiers = m.getModifiers(); + + // + if (Modifier.isStatic(modifiers) || Modifier.isAbstract(modifiers)) + { + return; + } + + // + if (!Modifier.isPublic(modifiers)) + { + if (!allowProtected) + { + return; + } + m.setAccessible(true); + } + + // + m.invoke(test, new Object[0]); + } + + public static TestSuite createTestSuite(Class testClass, Map parameterMap) throws Exception + { + TestSuite suite = new TestSuite(); + POJOJUnitTest test = new POJOJUnitTest(testClass); + JUnitAdapter adapter = new JUnitAdapter(test, parameterMap); + suite.addTest(adapter); + return suite; + } + + public static TestSuite createTestSuite(Class testClass) throws Exception + { + TestSuite suite = new TestSuite(); + POJOJUnitTest test = new POJOJUnitTest(testClass); + JUnitAdapter adapter = new JUnitAdapter(test); + suite.addTest(adapter); + return suite; + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/POJOJUnitTest.java ___________________________________________________________________ Name: svn:executable + * Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ThrowableDecoder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ThrowableDecoder.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ThrowableDecoder.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,60 @@ +/****************************************************************************** + * 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.junit; + +import junit.framework.AssertionFailedError; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7228 $ + */ +public class ThrowableDecoder +{ + /** + * <p>Decode a throwable into a suitable driver response.</p> + * <p/> + * <p>If the throwable or one of its causes are an instance of the class <code>junit.framework.AssertionFailedError</code> + * then a <code>org.jboss.portal.common.test.driver.response.FailureResponse</code> is returned.</p> + * <p/> + * <p>Otherwise an <code>org.jboss.portal.common.test.driver.response.ErrorResponse</code> object is built with the + * throwable as argument and returned.</p> + * + * @param t the throwable to decode. + * @return the proper driver response + */ + public static DriverResponse decode(Throwable t) + { + for (Throwable u = t; u != null; u = u.getCause()) + { + if (u instanceof AssertionFailedError) + { + AssertionFailedError afe = (AssertionFailedError)u; + return new FailureResponse(afe); + } + } + return new ErrorResponse(t); + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/junit/ThrowableDecoder.java ___________________________________________________________________ Name: svn:executable + * Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JBossServiceLookup.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JBossServiceLookup.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JBossServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,65 @@ +/****************************************************************************** + * 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.lookup; + +import org.jboss.mx.util.MBeanProxy; +import org.jboss.portal.test.framework.server.Node; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class JBossServiceLookup extends ServiceLookup +{ + + /** . */ + private String name; + + /** . */ + private String proxyClassName; + + public JBossServiceLookup(String name, String proxyClassName) + { + this.name = name; + this.proxyClassName = proxyClassName; + } + + public Object getService(Node node) throws ServiceLookupFailedException + { + try + { + Class proxyClass = Thread.currentThread().getContextClassLoader().loadClass(proxyClassName); + ObjectName name = new ObjectName(this.name); + MBeanServer server = node.getMBeanServer(); + return MBeanProxy.get(proxyClass, name, server); + } + catch (Exception e) + { + throw new ServiceLookupFailedException(e); + } + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JBossServiceLookup.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JNDIServiceLookup.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JNDIServiceLookup.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JNDIServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,99 @@ +/****************************************************************************** + * 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.lookup; + +import org.jboss.portal.test.framework.server.Node; + +import javax.naming.NamingException; +import javax.naming.Context; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class JNDIServiceLookup extends ServiceLookup +{ + + /** . */ + private String jndiName; + +// public String getJNDIName() +// { +// return jndiName; +// } +// +// public void setJNDIName(String jndiName) +// { +// this.jndiName = jndiName; +// } + + + public JNDIServiceLookup(String jndiName) + { + this.jndiName = jndiName; + } + + public Object getService(Node node) + { + Context ctx = null; + try + { + ctx = node.getNamingContext(); + return ctx.lookup(jndiName); + } + catch (NamingException e) + { + throw new ServiceLookupFailedException(e); + } + finally + { + if (ctx != null) + { + try + { + ctx.close(); + } + catch (NamingException ignore) + { + } + } + } + } + + public void create() + { + } + + public void start() + { + } + + public void stop() + { + } + + public void destroy() + { + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/JNDIServiceLookup.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookup.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookup.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookup.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,42 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ + +package org.jboss.portal.test.framework.lookup; + +import org.jboss.portal.test.framework.server.Node; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public abstract class ServiceLookup +{ + /** + * Perform a service lookup for a given node. + * + * @param node the target node + * @return the service proxy + * @throws ServiceLookupFailedException if the lookup fails + */ + public abstract Object getService(Node node) throws ServiceLookupFailedException; +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookup.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookupFailedException.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/ServiceLookupFailedException.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookupFailedException.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/lookup/ServiceLookupFailedException.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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.lookup; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ServiceLookupFailedException extends RuntimeException +{ + public ServiceLookupFailedException() + { + } + + public ServiceLookupFailedException(String message) + { + super(message); + } + + public ServiceLookupFailedException(String message, Throwable cause) + { + super(message, cause); + } + + public ServiceLookupFailedException(Throwable cause) + { + super(cause); + } +} Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestBeanFactory.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestBeanFactory.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestBeanFactory.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,62 @@ +/****************************************************************************** + * 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.mc; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class TestBeanFactory +{ + + private Map beans; + + public TestBeanFactory(Map beans) + { + this.beans = beans; + } + + public Object getBean(String id) + { + return beans.get(id); + } + + public void create() + { + } + + public void start() + { + } + + public void stop() + { + } + + public void destroy() + { + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestBeanFactory.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java (from rev 7949, branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,165 @@ +/****************************************************************************** + * 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.mc; + +import org.apache.log4j.Logger; +import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; +import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; +import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; +import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; +import org.jboss.kernel.spi.deployment.KernelDeployment; + +import java.net.URL; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * The test context offered to the test. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class TestRuntimeContext +{ + + /** . */ + private Logger log; + + /** . */ + private BasicBootstrap bootstrap; + + /** . */ + BeanXMLDeployer beanDeployer; + + /** . */ + private URL beansURL; + + /** The beans that will be defined by a factory in the container. */ + private Map beans; + + /** + * + */ + private boolean started; + + /** + * + */ + private KernelDeployment deployment; + + /** + * Constructs a new TestRuntimeContext. + * + * @param beansDD the location of the microcontainer beans descriptor for the beans to be wired for this test + * @throws IllegalArgumentException if <var>beansDD</var> is null or not valid + */ + public TestRuntimeContext(String beansDD) throws IllegalArgumentException + { + if (beansDD == null) + { + throw new IllegalArgumentException("No beans descriptor provided"); + } + this.log = Logger.getLogger(getClass()); + this.beansURL = Thread.currentThread().getContextClassLoader().getResource(beansDD); + this.beans = new HashMap(); + if (beansURL == null) + { + throw new IllegalArgumentException("Bean url is not valid " + beansDD); + } + } + + public void addBean(String id, Object bean) throws IllegalStateException, IllegalArgumentException + { + if (id == null) + { + throw new IllegalArgumentException("The bean id is null"); + } + if (bean == null) + { + throw new IllegalArgumentException("The bean is null"); + } + if (started) + { + throw new IllegalStateException("Runtime context already active"); + } + if (beans.containsKey(id)) + { + throw new IllegalArgumentException("The bean " + id + " is already here"); + } + beans.put(id, bean); + } + + public void start() throws Exception + { + try + { + bootstrap = new BasicBootstrap(); + + // + bootstrap.run(); + + // + AbstractBeanMetaData testBeanFactoryMD = new AbstractBeanMetaData("BeanFactory", TestBeanFactory.class.getName()); + AbstractConstructorMetaData testBeanCtorFactoryMD = new AbstractConstructorMetaData(); + testBeanCtorFactoryMD.setParameters(Collections.singletonList(new AbstractParameterMetaData(Map.class.getName(), beans))); + testBeanFactoryMD.setConstructor(testBeanCtorFactoryMD); + bootstrap.getKernel().getController().install(testBeanFactoryMD); + + // + beanDeployer = new BeanXMLDeployer(bootstrap.getKernel()); + + // + deployment = beanDeployer.deploy(beansURL); + + // + beanDeployer.validate(deployment); + + // + started = true; + } + catch (Throwable throwable) + { +// log.error("Got a throwable", throwable); + if (throwable instanceof Error) + { + throw(Error)throwable; + } + if (throwable instanceof Exception) + { + throw(Exception)throwable; + } + throw new Error(throwable); + } + } + + public void stop() + { + if (deployment != null) + { + beanDeployer.undeploy(deployment); + } + } +} Property changes on: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/mc/TestRuntimeContext.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/BaseRunner.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -25,11 +25,11 @@ import org.jboss.portal.test.framework.deployment.Deployer; import org.jboss.portal.test.framework.server.NodeManager; import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.test.framework.TestRuntimeContext; -import org.jboss.portal.test.framework.ServiceLookup; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; +import org.jboss.portal.test.framework.lookup.ServiceLookup; import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverClient; -import org.jboss.portal.common.test.junit.JUnitAdapter; -import org.jboss.portal.common.test.TestParametrization; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.TestParametrization; import org.apache.log4j.Logger; import org.apache.log4j.Appender; import org.apache.log4j.SimpleLayout; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/HTTPTestRunner.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.framework.runner; import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.TestParametrization; import junit.framework.AssertionFailedError; import java.io.File; Modified: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/WebTestRunner.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/WebTestRunner.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/portal/test/framework/runner/WebTestRunner.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.framework.runner; import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.common.test.TestParametrization; -import org.jboss.portal.common.test.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.TestParametrization; import java.io.File; import java.net.MalformedURLException; Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/InfoTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/InfoTestCase.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/InfoTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,231 @@ +/****************************************************************************** + * 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.test; + +import junit.framework.TestCase; +import org.jboss.portal.test.framework.info.TestContainerInfo; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestParameterInfo; +import org.jboss.portal.common.util.CollectionBuilder; + +import java.util.Collections; +import java.util.HashSet; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class InfoTestCase extends TestCase +{ + + public void testTestContainerConstructor() + { + try + { + new TestContainerInfo((String)null); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + try + { + new TestContainerInfo(null, ""); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + + // + TestContainerInfo c1 = new TestContainerInfo("foo", null); + assertEquals("foo", c1.getName()); + assertEquals(null, c1.getDescription()); + assertEquals(Collections.EMPTY_SET, c1.getChildNames()); + + // + TestContainerInfo c2 = new TestContainerInfo("foo", "bar"); + assertEquals("foo", c2.getName()); + assertEquals("bar", c2.getDescription()); + assertEquals(Collections.EMPTY_SET, c2.getChildNames()); + } + + public void testTestConstructor() + { + try + { + new TestInfo((String)null); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + try + { + new TestInfo(null, ""); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + + // + TestInfo t1 = new TestInfo("foo"); + assertEquals("foo", t1.getName()); + assertEquals(null, t1.getDescription()); + + // + TestInfo t2 = new TestInfo("foo", "bar"); + assertEquals("foo", t2.getName()); + assertEquals("bar", t2.getDescription()); + } + + public void testParameterConstructor() + { + try + { + new TestParameterInfo(null); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + try + { + new TestInfo(null, ""); + fail("Was expecting an IAE"); + } + catch (IllegalArgumentException e) + { + } + + // + TestParameterInfo p1 = new TestParameterInfo("foo"); + assertEquals("foo", p1.getName()); + assertEquals(null, p1.getDescription()); + + // + TestParameterInfo p2 = new TestParameterInfo("foo", "bar"); + assertEquals("foo", p2.getName()); + assertEquals("bar", p2.getDescription()); + } + + public void testTestParameters() + { + TestInfo test = new TestInfo("foo"); + assertEquals(new HashSet(), new HashSet(test.getParameterNames())); + + // + TestParameterInfo p1 = new TestParameterInfo("p1"); + test.addParameter(p1); + assertEquals(p1, test.getParameter("p1")); + assertEquals(Collections.singleton("p1"), test.getParameterNames()); + + // + try + { + test.addParameter(new TestParameterInfo("p1")); + fail(); + } + catch (IllegalArgumentException expected) + { + } + assertEquals(p1, test.getParameter("p1")); + assertEquals(Collections.singleton("p1"), test.getParameterNames()); + + // + TestParameterInfo p2 = new TestParameterInfo("p2"); + test.addParameter(p2); + assertEquals(p1, test.getParameter("p1")); + assertEquals(p2, test.getParameter("p2")); + assertEquals(new CollectionBuilder().add("p1").add("p2").toHashSet(), test.getParameterNames()); + } + + public void testId() + { + TestContainerInfo root = new TestContainerInfo("root"); + assertEquals("/", root.getId(null)); + assertEquals("", root.getId(root)); + try + { + root.getId(new TestContainerInfo("tmp")); + fail(); + } + catch (IllegalArgumentException expected) + { + } + + // + TestInfo a = new TestInfo("a"); + root.addChild(a); + assertEquals("/a", a.getId(null)); + assertEquals("a", a.getId(root)); + assertEquals("", a.getId(a)); + + // + TestContainerInfo b = new TestContainerInfo("b"); + root.addChild(b); + assertEquals("/b", b.getId(null)); + assertEquals("b", b.getId(root)); + assertEquals("", b.getId(b)); + + // + TestInfo c = new TestInfo("c"); + b.addChild(c); + assertEquals("/b/c", c.getId(null)); + assertEquals("b/c", c.getId(root)); + assertEquals("c", c.getId(b)); + assertEquals("", c.getId(c)); + } + + public void testClone() + { + + } + + public void testVisitor() + { + + } + + public void testFind() + { + TestContainerInfo root = new TestContainerInfo("root"); + TestInfo a = new TestInfo("a"); + root.addChild(a); + TestContainerInfo b = new TestContainerInfo("b"); + root.addChild(b); + TestInfo c = new TestInfo("c"); + b.addChild(c); + + // + assertEquals(root, root.findItem("")); + assertEquals(a, a.findItem("")); + assertEquals(a, root.findItem("a")); + assertEquals(b, b.findItem("")); + assertEquals(b, root.findItem("b")); + assertEquals(c, c.findItem("")); + assertEquals(c, b.findItem("c")); + assertEquals(c, root.findItem("b/c")); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParameterValueTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParameterValueTestCase.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParameterValueTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,103 @@ +/****************************************************************************** + * 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.test; + +import org.jboss.portal.test.framework.MonoValuedTestParameterValue; +import org.jboss.portal.test.framework.MultiValuedTestParameterValue; +import junit.framework.TestCase; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.NoSuchElementException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class TestParameterValueTestCase extends TestCase +{ + + public void testMono() + { + Object o = new Object(); + assertEquals(o, new MonoValuedTestParameterValue(o).get()); + assertEquals(null, new MonoValuedTestParameterValue(null).get()); + + // + assertEquals(new MonoValuedTestParameterValue("abc"), new MonoValuedTestParameterValue("abc")); + assertEquals(new MonoValuedTestParameterValue(o), new MonoValuedTestParameterValue(o)); + assertEquals(new MonoValuedTestParameterValue(null), new MonoValuedTestParameterValue(null)); + + // + assertFalse(new MonoValuedTestParameterValue(o).equals(new MonoValuedTestParameterValue(new Object()))); + assertFalse(new MonoValuedTestParameterValue(o).equals(new MonoValuedTestParameterValue(null))); + assertFalse(new MonoValuedTestParameterValue(new Object()).equals(new MonoValuedTestParameterValue(o))); + assertFalse(new MonoValuedTestParameterValue(null).equals(new MonoValuedTestParameterValue(o))); + } + + public void testMulti() + { + try + { + new MultiValuedTestParameterValue((Collection)null); + fail(); + } + catch (IllegalArgumentException expected) + { + } + try + { + new MultiValuedTestParameterValue((Object[])null); + fail(); + } + catch (IllegalArgumentException expected) + { + } + ArrayList toto = new ArrayList(); + toto.add("abc"); + toto.add("def"); + MultiValuedTestParameterValue t = new MultiValuedTestParameterValue(toto); + assertEquals(toto, t.get()); + Iterator i = t.iterator(); + assertNotNull(i); + assertTrue(i.hasNext()); + Object i0 = i.next(); + assertNotNull(i0); + assertTrue(i0 instanceof MonoValuedTestParameterValue); + assertEquals("abc", ((MonoValuedTestParameterValue)i0).get()); + assertTrue(i.hasNext()); + Object i1 = i.next(); + assertNotNull(i1); + assertTrue(i1 instanceof MonoValuedTestParameterValue); + assertEquals("def", ((MonoValuedTestParameterValue)i1).get()); + assertFalse(i.hasNext()); + try + { + i.next(); + } + catch (NoSuchElementException expected) + { + } + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParametrizationTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParametrizationTestCase.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/TestParametrizationTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,116 @@ +/****************************************************************************** + * 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.test; + +import junit.framework.TestCase; +import org.jboss.portal.test.framework.info.TestInfo; +import org.jboss.portal.test.framework.info.TestParameterInfo; +import org.jboss.portal.test.framework.TestParametrization; +import org.jboss.portal.test.framework.MonoValuedTestParameterValue; +import org.jboss.portal.test.framework.MultiValuedTestParameterValue; +import org.jboss.portal.common.util.CollectionBuilder; + +import java.util.Collection; +import java.util.Iterator; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class TestParametrizationTestCase extends TestCase +{ + + public void testGet() + { + try + { + new TestParametrization().getParameterValue(null); + fail(); + } + catch (IllegalArgumentException expected) + { + } + } + + public void testSet() + { + try + { + new TestParametrization().setParameterValue(null, null); + fail(); + } + catch (IllegalArgumentException expected) + { + } + try + { + new TestParametrization().setParameterValue(null, new MonoValuedTestParameterValue("abc")); + fail(); + } + catch (IllegalArgumentException expected) + { + } + TestParametrization p = new TestParametrization(); + MonoValuedTestParameterValue v = new MonoValuedTestParameterValue("def"); + p.setParameterValue("abc", v); + assertEquals(v, p.getParameterValue("abc")); + p.setParameterValue("abc", null); + assertEquals(null, p.getParameterValue("abc")); + } + + public void testCreate() + { + TestInfo info = new TestInfo("test"); + info.addParameter(new TestParameterInfo("foo")); + info.addParameter(new TestParameterInfo("bar")); + + // + TestParametrization p1 = new TestParametrization(); + p1.setParameterValue("foo", new MonoValuedTestParameterValue("foo1")); + p1.setParameterValue("abc", new MonoValuedTestParameterValue("def")); + Collection c1 = p1.create(info); + assertNotNull(c1); + assertEquals(1, c1.size()); + TestParametrization q1 = (TestParametrization)c1.iterator().next(); + assertEquals(new MonoValuedTestParameterValue("foo1"), q1.getParameterValue("foo")); + assertEquals(null, q1.getParameterValue("abc")); + + // + TestParametrization p2 = new TestParametrization(); + p2.setParameterValue("foo", new MonoValuedTestParameterValue("foo1")); + p2.setParameterValue("abc", new MonoValuedTestParameterValue("def")); + p2.setParameterValue("bar", new MultiValuedTestParameterValue(new CollectionBuilder().add("bar1").add("bar2").toArrayList())); + Collection c2 = p2.create(info); + assertNotNull(c2); + assertEquals(2, c2.size()); + Iterator i2 = c2.iterator(); + TestParametrization q2_1 = (TestParametrization)i2.next(); + assertEquals(new MonoValuedTestParameterValue("foo1"), q2_1.getParameterValue("foo")); + assertEquals(new MonoValuedTestParameterValue("bar1"), q2_1.getParameterValue("bar")); + assertEquals(null, q2_1.getParameterValue("abc")); + TestParametrization q2_2 = (TestParametrization)i2.next(); + assertEquals(new MonoValuedTestParameterValue("foo1"), q2_2.getParameterValue("foo")); + assertEquals(new MonoValuedTestParameterValue("bar2"), q2_2.getParameterValue("bar")); + assertEquals(null, q2_2.getParameterValue("abc")); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/BaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/BaseTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/BaseTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,44 @@ +/****************************************************************************** + * 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.test.junit; + +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class BaseTest +{ + protected final Map state = new HashMap(); + protected final void add(String methodName) + { + Integer count = (Integer)state.get(methodName); + if (count == null) + { + count = new Integer(0); + } + state.put(methodName, new Integer(count.intValue() + 1)); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/POJOJunitTestTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/POJOJunitTestTestCase.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/POJOJunitTestTestCase.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,92 @@ +/****************************************************************************** + * 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.test.junit; + +import junit.framework.TestCase; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.common.util.MapBuilder; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class POJOJunitTestTestCase extends TestCase +{ + + /** . */ + private static final Map lifeCycleCalledState = new MapBuilder().put("testFoo", new Integer(1)).put("setUp", new Integer(1)).put("tearDown", new Integer(1)).toHashMap(); + + /** . */ + private static final Map lifeCycleNotCalledState = new MapBuilder().put("testFoo", new Integer(1)).toHashMap(); + + public void testDeclaredPublicLifeCycle() throws Exception + { + PublicLifecycleTest publicLifecycle = new PublicLifecycleTest(); + POJOJUnitTest test = new POJOJUnitTest(publicLifecycle); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleCalledState, publicLifecycle.state); + } + + public void testDeclaredProtectedLifeCycle() throws Exception + { + ProtectedLifecycleTest protectedLifecycle = new ProtectedLifecycleTest(); + POJOJUnitTest test = new POJOJUnitTest(protectedLifecycle); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleCalledState, protectedLifecycle.state); + } + + public void testDeclaredPrivateLifeCycle() throws Exception + { + PrivateLifecycleTest privateLifecycle = new PrivateLifecycleTest(); + POJOJUnitTest test = new POJOJUnitTest(privateLifecycle); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleNotCalledState, privateLifecycle.state); + } + + public void testInheritedPublicLifeCycle() throws Exception + { + PublicLifecycleInheritedTest publicLifecycleInherited = new PublicLifecycleInheritedTest(); + POJOJUnitTest test = new POJOJUnitTest(publicLifecycleInherited); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleCalledState, publicLifecycleInherited.state); + } + + public void testInheritedProtectedLifeCycle() throws Exception + { + ProtectedLifecycleInheritedTest protectedLifecycleInherited = new ProtectedLifecycleInheritedTest(); + POJOJUnitTest test = new POJOJUnitTest(protectedLifecycleInherited); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleCalledState, protectedLifecycleInherited.state); + } + + public void testInheritedPrivateLifeCycle() throws Exception + { + PrivateLifecycleInheritedTest privateLifecycleInherited = new PrivateLifecycleInheritedTest(); + POJOJUnitTest test = new POJOJUnitTest(privateLifecycleInherited); + test.invoke("testFoo", new StartTestCommand()); + assertEquals(lifeCycleNotCalledState, privateLifecycleInherited.state); + } +} \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleInheritedTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleInheritedTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleInheritedTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PrivateLifecycleInheritedTest extends PrivateLifecycleSuperTest +{ + public void testFoo() + { + add("testFoo"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleSuperTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleSuperTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleSuperTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,39 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public abstract class PrivateLifecycleSuperTest extends BaseTest +{ + private void setUp() + { + add("setUp"); + } + private void tearDown() + { + add("tearDown"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PrivateLifecycleTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PrivateLifecycleTest extends BaseTest +{ + private void setUp() + { + add("setUp"); + } + private void tearDown() + { + add("tearDown"); + } + public void testFoo() + { + add("testFoo"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleInheritedTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleInheritedTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleInheritedTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ProtectedLifecycleInheritedTest extends ProtectedLifecycleSuperTest +{ + public void testFoo() + { + add("testFoo"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleSuperTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleSuperTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleSuperTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,39 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public abstract class ProtectedLifecycleSuperTest extends BaseTest +{ + protected void setUp() + { + add("setUp"); + } + protected void tearDown() + { + add("tearDown"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/ProtectedLifecycleTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ProtectedLifecycleTest extends BaseTest +{ + protected void setUp() + { + add("setUp"); + } + protected void tearDown() + { + add("tearDown"); + } + public void testFoo() + { + add("testFoo"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleInheritedTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleInheritedTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleInheritedTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,35 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PublicLifecycleInheritedTest extends PublicLifecycleSuperTest +{ + public void testFoo() + { + add("testFoo"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleSuperTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleSuperTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleSuperTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -0,0 +1,39 @@ +/****************************************************************************** + * 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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public abstract class PublicLifecycleSuperTest extends BaseTest +{ + public void setUp() + { + add("setUp"); + } + public void tearDown() + { + add("tearDown"); + } +} Added: branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleTest.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/test/src/main/org/jboss/test/junit/PublicLifecycleTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -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.test.junit; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class PublicLifecycleTest extends BaseTest +{ + public void setUp() + { + add("setUp"); + } + public void tearDown() + { + add("tearDown"); + } + public void testFoo() + { + add("testFoo"); + } +} Modified: branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-16 14:51:00 UTC (rev 7954) @@ -158,13 +158,13 @@ </constructor> </bean> - <bean name="TestDriverServerLookup" class="org.jboss.portal.test.framework.JNDIServiceLookup"> + <bean name="TestDriverServerLookup" class="org.jboss.portal.test.framework.lookup.JNDIServiceLookup"> <constructor> <parameter><value>TestDriverServer</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup" class="org.jboss.portal.test.framework.JNDIServiceLookup"> + <bean name="TestAgentLookup" class="org.jboss.portal.test.framework.lookup.JNDIServiceLookup"> <constructor> <parameter><value>TestAgent</value></parameter> </constructor> Modified: branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-16 14:51:00 UTC (rev 7954) @@ -158,13 +158,13 @@ </constructor> </bean> - <bean name="TestDriverServerLookup" class="org.jboss.portal.test.framework.JNDIServiceLookup"> + <bean name="TestDriverServerLookup" class="org.jboss.portal.test.framework.lookup.JNDIServiceLookup"> <constructor> <parameter><value>TestDriverServer</value></parameter> </constructor> </bean> - <bean name="TestAgentLookup" class="org.jboss.portal.test.framework.JNDIServiceLookup"> + <bean name="TestAgentLookup" class="org.jboss.portal.test.framework.lookup.JNDIServiceLookup"> <constructor> <parameter><value>TestAgent</value></parameter> </constructor> Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -23,8 +23,8 @@ package org.jboss.portal.test.theme; import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -51,12 +51,12 @@ import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.IteratorStatus; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.response.FailureResponse; -import org.jboss.portal.common.test.driver.command.StartTestCommand; -import org.jboss.portal.common.test.junit.ThrowableDecoder; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; +import org.jboss.portal.test.framework.junit.ThrowableDecoder; import org.jboss.portal.web.ServletContextDispatcher; import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.mx.util.MBeanServerLocator; Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/MyTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/MyTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/MyTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -27,7 +27,7 @@ import org.jboss.portal.test.theme.model.WindowObject; import org.jboss.portal.test.theme.model.RenderedObject; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; import java.util.Collections; Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,12 +24,11 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.mx.util.MBeanProxy; -import org.jboss.portal.common.test.driver.TestDriverContainer; -import org.jboss.portal.common.test.driver.TestDriver; -import org.jboss.portal.common.test.driver.command.StartTestCommand; -import org.jboss.portal.common.test.TestParametrization; +import org.jboss.portal.test.framework.driver.TestDriverContainer; +import org.jboss.portal.test.framework.driver.command.StartTestCommand; import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.portal.test.framework.TestParametrization; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestServlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -24,9 +24,8 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.mx.util.MBeanProxy; -import org.jboss.portal.common.test.driver.TestDriverContainer; +import org.jboss.portal.test.framework.driver.TestDriverContainer; import org.jboss.portal.test.theme.model.WindowObject; -import org.jboss.portal.test.theme.dyna.tests.refresh.FormGetRefreshIsNotPartialWindowTest; import org.jboss.portal.test.theme.dyna.tests.dnd.DnDTest; import javax.servlet.http.HttpServlet; Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -31,8 +31,8 @@ import org.jboss.portal.test.theme.model.WindowObject; import org.jboss.portal.test.framework.driver.web.response.DnDResponse; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.common.test.driver.response.EndTestResponse; -import org.jboss.portal.common.test.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormGetRefreshIsNotPartialWindowTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormGetRefreshIsNotPartialWindowTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormGetRefreshIsNotPartialWindowTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -33,8 +33,8 @@ import org.jboss.portal.test.theme.model.RenderedObject; import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.util.MapBuilder; /** Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormPartialRefreshWindowTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormPartialRefreshWindowTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/FormPartialRefreshWindowTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -33,8 +33,8 @@ import org.jboss.portal.test.theme.model.RenderedObject; import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.common.util.MapBuilder; /** Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/LinkPartialRefreshWindowTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/LinkPartialRefreshWindowTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/dyna/tests/refresh/LinkPartialRefreshWindowTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -33,8 +33,8 @@ import org.jboss.portal.test.theme.model.RenderedObject; import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; import java.util.Collections; Modified: branches/JBoss_Portal_Branch_2_6/tools/lib/explode.jar =================================================================== (Binary files differ) Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-16 14:37:11 UTC (rev 7953) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-16 14:51:00 UTC (rev 7954) @@ -30,12 +30,12 @@ package org.jboss.portal.test.wsrp; import org.jboss.logging.Logger; -import org.jboss.portal.common.test.driver.DriverCommand; -import org.jboss.portal.common.test.driver.DriverResponse; -import org.jboss.portal.common.test.driver.TestDriverException; -import org.jboss.portal.common.test.driver.TestDriverContainer; -import org.jboss.portal.common.test.info.TestItemInfo; -import org.jboss.portal.common.test.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.driver.DriverCommand; +import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.TestDriverException; +import org.jboss.portal.test.framework.driver.TestDriverContainer; +import org.jboss.portal.test.framework.info.TestItemInfo; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.test.framework.driver.http.HttpTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext;