[portal-commits] JBoss Portal SVN: r8746 - in modules/portlet/trunk: build/ide/intellij/idea60/modules/federation and 65 other directories.

Author: julien(a)jboss.com Date: 2007-10-23 03:31:22 -0400 (Tue, 23 Oct 2007) New Revision: 8746 Added: modules/portlet/trunk/federation/src/resources/ modules/portlet/trunk/federation/src/resources/test/ modules/portlet/trunk/federation/src/resources/test/jboss-unit.xml modules/portlet/trunk/portlet/src/resources/test/local-jboss-unit.xml modules/portlet/trunk/portlet/src/resources/test/remote-jboss-unit.xml modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-web.xml modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml Removed: modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml Modified: modules/portlet/trunk/build/build-thirdparty.xml modules/portlet/trunk/build/ide/intellij/idea60/modules/federation/federation.iml modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml modules/portlet/trunk/federation/build.xml modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java modules/portlet/trunk/portlet/build.xml modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestAction.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/DecoderTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/EncoderTestCase.java modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/resources/test/servers.xml modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent modules/portlet/trunk/tools/etc/buildfragments/defaults.ent Log: update portlet module to use jboss unit Modified: modules/portlet/trunk/build/build-thirdparty.xml =================================================================== --- modules/portlet/trunk/build/build-thirdparty.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/build/build-thirdparty.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -48,31 +48,41 @@ <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> <componentref name="jboss-portal/modules/web" version="trunk-SNAPSHOT"/> - <componentref name="jboss-portal/modules/test" version="1.0.0"/> + <componentref name="jboss-portal/modules/test" version="trunk-SNAPSHOT"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="sun-jaf" version="1.1"/> + <!-- Bridge integration --> + <componentref name="portals-bridges" version="1.0.3"/> + + <!-- For JBoss Unit --> <componentref name="jboss/remoting" version="2.2.0.SP4"/> - + <componentref name="apache-httpclient" version="3.0.1"/> + <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> <componentref name="apache-codec" version="1.3.0"/> - <componentref name="apache-httpclient" version="3.0.1"/> - <componentref name="apache-logging" version="1.1"/> - <componentref name="portals-bridges" version="1.0.3"/> - + <!-- Cargo --> <componentref name="codehaus/cargo" version="0.9-portal"/> - <!-- MC 1.0.2 --> -<!-- - <componentref name="jboss/common" version="1.2.0.GA-brew"/> - <componentref name="jboss/microcontainer" version="1.0.2"/> + <!-- MC 2.0.0.Beta4 --> + <componentref name="jboss/microcontainer" version="2.0.0.Beta4"/> + <componentref name="jboss/aop" version="2.0.0.alpha6"/> + <componentref name="jboss/jbossxb" version="2.0.0.CR4"/> + <componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/> + <componentref name="jboss/common-core" version="2.2.1.GA"/> + <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/> <!-- 2.0.3.GA --> + <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/> <!-- 2.0.3.GA --> + <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/> <!-- 2.0.3.GA --> + <componentref name="javassist" version="3.6.0.CR1"/> <!-- 3.6-beta --> + <componentref name="apache-xerces" version="2.7.1"/> + <componentref name="junit" version="3.8.1"/> <componentref name="apache-log4j" version="1.2.14"/> - <componentref name="oswego-concurrent" version="1.3.4"/> - <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/> - <componentref name="junit" version="3.8.1"/> ---> + <componentref name="sun-jaf" version="1.1"/> + <componentref name="wutka-dtdparser" version="1.2.1"/> + <componentref name="trove" version="1.0.2"/> <!-- 2.1.1 --> <!-- MC 2.0 Beta 3 Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> +<!-- <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/> <componentref name="jboss/aop" version="2.0.0.alpha4"/> <componentref name="jboss/jbossxb" version="2.0.0.CR2"/> @@ -88,7 +98,7 @@ <componentref name="junit" version="3.8.1"/> <componentref name="wutka-dtdparser" version="1.2.1"/> <componentref name="trove" version="1.0.2"/> - +--> </build> <synchronizeinfo/> Modified: modules/portlet/trunk/build/ide/intellij/idea60/modules/federation/federation.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/federation/federation.iml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/federation/federation.iml 2007-10-23 07:31:22 UTC (rev 8746) @@ -27,6 +27,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-mc-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-10-23 07:31:22 UTC (rev 8746) @@ -40,16 +40,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +58,7 @@ <orderEntry type="module-library" exported=""> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,40 +67,58 @@ <orderEntry type="module-library" exported=""> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> + <orderEntry type="module" module-name="jsr168api" /> + <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-mc-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> + <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-mc-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="jsr168api" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-mc-lib.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-remote-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-10-23 07:31:22 UTC (rev 8746) @@ -12,7 +12,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -21,6 +21,69 @@ <orderEntry type="module-library"> <library> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-metatype.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-managed.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-kernel.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" /> </CLASSES> <JAVADOC /> @@ -30,6 +93,87 @@ <orderEntry type="module-library"> <library> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-classloader.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" /> </CLASSES> <JAVADOC /> @@ -39,7 +183,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -48,7 +192,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -57,7 +201,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-mc-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -66,7 +210,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/jboss-unit-lib.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: modules/portlet/trunk/federation/build.xml =================================================================== --- modules/portlet/trunk/federation/build.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/federation/build.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -190,21 +190,40 @@ </target> <target name="tests" depends="init, _buildmagic:configure:deployment"> - <execute-tests> - <x-test> - <test todir="${test.reports}" - name="org.jboss.portal.test.portlet.federation.OneInvokerNoPortletsTestCase"/> - <test todir="${test.reports}" - name="org.jboss.portal.test.portlet.federation.NoInvokersTestCase"/> - <test todir="${test.reports}" - name="org.jboss.portal.test.portlet.federation.FederatingPortletInvokerTestCase"/> - </x-test> - <x-classpath> + + <path id="jboss.unit.tooling.test.classpath"> + <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> + </path> + + <taskdef + name="jboss-unit" + classname="org.jboss.unit.tooling.ant.JBossUnitTask" + classpathref="jboss.unit.tooling.test.classpath"/> + + <jboss-unit> + + <tests config="${build.resources}/test/jboss-unit.xml"> + </tests> + + <reports> + <xml toDir="output/tests/xml"/> + <html toDir="output/tests/html"/> + </reports> + + <classpath> + + <path refid="jboss.portal/modules/test.classpath"/> + <path location="../tools/lib/ant.jar"/> + <path location="../tools/lib/ant-launcher.jar"/> + <pathelement location="${build.lib}/portal-portlet-federation-lib.jar"/> <pathelement location="${build.lib}/portal-portlet-federation-test-lib.jar"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> - </x-classpath> - </execute-tests> + + </classpath> + + </jboss-unit > + </target> </project> Modified: modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import junit.framework.TestCase; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; @@ -40,11 +39,16 @@ import java.util.Set; import java.util.Locale; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class FederatingPortletInvokerTestCase extends TestCase +public class FederatingPortletInvokerTestCase { /** . */ @@ -62,7 +66,8 @@ /** . */ private PortletContext portletContext; - protected void setUp() throws Exception + @Create + public void setUp() throws Exception { federatingInvoker = new FederatingPortletInvokerService(); federatedInvoker = new PortletInvokerSupport(); @@ -86,8 +91,8 @@ assertNotNull(portletContext); } - - protected void tearDown() throws Exception + @Destroy + public void tearDown() throws Exception { federatedPortlet = null; federatedInvoker = null; @@ -96,6 +101,7 @@ portletContext = null; } + @Test public void testFederation() throws PortletInvokerException { Collection federateds = federatingInvoker.getFederatedInvokers(); @@ -107,6 +113,7 @@ assertEquals(federatedInvoker, federated.getPortletInvoker()); } + @Test public void testInfo() throws PortletInvokerException { PortletInfo info = portlet.getInfo(); @@ -119,6 +126,7 @@ assertEquals("FooPortlet", description.getDefaultString()); } + @Test public void testGetPortlet() throws PortletInvokerException { Portlet samePortlet = federatingInvoker.getPortlet(portletContext); Modified: modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java =================================================================== --- modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import junit.framework.TestCase; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; @@ -30,12 +29,16 @@ import java.util.HashSet; import java.util.ArrayList; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class NoInvokersTestCase extends TestCase +public class NoInvokersTestCase { + @Test public void testNoFederated() throws PortletInvokerException { FederatingPortletInvoker federating = new FederatingPortletInvokerService(); Modified: modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java =================================================================== --- modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import junit.framework.TestCase; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.test.portlet.state.PortletInvokerSupport; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; @@ -32,13 +31,18 @@ import java.util.HashSet; import java.util.Collection; +import org.jboss.unit.api.pojo.annotations.Test; + +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class OneInvokerNoPortletsTestCase extends TestCase +public class OneInvokerNoPortletsTestCase { + @Test public void testOneFederatedWithNoPortlets() throws PortletInvokerException { FederatingPortletInvoker federating = new FederatingPortletInvokerService(); Added: modules/portlet/trunk/federation/src/resources/test/jboss-unit.xml =================================================================== --- modules/portlet/trunk/federation/src/resources/test/jboss-unit.xml (rev 0) +++ modules/portlet/trunk/federation/src/resources/test/jboss-unit.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.portal.test.portlet.federation.FederatingPortletInvokerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.federation.NoInvokersTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.federation.OneInvokerNoPortletsTestCase"/> + </test> + </pojo> +</jboss-unit> Modified: modules/portlet/trunk/portlet/build.xml =================================================================== --- modules/portlet/trunk/portlet/build.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/build.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -81,10 +81,6 @@ <target name="configure" unless="configure.disable"> - <!-- Configure some properties --> - <property name="jboss-junit-configuration" value=""/> - <property name="junit.formatter.usefile" value="true"/> - <!-- Configure thirdparty libraries --> &libraries; <path id="library.classpath"> @@ -95,7 +91,6 @@ <path refid="oswego.concurrent.classpath"/> <path refid="sun.jaf.classpath"/> <path refid="apache.log4j.classpath"/> - <path refid="junit.junit.classpath"/> <path refid="sun.servlet.classpath"/> </path> @@ -336,29 +331,32 @@ <!-- ================================================================== --> <target name="tests" depends="init, _buildmagic:configure:deployment"> - <antcall target="test-framework"/> - </target> - <target name="test-framework" depends="init"> - <execute-tests> - <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreConsumerStatefulPortletInvokerTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.StateConverterV0TestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.PortletRequestEncoderTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ParametersTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.PropertiesTestCase"/> - </x-test> - <x-sysproperty> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - </x-sysproperty> - <x-classpath> + <path id="jboss.unit.tooling.test.classpath"> + <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> + </path> + + <taskdef + name="jboss-unit" + classname="org.jboss.unit.tooling.ant.JBossUnitTask" + classpathref="jboss.unit.tooling.test.classpath"/> + + <jboss-unit> + + <tests config="${build.resources}/test/local-jboss-unit.xml"> + </tests> + + <reports> + <xml toDir="output/tests/xml/local"/> + <html toDir="output/tests/html/local"/> + </reports> + + <classpath> + + <path refid="jboss.portal/modules/test.classpath"/> + <path location="../tools/lib/ant.jar"/> + <path location="../tools/lib/ant-launcher.jar"/> + <path refid="oswego.concurrent.classpath"/> <path refid="jboss.remoting.classpath"/> <path refid="jboss.microcontainer.classpath"/> @@ -369,8 +367,10 @@ <pathelement location="${build.resources}"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> - </x-classpath> - </execute-tests> + + </classpath> + + </jboss-unit > + </target> - </project> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,12 +22,14 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -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 org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.RequestContext; +import org.jboss.unit.remote.ResponseContext; import java.net.MalformedURLException; +import java.io.Serializable; +import java.util.HashMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -36,19 +38,23 @@ public class PortletTestContext { + /** . */ final String testName; /** . */ - final TestContext testContext; + RequestContext requestContext; - public PortletTestContext(String testName, TestContext httpTestContext) + /** . */ + ResponseContext responseContext; + + public PortletTestContext(String testName, RequestContext requestContext) { - if (httpTestContext == null) + if (requestContext == null) { throw new IllegalArgumentException("No HTTP test context to wrap"); } this.testName = testName; - this.testContext = httpTestContext; + this.requestContext = requestContext; } public String getTestName() @@ -58,17 +64,18 @@ public void setResponse(DriverResponse response) { - testContext.setResponse(response); + responseContext = new ResponseContext(response, new HashMap<String, Serializable>()); } public int getRequestCount() { - return testContext.getRequestCount(); + return requestContext.getRequestCount(); } public String rewriteURLForNode(String url, NodeId nodeId) throws MalformedURLException { - return testContext.rewriteURLForNode(url, nodeId); +// return testContext.rewriteURLForNode(url, nodeId); + return null; } public String getParameter(String parameterName) @@ -77,7 +84,6 @@ { throw new IllegalArgumentException(); } - TestParameterValue parameterValue = testContext.getParametrization().getParameterValue(parameterName); - return parameterValue != null ? (String)parameterValue.get() : null; + return requestContext.getParametrization().get(parameterName); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,61 +22,63 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -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.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.TestSuite; -import org.jboss.portal.test.framework.driver.TestDriver; -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.RemoteTestDriver; -import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer; +import org.jboss.unit.remote.driver.RemoteTestDriver; +import org.jboss.unit.remote.driver.RemoteTestDriverServer; +import org.jboss.unit.remote.driver.CompositeRemoteTestDriver; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.remote.RequestContext; +import org.jboss.unit.remote.ResponseContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.TestDriver; +import org.jboss.unit.driver.DriverContext; +import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.DriverException; +import org.jboss.unit.driver.impl.composite.CompositeTestDriver; +import org.jboss.unit.info.TestCaseInfo; +import org.jboss.unit.info.TestInfo; +import org.jboss.unit.info.impl.SimpleTestCaseInfo; +import org.jboss.unit.TestId; -import java.util.Iterator; - /** * Registry of action sequences. Every sequence is binded with test id * * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6720 $ */ -public class PortletTestDriver implements RemoteTestDriver +public class PortletTestDriver extends CompositeTestDriver { /** . */ private static PortletTestContext context; /** . */ - private final RemoteTestDriverServer server = new RemoteTestDriverServer(); + private final RemoteTestDriverServer server; /** . */ - private TestSuite suite; - - /** . */ private String path; - public PortletTestDriver(String name) + public PortletTestDriver(String name, RemoteTestDriverServer parent) { - this(name, "/test"); + this(name, parent, "/test"); } - public PortletTestDriver(String name, String path) + public PortletTestDriver(String name, RemoteTestDriverServer parent, String path) { - this.suite = new TestSuite(name); + super(name); + + // + this.server = parent; this.path = path; } public void start() { - server.addDriver(this); + server.setDelegate(new CompositeRemoteTestDriver(this)); } public void stop() { - server.removeDriver(this); + server.setDelegate(null); } /** @@ -101,16 +103,25 @@ } // - Sequence sequence = new Sequence(testName, portletTest); + try + { + Sequence sequence = new Sequence(testName, portletTest); - // - suite.addDriver(sequence); + // + mount(sequence); + } + catch (DriverException e) + { + e.printStackTrace(); + } } public void removeSequence(String testName) { - TestDriver a = suite.getDriver(testName); - suite.removeDriver(a); + TestDriver a = drivers.get(testName); + + // + unmount(a); } public PortletTest getSequence(String testName) @@ -119,30 +130,12 @@ { throw new IllegalArgumentException("Test name can't be null"); } - Sequence sequence = (Sequence)suite.getDriver(testName); + Sequence sequence = (Sequence)drivers.get(testName); + + // return sequence != null ? sequence.test : null; } - public TestItemInfo getInfo() - { - return suite.getInfo(); - } - - public DriverResponse invoke(String testId, DriverCommand command) throws TestDriverException - { - return suite.invoke(testId, command); - } - - public void pushContext(String testId, TestContext testContext) - { - context = new PortletTestContext(testId, testContext); - } - - public TestContext popContext(String testId) - { - return context.testContext; - } - /** * The current portlet test context statically available. * @@ -153,7 +146,7 @@ return context; } - private class Sequence implements TestDriver + private class Sequence implements RemoteTestDriver { /** . */ @@ -163,31 +156,51 @@ private final PortletTest test; /** . */ - private final TestItemInfo info; + private final TestCaseInfo info; public Sequence(String name, PortletTest test) { - TestInfo info = new TestInfo(name); - for (Iterator i = info.getParameterNames().iterator();i.hasNext();) - { - String parameterName = (String)i.next(); - info.addParameter(new TestParameterInfo(parameterName)); - } +// TestInfo info = new TestInfo(name); +// for (Iterator i = info.getParameterNames().iterator();i.hasNext();) +// { +// String parameterName = (String)i.next(); +// info.addParameter(new TestParameterInfo(parameterName)); +// } // this.name = name; this.test = test; - this.info = info; + this.info = new SimpleTestCaseInfo(name); } - public TestItemInfo getInfo() + public void initDriver(DriverContext driverContext) { - return info; + } - public DriverResponse invoke(String string, DriverCommand driverCommand) throws TestDriverException + public void destroyDriver() { + + } + + public void pushContext(TestId testId, RequestContext requestContext) + { + context = new PortletTestContext(name, requestContext); + } + + public ResponseContext popContext(TestId testId) + { + return context.responseContext; + } + + public DriverResponse invoke(TestId testId, DriverCommand driverCommand) + { return new InvokeGetResponse("/portlet-test"); } + + public TestInfo getInfo() + { + return info; + } } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,10 +23,13 @@ package org.jboss.portal.test.framework.portlet; import org.apache.log4j.Logger; +import org.jboss.unit.remote.driver.RemoteTestDriverServer; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import java.lang.reflect.InvocationTargetException; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContext; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; @@ -41,7 +44,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6989 $ */ -public abstract class PortletTestSuite implements ServletContextListener +public abstract class PortletTestSuite implements ServletContextListener, ServletContextAttributeListener { /** . */ @@ -51,55 +54,93 @@ public static String METHOD_PATTERN = "create.*"; /** . */ - private final PortletTestDriver driver; + private PortletTestDriver driver; protected PortletTestSuite() { - this.driver = new PortletTestDriver(getClass().getName()); } /** * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into * SequenceRegistry. Then SequenceRegistry is injected into ServletContext - * - * @param sce */ - public void contextInitialized(ServletContextEvent sce) + public void attributeAdded(ServletContextAttributeEvent event) { + if (event.getName().equals("TestDriverServer")) + { + RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue(); - log.info("PortletTestSuite invoked with instance of: '" + this.getClass().getName() + "' class"); - - // We invoke all createXXX methods to fill seqenceRegistry - List methods = introspectMethods(METHOD_PATTERN); - for (int i = 0; i < methods.size(); i++) - { - Method m = (Method)methods.get(i); + // It is only in servlet 2.5, for now we use reflection + String name = null; try { - log.info("Invoking method: '" + m.getName() + "' "); - m.invoke(this, new Object[]{driver}); + Method m = ServletContext.class.getMethod("getContextPath"); + ServletContext servletContext = event.getServletContext(); + name = (String)m.invoke(servletContext); + name = name.substring(1); // We remove the leading '/' } - catch (IllegalAccessException e) + catch (Exception e) { - log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); - e.printStackTrace(); + log.info("Cannot get application context path", e); } - catch (InvocationTargetException e) + + // + if (name != null) { - log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage()); - e.printStackTrace(); + driver = new PortletTestDriver(name, remoteDriver); + + // + log.info("PortletTestSuite invoked with instance of: '" + this.getClass().getName() + "' class"); + + // We invoke all createXXX methods to fill seqenceRegistry + List methods = introspectMethods(METHOD_PATTERN); + for (Object method : methods) + { + Method m = (Method)method; + try + { + log.info("Invoking method: '" + m.getName() + "' "); + m.invoke(this, driver); + } + catch (Exception e) + { + log.info("Error during '" + m.getName() + "' method invocation: " + e.getMessage(), e); + } + } + + // + driver.start(); + + // + event.getServletContext().setAttribute("SequenceRegistry", driver); } } + } - // - sce.getServletContext().setAttribute("SequenceRegistry", driver); - driver.start(); + public void attributeRemoved(ServletContextAttributeEvent event) + { + } + public void attributeReplaced(ServletContextAttributeEvent event) + { + + } + + public void contextInitialized(ServletContextEvent sce) + { + } + public void contextDestroyed(ServletContextEvent sce) { - driver.stop(); sce.getServletContext().removeAttribute("SequenceRegistry"); + + // + if (driver != null) + { + driver.stop(); + driver = null; + } } /** @@ -111,14 +152,14 @@ private List introspectMethods(String namePattern) { List allMethods = Arrays.asList(getClass().getMethods()); - List methods = new ArrayList(allMethods.size()); - for (int i = 0; i < allMethods.size(); i++) + List<Method> methods = new ArrayList<Method>(allMethods.size()); + for (Object allMethod : allMethods) { - Method m = (Method)allMethods.get(i); + Method m = (Method)allMethod; if (Pattern.matches(namePattern, m.getName()) && - m.getParameterTypes().length == 1 && - m.getParameterTypes()[0].equals(PortletTestDriver.class) && - Modifier.isPublic(m.getModifiers())) + m.getParameterTypes().length == 1 && + m.getParameterTypes()[0].equals(PortletTestDriver.class) && + Modifier.isPublic(m.getModifiers())) { methods.add(m); } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestAction.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestAction.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestAction.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,12 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet; -import org.jboss.portal.common.junit.ExtendedAssert; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 7018 $ */ -public abstract class TestAction extends ExtendedAssert +public abstract class TestAction { } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -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; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -33,8 +34,6 @@ import javax.portlet.PortletException; import java.io.IOException; -import junit.framework.AssertionFailedError; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 7954 $ @@ -49,9 +48,9 @@ run(portlet, request, response, context); return null; } - catch (AssertionFailedError t) + catch (AssertionError t) { - return new FailureResponse(t); + return new FailureResponse(Failure.createFailure(t)); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -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; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; import javax.portlet.Portlet; import javax.portlet.PortletException; @@ -33,8 +34,6 @@ import javax.portlet.RenderResponse; import java.io.IOException; -import junit.framework.AssertionFailedError; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 7954 $ @@ -48,9 +47,9 @@ { return run(servlet, request, response, context); } - catch (AssertionFailedError t) + catch (AssertionError t) { - return new FailureResponse(t); + return new FailureResponse(Failure.createFailure(t)); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.actions; -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; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; import javax.servlet.Servlet; import javax.servlet.ServletException; @@ -49,7 +50,7 @@ } catch (Throwable t) { - return ThrowableDecoder.decode(t); + return new FailureResponse(Failure.createFailure(t)); } } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests; -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.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; @@ -34,7 +30,14 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.Failure; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; @@ -70,7 +73,7 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - return new FailureResponse(); + return new FailureResponse(Failure.createAssertionFailure("")); } }); } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ */ public class BasicTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-basic.war"); // @@ -43,6 +41,5 @@ // suite.addTest(new TestCase("TwoResultPortlet")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,14 +22,15 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests.classes; -import junit.framework.TestCase; import org.jboss.portal.test.framework.portlet.Joinpoint; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 5448 $ */ -public class JoinpointTestCase extends TestCase +public class JoinpointTestCase { public void testCreate() { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,21 +22,22 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests.classes; -import junit.framework.TestCase; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import java.util.LinkedList; import java.util.List; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6752 $ */ -public class SequenceRegistryBuilderTestCase extends TestCase +public class SequenceRegistryBuilderTestCase { public void testBuilder() { - final PortletTestDriver sr = new PortletTestDriver("toto"); + final PortletTestDriver sr = new PortletTestDriver(null, null, "toto"); final List invoked = new LinkedList(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,21 +22,22 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests.classes; -import junit.framework.TestCase; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6752 $ */ -public class SequenceRegistryTestCase extends TestCase +public class SequenceRegistryTestCase { public void testSequenceRegistry() { PortletTest portletTest = new PortletTest(); - PortletTestDriver sr = new PortletTestDriver("toto"); + PortletTestDriver sr = new PortletTestDriver(null, null, "toto"); sr.addSequence("testA", portletTest); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,24 +22,25 @@ ******************************************************************************/ package org.jboss.portal.test.framework.portlet.basictests.classes; -import junit.framework.TestCase; -import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -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; import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 7954 $ */ -public class SequenceTestCase extends TestCase +public class SequenceTestCase { public void testSequence() { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -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.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.response.FailureResponse; -import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -38,8 +38,6 @@ import javax.portlet.RenderResponse; import java.io.IOException; -import junit.framework.AssertionFailedError; - /** * Abstract test class for testing GenericPortlet implementation * @@ -74,9 +72,9 @@ { response = doProcessAction(req, resp, context); } - catch (AssertionFailedError e) + catch (AssertionError e) { - response = new FailureResponse(e); + response = new FailureResponse(Failure.createFailure(e)); } // @@ -87,7 +85,7 @@ } else { - context.setResponse(new ErrorResponse()); + context.setResponse(new FailureResponse(Failure.createErrorFailure(""))); } } @@ -103,9 +101,9 @@ super.render(req, resp); response = postRender(req, resp, context); } - catch (AssertionFailedError e) + catch (AssertionError e) { - response = new FailureResponse(e); + response = new FailureResponse(Failure.createFailure(e)); } // Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -24,9 +24,9 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTestDriver; -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 org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -38,8 +38,6 @@ import javax.portlet.RenderResponse; import java.io.IOException; -import junit.framework.AssertionFailedError; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -111,9 +109,9 @@ { response = doProcessAction(req, resp, context); } - catch (AssertionFailedError e) + catch (AssertionError e) { - response = new FailureResponse(e); + response = new FailureResponse(Failure.createFailure(e)); } // @@ -124,7 +122,7 @@ } else { - context.setResponse(new ErrorResponse()); + context.setResponse(new FailureResponse(Failure.createErrorFailure(""))); } } @@ -138,9 +136,9 @@ { response = doRender(req, resp, context); } - catch (AssertionFailedError e) + catch (AssertionError e) { - response = new FailureResponse(e); + response = new FailureResponse(Failure.createFailure(e)); } // Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,8 +23,6 @@ package org.jboss.portal.test.framework.portlet.components; import org.apache.log4j.Logger; -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; @@ -33,6 +31,9 @@ import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.Failure; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -153,11 +154,11 @@ // if (action == null) { - ctx.setResponse(new FailureResponse("No action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint)); + ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("No action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint))); } else if (action instanceof PortletActionTestAction == false) { - ctx.setResponse(new FailureResponse("Action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint + " is not an instance of " + PortletActionTestAction.class.getName() + " but is " + action.getClass().getName())); + ctx.setResponse(new FailureResponse(Failure.createAssertionFailure("Action for " + ctx.getRequestCount() + " " + NodeId.locate() + " " + actionJoinpoint + " is not an instance of " + PortletActionTestAction.class.getName() + " but is " + action.getClass().getName()))); } else { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,7 +23,6 @@ package org.jboss.portal.test.framework.portlet.components; import org.apache.log4j.Logger; -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; @@ -31,6 +30,7 @@ import org.jboss.portal.test.framework.portlet.TestAction; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.unit.driver.DriverResponse; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,7 +23,6 @@ package org.jboss.portal.test.portlet; -import junit.framework.TestCase; import org.jboss.portal.Mode; import org.jboss.portal.portlet.impl.jsr168.info.ContentTypes; import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData; @@ -31,12 +30,16 @@ import java.util.Collection; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 6720 $ * @since 2.4 */ -public class ContentTypesTestCase extends TestCase +@Test +public class ContentTypesTestCase { private ContentTypes contentTypes; @@ -56,6 +59,7 @@ contentTypes.setMetadata(md); } + @Test public void testGetAllModes() { Collection modes = contentTypes.getAllModes(); @@ -65,6 +69,7 @@ assertTrue(modes.contains(Mode.VIEW)); } + @Test public void testGetAllContentTypes() { Collection types = contentTypes.getAllContentTypes(); @@ -76,10 +81,12 @@ assertTrue(types.contains("text")); } + @Test public void testIsModeSupported() { } + @Test public void testGetSupportedModes() { } @@ -89,6 +96,7 @@ } + @Test public void testIsModeSupportedFor() { } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,40 +22,44 @@ ******************************************************************************/ package org.jboss.portal.test.portlet; -import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.portlet.PortletParameters; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6639 $ */ +@Test public class ParametersTestCase - extends TestCase { - public ParametersTestCase(String name) + public ParametersTestCase() { - super(name); } private PortletParameters param; + @Create public void setUp() { param = new PortletParameters(); } + @Destroy public void tearDown() { param = null; } + @Test public void testGetWithNullName() { try @@ -68,12 +72,14 @@ } } + @Test public void testSet() { param.setValue("a", "b"); assertEquals(param.getValue("a"), "b"); } + @Test public void testSetWithNullName() { try @@ -86,6 +92,7 @@ } } + @Test public void testSetWithNullValue() { try @@ -98,6 +105,7 @@ } } + @Test public void testRemoveWithNullName() { try @@ -110,6 +118,7 @@ } } + @Test public void testRemove() { param.setValue("a", "b"); @@ -117,6 +126,7 @@ assertEquals(param.getValue("a"), null); } + @Test public void testSetValues() { param.setValues("a", new String[]{"b", "c"}); @@ -125,6 +135,7 @@ assertEquals(param.getValue("a"), "b"); } + @Test public void testSetValuesWithNullName() { try @@ -137,6 +148,7 @@ } } + @Test public void testSetValuesWithNullValues() { try @@ -149,6 +161,7 @@ } } + @Test public void testSetValuesWithZeroLengthValues() { try @@ -161,6 +174,7 @@ } } + @Test public void testSetValuesWithOneNullValue() { try @@ -173,6 +187,7 @@ } } + @Test public void testReplaceWithParameters() { PortletParameters other = new PortletParameters(); @@ -183,6 +198,7 @@ assertTrue(Arrays.equals(param.getValues("c"), new String[]{"d", "e"})); } + @Test public void testCopyConstructorWithNullParameters() { try @@ -195,6 +211,7 @@ } } + @Test public void testCopyConstructorWithNullMap() { try @@ -207,6 +224,7 @@ } } + @Test public void testReplaceWithNullMap() { try @@ -219,6 +237,7 @@ } } + @Test public void testReplaceWithInvalidMap() { Map[] maps = buildInvalidMaps(); @@ -238,6 +257,7 @@ } } + @Test public void testReplace() { param.setValue("a", "b"); @@ -249,11 +269,12 @@ map.put("h", new String[]{"_i"}); param.replace(map); assertEquals(3, param.size()); - ExtendedAssert.assertEquals(param.getValues("a"), new String[]{"_b"}); - ExtendedAssert.assertEquals(param.getValues("c"), new String[]{"_d", "_e"}); - ExtendedAssert.assertEquals(param.getValues("h"), new String[]{"_i"}); + assertEquals(param.getValues("a"), new String[]{"_b"}); + assertEquals(param.getValues("c"), new String[]{"_d", "_e"}); + assertEquals(param.getValues("h"), new String[]{"_i"}); } + @Test public void testAppendWithInvalidMap() { Map[] maps = buildInvalidMaps(); @@ -276,6 +297,7 @@ } } + @Test public void testAppend() { param.setValue("a", "b"); @@ -287,12 +309,13 @@ map.put("h", new String[]{"_i"}); param.append(map); assertEquals(4, param.size()); - ExtendedAssert.assertEquals(param.getValues("a"), new String[]{"b", "_b"}); - ExtendedAssert.assertEquals(param.getValues("c"), new String[]{"d", "e", "_d", "_e"}); - ExtendedAssert.assertEquals(param.getValues("f"), new String[]{"g"}); - ExtendedAssert.assertEquals(param.getValues("h"), new String[]{"_i"}); + assertEquals(param.getValues("a"), new String[]{"b", "_b"}); + assertEquals(param.getValues("c"), new String[]{"d", "e", "_d", "_e"}); + assertEquals(param.getValues("f"), new String[]{"g"}); + assertEquals(param.getValues("h"), new String[]{"_i"}); } + @Test public void testClear() { param.setValue("a", "b"); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,14 +22,16 @@ ******************************************************************************/ package org.jboss.portal.test.portlet; -import junit.framework.TestCase; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.portlet.OpaqueStateString; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.impl.PortletRequestDecoder; +import org.jboss.unit.api.pojo.annotations.Test; +import static org.jboss.unit.api.Assert.*; + import java.util.HashMap; import java.util.Map; @@ -37,12 +39,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6549 $ */ -public class PortletRequestDecoderTestCase extends TestCase +@Test +public class PortletRequestDecoderTestCase { - public PortletRequestDecoderTestCase(String name) + public PortletRequestDecoderTestCase() { - super(name); } private String[] asStringArray(String s) @@ -50,6 +52,7 @@ return new String[]{s}; } + @Test public void testCorruped() { Map queryParams = new HashMap(); @@ -165,6 +168,7 @@ } } + @Test public void testNav() { Map queryParams = new HashMap(); @@ -250,6 +254,7 @@ bodyParams.clear(); } + @Test public void testRender() { Map queryParams = new HashMap(); @@ -291,6 +296,7 @@ queryParams.clear(); } + @Test public void testRenderNonOpaque() { Map queryParams = new HashMap(); @@ -426,6 +432,7 @@ bodyParams.clear(); } + @Test public void testRenderOpaque() { Map queryParams = new HashMap(); @@ -494,6 +501,7 @@ bodyParams.clear(); } + @Test public void testAction() { Map queryParams = new HashMap(); @@ -535,6 +543,7 @@ queryParams.clear(); } + @Test public void testActionNonOpaque() { Map queryParams = new HashMap(); @@ -606,6 +615,7 @@ form.clear(); } + @Test public void testActionOpaque() { Map queryParams = new HashMap(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,21 +22,24 @@ ******************************************************************************/ package org.jboss.portal.test.portlet; -import junit.framework.TestCase; import org.jboss.portal.portlet.impl.PortletRequestEncoder; import org.jboss.portal.portlet.impl.PortletRequestDecoder; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class PortletRequestEncoderTestCase extends TestCase +public class PortletRequestEncoderTestCase { /** . */ @@ -51,23 +54,27 @@ /** . */ private PortletRequestEncoder encoder; - protected void setUp() throws Exception + @Create + public void setUp() throws Exception { params = new PortletParameters(); encoder = new PortletRequestEncoder(params); } - protected void tearDown() throws Exception + @Destroy + public void tearDown() throws Exception { params = null; encoder = null; } + @Test public void testEncodeRender() { _testEncodeRender(RENDER, PortletRequestDecoder.RENDER_MASK); } + @Test public void testEncodeAction() { _testEncodeRender(ACTION, PortletRequestDecoder.ACTION_MASK); @@ -78,90 +85,91 @@ PortletParametersStateString pp = new PortletParametersStateString(); encode(pp, null, null, lifecycle); assertEquals(1, params.size()); - assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue(PortletRequestDecoder.META_PARAMETER, "foo"); encode(pp, null, null, lifecycle); assertEquals(1, params.size()); - assertEquals(new String[]{Integer.toHexString(lifecycleMask),"foo"}, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(new String[]{Integer.toHexString(lifecycleMask),"foo"}, params.getValues(PortletRequestDecoder.META_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue("foo", "bar"); encode(pp, null, null, lifecycle); assertEquals(2, params.size()); - assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals("bar", params.getValues("foo")); + _assertEquals(lifecycleMask, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals("bar", params.getValues("foo")); // pp = new PortletParametersStateString(); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(2, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue(PortletRequestDecoder.MODE_PARAMETER, "foo"); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(2, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(new String[]{Mode.VIEW.toString(),"foo"}, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(new String[]{Mode.VIEW.toString(),"foo"}, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue("foo", "bar"); encode(pp, Mode.VIEW, null, lifecycle); assertEquals(3, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - assertEquals("bar", params.getValues("foo")); + _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals("bar", params.getValues("foo")); // pp = new PortletParametersStateString(); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(2, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue(PortletRequestDecoder.WINDOW_STATE_PARAMETER, "foo"); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(2, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(new String[]{WindowState.NORMAL.toString(),"foo"}, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(new String[]{WindowState.NORMAL.toString(),"foo"}, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue("foo", "bar"); encode(pp, null, WindowState.NORMAL, lifecycle); assertEquals(3, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - assertEquals("bar", params.getValues("foo")); + _assertEquals(lifecycleMask | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals("bar", params.getValues("foo")); // pp = new PortletParametersStateString(); encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); assertEquals(3, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // pp = new PortletParametersStateString(); pp.setValue("foo", "bar"); encode(pp, Mode.VIEW, WindowState.NORMAL, lifecycle); assertEquals(4, params.size()); - assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); - assertEquals("bar", params.getValues("foo")); + _assertEquals(lifecycleMask | PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.WINDOW_STATE_MASK, params.getValues(PortletRequestDecoder.META_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals("bar", params.getValues("foo")); } + @Test public void testEncodeNav() { encode(null, null, null, RENDER); @@ -170,18 +178,18 @@ // encode(null, Mode.VIEW, null, RENDER); assertEquals(1, params.size()); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); // encode(null, null, WindowState.NORMAL, RENDER); assertEquals(1, params.size()); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); // encode(null, Mode.VIEW, WindowState.NORMAL, RENDER); assertEquals(2, params.size()); - assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); - assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); + _assertEquals(Mode.VIEW, params.getValues(PortletRequestDecoder.MODE_PARAMETER)); + _assertEquals(WindowState.NORMAL, params.getValues(PortletRequestDecoder.WINDOW_STATE_PARAMETER)); } private void encode(PortletParametersStateString params, Mode view, WindowState normal, int lifecycle) @@ -200,18 +208,18 @@ } } - void assertEquals(int expected, String[] actual) + void _assertEquals(int expected, String[] actual) { - ExtendedAssert.assertEquals(new String[]{Integer.toHexString(expected)}, actual); + _assertEquals(new String[]{Integer.toHexString(expected)}, actual); } - void assertEquals(Object expected, String[] actual) + void _assertEquals(Object expected, String[] actual) { - ExtendedAssert.assertEquals(new String[]{"" + expected}, actual); + _assertEquals(new String[]{"" + expected}, actual); } - void assertEquals(String[] expected, String[] actual) + void _assertEquals(String[] expected, String[] actual) { - ExtendedAssert.assertEquals(expected, actual); + assertEquals(expected, actual); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,22 +22,24 @@ ******************************************************************************/ package org.jboss.portal.test.portlet; -import junit.framework.TestCase; import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.Properties; +import org.jboss.unit.api.pojo.annotations.Test; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5448 $ */ -public class PropertiesTestCase extends TestCase +public class PropertiesTestCase { - public PropertiesTestCase(String name) + public PropertiesTestCase() { - super(name); } + @Test public void testA() { Properties props = new Properties(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.ha.session; -import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -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; @@ -33,7 +30,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletException; import javax.portlet.PortletSecurityException; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,20 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.ha.session; -import org.jboss.portal.test.framework.runner.HTTPTestRunner; -import org.jboss.portal.test.framework.server.NodeId; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class SessionTestCase extends HTTPTestRunner +public class SessionTestCase // extends HTTPTestRunner { public SessionTestCase() { - super(new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02}); +// super(new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02}); // - init("test-ha-session.war"); +// init("test-ha-session.war"); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,17 +23,21 @@ package org.jboss.portal.test.portlet.info; import org.jboss.portal.portlet.container.PortletApplicationRegistry; -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.remote.TestContext; -import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver; +import org.jboss.unit.info.TestInfo; +import org.jboss.unit.info.impl.SimpleTestSuiteInfo; +import org.jboss.unit.remote.driver.RemoteTestDriver; +import org.jboss.unit.remote.RequestContext; +import org.jboss.unit.remote.ResponseContext; +import org.jboss.unit.driver.impl.composite.CompositeTestDriver; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.DriverContext; +import org.jboss.unit.driver.DriverException; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.command.StartTestCommand; +import org.jboss.unit.Failure; +import org.jboss.unit.TestId; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -52,10 +56,10 @@ protected PortletApplicationRegistry registry; /** The controller. */ - protected TestDriverContainer testDriverContainer; + protected CompositeTestDriver testDriverContainer; /** Not really used for now, we need the concept of non http test context. */ - private TestContext testContext; + private RequestContext testContext; public AbstractInfoTest(String testCaseId) { @@ -66,17 +70,17 @@ // this.testCaseId = testCaseId; - this.testInfo = new TestInfo(testCaseId); + this.testInfo = new SimpleTestSuiteInfo(testCaseId); } - public void pushContext(String testId, TestContext testContext) + public void pushContext(TestId testId, RequestContext requestContext) { - this.testContext = testContext; + this.testContext = requestContext; } - public TestContext popContext(String testId) + public ResponseContext popContext(TestId testId) { - return testContext; + return null; } public PortletApplicationRegistry getRegistry() @@ -89,32 +93,41 @@ this.registry = registry; } - public TestDriverContainer getTestDriverRegistry() + public CompositeTestDriver getTestDriverRegistry() { return testDriverContainer; } - public void setTestDriverRegistry(TestDriverContainer testDriverContainer) + + public void initDriver(DriverContext driverContext) throws DriverException { + } + + public void destroyDriver() + { + } + + public void setTestDriverRegistry(CompositeTestDriver testDriverContainer) + { this.testDriverContainer = testDriverContainer; } - public void create() + public void create() throws Exception { - testDriverContainer.addDriver(this); + testDriverContainer.mount(this); } public void destroy() { - testDriverContainer.removeDriver(this); + testDriverContainer.unmount(this); } - public TestItemInfo getInfo() + public TestInfo getInfo() { return testInfo; } - public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException + public DriverResponse invoke(TestId testId, DriverCommand cmd) { if (cmd instanceof StartTestCommand) { @@ -127,12 +140,12 @@ } catch (Exception e) { - return new ErrorResponse(e); + return new FailureResponse(Failure.createFailure(e)); } } else { - return new ErrorResponse(); + return new FailureResponse(Failure.createAssertionFailure("Unexpected command")); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -25,8 +25,9 @@ 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.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 7954 $ @@ -44,7 +45,7 @@ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("CachePortlet"); PortletInfo info = container.getInfo(); CacheInfo cacheInfo = info.getCache(); - ExtendedAssert.assertEquals(65, cacheInfo.getExpirationSecs()); + assertEquals(65, cacheInfo.getExpirationSecs()); //TODO:implement getReferenceType(); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -30,8 +30,9 @@ import org.jboss.portal.portlet.info.ModeInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.WindowStateInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + import java.util.HashSet; import java.util.Iterator; import java.util.Locale; @@ -58,8 +59,8 @@ //TODO: finish locales asserts // locales should at least contain Locale.ENGLISH Set allLocales = capInfo.getAllLocales(); - ExtendedAssert.assertNotNull(allLocales); - ExtendedAssert.assertTrue(allLocales.contains(Locale.ENGLISH)); + assertNotNull(allLocales); + assertTrue(allLocales.contains(Locale.ENGLISH)); //check mime types Set types = capInfo.getMimeTypes(); @@ -70,59 +71,59 @@ Object o = i.next(); mt[count++] = (String)o; } - ExtendedAssert.assertEquals(new String[]{"text/vnd.wap.wml", "text/html"}, mt); + assertEquals(new String[]{"text/vnd.wap.wml", "text/html"}, mt); //check all modes Set modeInfos = capInfo.getAllModes(); Set modes = extractModes(modeInfos); - ExtendedAssert.assertTrue(modes.contains(Mode.VIEW)); - ExtendedAssert.assertTrue(modes.contains(Mode.HELP)); - ExtendedAssert.assertTrue(modes.contains(Mode.EDIT)); + assertTrue(modes.contains(Mode.VIEW)); + assertTrue(modes.contains(Mode.HELP)); + assertTrue(modes.contains(Mode.EDIT)); //check text/html modes modeInfos = capInfo.getModes("text/html"); modes = extractModes(modeInfos); - ExtendedAssert.assertEquals(2, modes.size()); - ExtendedAssert.assertTrue(modes.contains(Mode.VIEW)); - ExtendedAssert.assertTrue(modes.contains(Mode.HELP)); + assertEquals(2, modes.size()); + assertTrue(modes.contains(Mode.VIEW)); + assertTrue(modes.contains(Mode.HELP)); //check text/vnd.wap.wml modes modeInfos = capInfo.getModes("text/vnd.wap.wml"); modes = extractModes(modeInfos); - ExtendedAssert.assertEquals(2, modes.size()); - ExtendedAssert.assertTrue(modes.contains(Mode.VIEW)); - ExtendedAssert.assertTrue(modes.contains(Mode.EDIT)); + assertEquals(2, modes.size()); + assertTrue(modes.contains(Mode.VIEW)); + assertTrue(modes.contains(Mode.EDIT)); //check undeclared modeInfos = capInfo.getModes("text/undeclared"); modes = extractModes(modeInfos); - ExtendedAssert.assertEquals(0, modes.size()); + assertEquals(0, modes.size()); //check all window states Set stateInfos = capInfo.getAllWindowStates(); Set states = extractWindowStates(stateInfos); - ExtendedAssert.assertEquals(3, states.size()); - ExtendedAssert.assertTrue(states.contains(WindowState.NORMAL)); - ExtendedAssert.assertTrue(states.contains(WindowState.MINIMIZED)); - ExtendedAssert.assertTrue(states.contains(WindowState.MAXIMIZED)); + assertEquals(3, states.size()); + assertTrue(states.contains(WindowState.NORMAL)); + assertTrue(states.contains(WindowState.MINIMIZED)); + assertTrue(states.contains(WindowState.MAXIMIZED)); //check for text/html stateInfos = capInfo.getWindowStates("text/html"); states = extractWindowStates(stateInfos); - ExtendedAssert.assertEquals(3, states.size()); - ExtendedAssert.assertTrue(states.contains(WindowState.NORMAL)); - ExtendedAssert.assertTrue(states.contains(WindowState.MINIMIZED)); - ExtendedAssert.assertTrue(states.contains(WindowState.MAXIMIZED)); + assertEquals(3, states.size()); + assertTrue(states.contains(WindowState.NORMAL)); + assertTrue(states.contains(WindowState.MINIMIZED)); + assertTrue(states.contains(WindowState.MAXIMIZED)); //simple check for text/vnd.wap.wml //TODO:is this really expected behaviour? shouldn't it return no states as this is unsupported by portal one? states = capInfo.getWindowStates("text/vnd.wap.wml"); - ExtendedAssert.assertEquals(3, states.size()); + assertEquals(3, states.size()); //check undeclared states = capInfo.getWindowStates("undeclared/mime"); - ExtendedAssert.assertEquals(0, states.size()); + assertEquals(0, states.size()); //fail(); @@ -137,7 +138,7 @@ { WindowStateInfo info = (WindowStateInfo)i.next(); WindowState state = info.getWindowState(); - ExtendedAssert.assertEquals(state.toString(), (info.getWindowStateName())); + assertEquals(state.toString(), (info.getWindowStateName())); states.add(state); } return states; @@ -151,7 +152,7 @@ { ModeInfo info = (ModeInfo)i.next(); Mode mode = info.getMode(); - ExtendedAssert.assertEquals(mode.toString(), (info.getModeName())); + assertEquals(mode.toString(), (info.getModeName())); modes.add(mode); } return modes; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -26,8 +26,9 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + import java.util.Locale; /** @@ -51,16 +52,16 @@ // LocalizedString title = metaInfo.getMetaValue(MetaInfo.TITLE); String titleEn = title.getString(Locale.ENGLISH, false); - ExtendedAssert.assertEquals("title", titleEn); + assertEquals("title", titleEn); // LocalizedString shortTitle = metaInfo.getMetaValue(MetaInfo.SHORT_TITLE); String shortTitleEn = shortTitle.getString(Locale.ENGLISH, false); - ExtendedAssert.assertEquals("short-title", shortTitleEn); + assertEquals("short-title", shortTitleEn); // LocalizedString keywords = metaInfo.getMetaValue(MetaInfo.KEYWORDS); String keywordsEn = keywords.getString(Locale.ENGLISH, false); - ExtendedAssert.assertEquals("keywords", keywordsEn); + assertEquals("keywords", keywordsEn); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -26,8 +26,9 @@ 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.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -54,27 +55,27 @@ Set modeInfos = capaInfo.getModes("text/html"); //shoule be 3 modes - ExtendedAssert.assertEquals(3, modeInfos.size()); + assertEquals(3, modeInfos.size()); Set portletModes = new HashSet(); for (Iterator i = modeInfos.iterator(); i.hasNext();) { ModeInfo mode = (ModeInfo)i.next(); portletModes.add(mode.getMode()); - ExtendedAssert.assertEquals(mode.getModeName(), mode.getMode().toString()); + assertEquals(mode.getModeName(), mode.getMode().toString()); } - ExtendedAssert.assertTrue(portletModes.contains(Mode.VIEW)); - ExtendedAssert.assertTrue(portletModes.contains(Mode.HELP)); - ExtendedAssert.assertTrue(portletModes.contains(Mode.EDIT)); + assertTrue(portletModes.contains(Mode.VIEW)); + assertTrue(portletModes.contains(Mode.HELP)); + assertTrue(portletModes.contains(Mode.EDIT)); //Portlet 2 with only VIEW capaInfo = container2.getInfo().getCapabilities(); modeInfos = capaInfo.getModes("text/html"); //shoule be 1 mode - ExtendedAssert.assertEquals(1, modeInfos.size()); + assertEquals(1, modeInfos.size()); portletModes = new HashSet(); @@ -82,11 +83,11 @@ { ModeInfo mode = (ModeInfo)i.next(); portletModes.add(mode.getMode()); - ExtendedAssert.assertEquals(mode.getModeName(), mode.getMode().toString()); + assertEquals(mode.getModeName(), mode.getMode().toString()); } - ExtendedAssert.assertTrue(portletModes.contains(Mode.VIEW)); - ExtendedAssert.assertTrue(!portletModes.contains(Mode.HELP)); - ExtendedAssert.assertTrue(!portletModes.contains(Mode.EDIT)); + assertTrue(portletModes.contains(Mode.VIEW)); + assertTrue(!portletModes.contains(Mode.HELP)); + assertTrue(!portletModes.contains(Mode.EDIT)); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -24,8 +24,9 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6720 $ @@ -43,22 +44,22 @@ //This asserts only .isRemotable() as rest is checked in other tests PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet1"); PortletInfo info = container.getInfo(); - ExtendedAssert.assertEquals(Boolean.TRUE, info.isRemotable()); + assertEquals(Boolean.TRUE, info.isRemotable()); //just simple test if we get other infos... - ExtendedAssert.assertNotNull(info.getCache()); - ExtendedAssert.assertNotNull(info.getCapabilities()); - ExtendedAssert.assertNotNull(info.getMeta()); - ExtendedAssert.assertNotNull(info.getPreferences()); - ExtendedAssert.assertNotNull(info.getSecurity()); - ExtendedAssert.assertNotNull(info.getSession()); + assertNotNull(info.getCache()); + assertNotNull(info.getCapabilities()); + assertNotNull(info.getMeta()); + assertNotNull(info.getPreferences()); + assertNotNull(info.getSecurity()); + assertNotNull(info.getSession()); container = registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet2"); info = container.getInfo(); - ExtendedAssert.assertEquals(Boolean.FALSE, info.isRemotable()); + assertEquals(Boolean.FALSE, info.isRemotable()); container = registry.getPortletApplication("/test-info").getPortletContainer("RemotablePortlet3"); info = container.getInfo(); - ExtendedAssert.assertEquals(Boolean.TRUE, info.isRemotable()); + assertEquals(Boolean.TRUE, info.isRemotable()); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -26,8 +26,9 @@ import org.jboss.portal.portlet.impl.jsr168.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.impl.jsr168.info.ContainerPreferenceInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + import java.util.Locale; import java.util.Set; @@ -53,46 +54,46 @@ // ContainerPreferenceInfo prefInfo = prefsInfo.getContainerPreference("localized_pref"); - ExtendedAssert.assertEquals("localized_pref", prefInfo.getKey()); - ExtendedAssert.assertEquals("english localized description", prefInfo.getDescription().getString(Locale.ENGLISH, false)); - ExtendedAssert.assertEquals("polish localized description", prefInfo.getDescription().getString(new Locale("pl"), false)); - ExtendedAssert.assertEquals("english_localized_name", prefInfo.getDisplayName().getString(Locale.ENGLISH, false)); - ExtendedAssert.assertEquals("polish_localized_name", prefInfo.getDisplayName().getString(new Locale("pl"), false)); + assertEquals("localized_pref", prefInfo.getKey()); + assertEquals("english localized description", prefInfo.getDescription().getString(Locale.ENGLISH, false)); + assertEquals("polish localized description", prefInfo.getDescription().getString(new Locale("pl"), false)); + assertEquals("english_localized_name", prefInfo.getDisplayName().getString(Locale.ENGLISH, false)); + assertEquals("polish_localized_name", prefInfo.getDisplayName().getString(new Locale("pl"), false)); // Set keys = prefsInfo.getKeys(); - ExtendedAssert.assertTrue(keys.contains("localized_pref")); - ExtendedAssert.assertTrue(keys.contains("single_pref")); - ExtendedAssert.assertTrue(keys.contains("multi_pref")); - ExtendedAssert.assertTrue(keys.contains("single_pref_bis")); - ExtendedAssert.assertTrue(keys.contains("multi_pref_bis")); + assertTrue(keys.contains("localized_pref")); + assertTrue(keys.contains("single_pref")); + assertTrue(keys.contains("multi_pref")); + assertTrue(keys.contains("single_pref_bis")); + assertTrue(keys.contains("multi_pref_bis")); // prefInfo = prefsInfo.getContainerPreference("single_pref"); - ExtendedAssert.assertEquals("single_pref", prefInfo.getKey()); + assertEquals("single_pref", prefInfo.getKey()); String[] values = prefInfo.getDefaultValue().asStringArray(); - ExtendedAssert.assertEquals(new String[]{"single_pref_value"}, values); - ExtendedAssert.assertTrue(!prefInfo.isReadOnly().booleanValue()); + assertEquals(new String[]{"single_pref_value"}, values); + assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref"); - ExtendedAssert.assertEquals("multi_pref", prefInfo.getKey()); + assertEquals("multi_pref", prefInfo.getKey()); values = prefInfo.getDefaultValue().asStringArray(); - ExtendedAssert.assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); - ExtendedAssert.assertTrue(!prefInfo.isReadOnly().booleanValue()); + assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("single_pref_bis"); - ExtendedAssert.assertEquals("single_pref_bis", prefInfo.getKey()); + assertEquals("single_pref_bis", prefInfo.getKey()); values = prefInfo.getDefaultValue().asStringArray(); - ExtendedAssert.assertEquals(new String[]{"single_pref_value"}, values); - ExtendedAssert.assertTrue(prefInfo.isReadOnly().booleanValue()); + assertEquals(new String[]{"single_pref_value"}, values); + assertTrue(prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref_bis"); - ExtendedAssert.assertEquals("multi_pref_bis", prefInfo.getKey()); + assertEquals("multi_pref_bis", prefInfo.getKey()); values = prefInfo.getDefaultValue().asStringArray(); - ExtendedAssert.assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); - ExtendedAssert.assertTrue(prefInfo.isReadOnly().booleanValue()); + assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + assertTrue(prefInfo.isReadOnly().booleanValue()); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -26,8 +26,9 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.SecurityInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 6720 $ @@ -49,27 +50,27 @@ SecurityInfo secInfo = info.getSecurity(); secInfo = info.getSecurity(); - ExtendedAssert.assertEquals(2, secInfo.getTransportGuarantees().size()); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)); - //ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); + assertEquals(2, secInfo.getTransportGuarantees().size()); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)); + //assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); container = registry.getPortletApplication("/test-info").getPortletContainer("SecuredPortlet2"); info = container.getInfo(); secInfo = info.getSecurity(); - ExtendedAssert.assertEquals(3, secInfo.getTransportGuarantees().size()); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); + assertEquals(3, secInfo.getTransportGuarantees().size()); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); container = registry.getPortletApplication("/test-info").getPortletContainer("SecuredPortlet3"); info = container.getInfo(); secInfo = info.getSecurity(); - ExtendedAssert.assertEquals(2, secInfo.getTransportGuarantees().size()); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); - ExtendedAssert.assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); + assertEquals(2, secInfo.getTransportGuarantees().size()); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL)); + assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE)); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -25,8 +25,9 @@ import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.SessionInfo; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 6720 $ @@ -44,16 +45,16 @@ PortletContainer container = registry.getPortletApplication("/test-info").getPortletContainer("DistributedPortlet1"); PortletInfo info = container.getInfo(); SessionInfo sessionInfo = info.getSession(); - ExtendedAssert.assertNotNull(sessionInfo); + assertNotNull(sessionInfo); Boolean distributed = sessionInfo.getDistributed(); - ExtendedAssert.assertEquals(Boolean.TRUE, distributed); + assertEquals(Boolean.TRUE, distributed); container = registry.getPortletApplication("/test-info").getPortletContainer("DistributedPortlet2"); info = container.getInfo(); sessionInfo = info.getSession(); - ExtendedAssert.assertNotNull(sessionInfo); + assertNotNull(sessionInfo); distributed = sessionInfo.getDistributed(); - ExtendedAssert.assertEquals(Boolean.FALSE, distributed); + assertEquals(Boolean.FALSE, distributed); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionrequest; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class ActionRequestAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-actionrequest.war"); // @@ -80,6 +78,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionrequest; -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.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; @@ -32,7 +29,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionresponse; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class ActionResponseAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-actionresponse.war"); // @@ -67,6 +65,5 @@ // suite.addTest(new TestCase("EncodeURL")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.actionresponse; -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.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; @@ -32,7 +29,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portalcontext; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortalContextAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portalcontext.war"); // @@ -57,6 +55,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portalcontext; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletMode; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletconfig; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletConfigAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletconfig.war"); // @@ -62,6 +60,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletconfig; -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; @@ -32,7 +30,11 @@ import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletConfig; import javax.portlet.PortletContext; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletcontext; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletContextAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletcontext.war"); // @@ -91,6 +89,5 @@ // suite.addTest(new TestCase("PortletContextName")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletcontext; -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; @@ -32,7 +30,11 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletmode; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletModeAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletmode.war"); // @@ -58,6 +56,5 @@ // suite.addTest(new TestCase("HashCode")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletmode; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletMode; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletpreferences; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletPreferencesAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletpreferences.war"); // @@ -56,6 +54,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletpreferences; -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.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; @@ -33,7 +30,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsession; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletSessionAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletsession.war"); // @@ -77,6 +75,5 @@ // suite.addTest(new TestCase("SetAttribute")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsession; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletSession; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletSessionUtilAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portletsessionutil.war"); // @@ -47,6 +45,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletSession; import javax.portlet.PortletSessionUtil; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portleturl; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class PortletURLAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-portleturl.war"); // @@ -61,6 +59,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.portleturl; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletURL; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderrequest; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class RenderRequestAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-renderrequest.war"); // @@ -69,6 +67,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderrequest; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderresponse; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class RenderResponseAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-renderresponse.war"); // @@ -71,6 +69,5 @@ // suite.addTest(new TestCase("EncodeURL")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.renderresponse; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.windowstate; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ @@ -31,7 +29,7 @@ public class WindowStateAPITestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-api-windowstate.war"); // @@ -58,6 +56,5 @@ // suite.addTest(new TestCase("HashCode")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.api.windowstate; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -29,11 +29,13 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; -import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; -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 org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.PortletURL; import javax.portlet.RenderResponse; import javax.portlet.ActionResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -24,9 +24,6 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.util.CollectionBuilder; -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.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; @@ -38,7 +35,12 @@ import org.jboss.portal.test.portlet.framework.UTS1; import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP3; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -26,7 +26,6 @@ import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; -import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP3; @@ -39,11 +38,16 @@ 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.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 org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.Failure; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; @@ -157,7 +161,7 @@ } catch (InterruptedException e) { - return new ErrorResponse(e); + return new FailureResponse(Failure.createFailure(e)); } } }); @@ -239,7 +243,7 @@ } catch (InterruptedException e) { - return new ErrorResponse(e); + return new FailureResponse(Failure.createFailure(e)); } } }); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -29,16 +29,19 @@ import org.jboss.portal.test.framework.portlet.Joinpoint; 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.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP3; import org.jboss.portal.test.portlet.framework.UTP4; -import org.jboss.portal.test.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 org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.Failure; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; @@ -166,7 +169,7 @@ } catch (InterruptedException e) { - return new ErrorResponse(e); + return new FailureResponse(Failure.createFailure(e)); } } }); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletconfig; -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; @@ -33,7 +31,11 @@ import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet; import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet; import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletConfig; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletmode; -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.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; @@ -33,7 +30,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,12 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.ext.portletrequests; import org.jboss.portal.common.util.Tools; -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.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; import org.jboss.portal.test.framework.portlet.PortletTest; import org.jboss.portal.test.framework.portlet.PortletTestDriver; import org.jboss.portal.test.framework.portlet.PortletTestSuite; @@ -36,7 +32,13 @@ import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.remote.driver.handler.http.response.InvokePostResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,17 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.portletresponses; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.preferences; -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; import org.jboss.portal.test.framework.portlet.PortletTestSuite; @@ -34,7 +31,12 @@ import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTP4; import org.jboss.portal.test.portlet.framework.UTP3; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.session; -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.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; @@ -34,7 +31,12 @@ import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,14 +23,16 @@ package org.jboss.portal.test.portlet.jsr168.misc.log4j; import org.apache.log4j.Logger; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.dispatcher; -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.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; @@ -35,7 +32,12 @@ import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.dispatcher; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -31,7 +29,7 @@ */ public class DispatcherTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-dispatcher.war"); // @@ -125,6 +123,5 @@ // suite.addTest(new TestCase("ErrorHandling")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletconfig; -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; @@ -32,7 +30,11 @@ import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet; import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet; import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletConfig; import javax.portlet.RenderRequest; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletconfig; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -32,7 +30,7 @@ public class PortletConfigTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletconfig.war"); // @@ -48,6 +46,5 @@ // */ // suite.addTest(new TestCase("InlineValuesWithNoResourceBundleDefined")); // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletcontext; -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; @@ -35,7 +33,11 @@ import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestServlet; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletcontext; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -32,7 +30,7 @@ public class PortletContextTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletcontext.war"); // @@ -62,6 +60,5 @@ // */ // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface; -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.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; @@ -40,7 +36,14 @@ import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.PortletExceptionDuringInitPortlet; import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.RuntimeExceptionDuringInitPortlet; import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.UnavailableExceptionDuringInitPortlet; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.response.FailureResponse; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.Failure; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; @@ -360,7 +363,7 @@ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { //We shouldn't be here - return new FailureResponse("Render wasn't expected to be invoked"); + return new FailureResponse(Failure.createAssertionFailure("Render wasn't expected to be invoked")); } }); } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface; -import junit.framework.Test; - /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 5510 $ */ public class PortletInterfaceTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletinterface.war"); // @@ -107,6 +105,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,13 +22,14 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.response.EndTestResponse; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.remote.TestContext; -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; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.remote.RequestContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.PortletException; import javax.portlet.PortletSecurityException; import javax.portlet.PortletURL; @@ -59,7 +60,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, PortletSecurityException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, PortletSecurityException, IOException { if (context.getRequestCount() == 0) { @@ -91,13 +92,13 @@ else if (context.getRequestCount() == 5) { //portlets that shouldn't render itself after Exception in Action Phase - ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered); - ExtendedAssert.assertEquals(false, RuntimeExceptionDuringRequestHandlingPortlet.rendered); - ExtendedAssert.assertEquals(false, UnavailableExceptionDuringProcessActionPortlet.rendered); + assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered); + assertEquals(false, RuntimeExceptionDuringRequestHandlingPortlet.rendered); + assertEquals(false, UnavailableExceptionDuringProcessActionPortlet.rendered); //and should be destroyed because of UnavailableException was throwed - ExtendedAssert.assertEquals(true, UnavailableExceptionDuringProcessActionPortlet.destroyed); - ExtendedAssert.assertEquals(true, UnavailableExceptionDuringRenderPortlet.destroyed); + assertEquals(true, UnavailableExceptionDuringProcessActionPortlet.destroyed); + assertEquals(true, UnavailableExceptionDuringRenderPortlet.destroyed); // return new EndTestResponse(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,14 +22,16 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -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; import org.jboss.portal.test.framework.portlet.PortletTestContext; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.PortletException; import javax.portlet.PortletMode; import javax.portlet.PortletURL; @@ -86,7 +88,7 @@ } case 1: { - ExtendedAssert.assertNull(rendered); + assertNull(rendered); // Invoking EDIT mode PortletURL url = resp.createRenderURL(); @@ -96,7 +98,7 @@ } case 2: { - ExtendedAssert.assertNull(rendered); + assertNull(rendered); // Invoking HELP mode PortletURL url = resp.createRenderURL(); @@ -106,13 +108,13 @@ } case 3: { - ExtendedAssert.assertNull(rendered); + assertNull(rendered); // return new EndTestResponse(); } default: - return new ErrorResponse(); + return new FailureResponse(Failure.createAssertionFailure("")); } } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.RequestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(2)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.RequestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -59,7 +59,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(3)) { @@ -68,7 +68,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.RequestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(4)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.RequestContext; import javax.portlet.PortletException; import javax.portlet.RenderRequest; @@ -52,7 +52,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, RequestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletmode; -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.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; @@ -32,7 +29,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.Portlet; import javax.portlet.PortletMode; import javax.portlet.PortletModeException; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletmode; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -31,7 +29,7 @@ */ public class PortletModeTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletmode.war"); // @@ -54,6 +52,5 @@ // //suite.addTest(new TestCase("NotInvokeModeDeclaredForNotSupportedMarkup")); // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -24,12 +24,14 @@ import org.jboss.portal.test.framework.portlet.components.AbstractTestGenericPortlet; 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.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.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.Failure; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.PortletException; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; @@ -97,7 +99,7 @@ } case 1: { - ExtendedAssert.assertEquals("doView", methodCall); + assertEquals("doView", methodCall); // Invoking EDIT mode PortletURL url = resp.createRenderURL(); @@ -106,7 +108,7 @@ } case 2: { - ExtendedAssert.assertEquals("doEdit", methodCall); + assertEquals("doEdit", methodCall); // Invoking HELP mode PortletURL url = resp.createRenderURL(); @@ -115,13 +117,13 @@ } case 3: { - ExtendedAssert.assertEquals("doHelp", methodCall); + assertEquals("doHelp", methodCall); // return new EndTestResponse(); } default: - return new ErrorResponse(); + return new FailureResponse(Failure.createAssertionFailure("")); } } finally Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletrequests; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5510 $ */ public class PortletRequestTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletrequests.war"); // @@ -103,6 +101,5 @@ // */ // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletrequests; -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.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; @@ -33,7 +30,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletresponses; -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.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; @@ -36,7 +32,14 @@ import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; import org.jboss.portal.test.portlet.framework.UTS2; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.driver.response.FailureResponse; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.Failure; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; @@ -376,7 +379,7 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - return new FailureResponse("Render wasn't expected to be called"); + return new FailureResponse(Failure.createAssertionFailure("Render wasn't expected to be called")); } }); } @@ -503,7 +506,7 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { - return new FailureResponse("Render wasn't expected"); + return new FailureResponse(Failure.createAssertionFailure("Render wasn't expected")); } }); } @@ -756,7 +759,7 @@ { protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException { - return new FailureResponse("Redirection shouldn't be made"); + return new FailureResponse(Failure.createAssertionFailure("Redirection shouldn't be made")); } }); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletresponses; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -31,7 +29,7 @@ */ public class PortletResponsesTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletresponses.war"); // @@ -136,8 +134,5 @@ // */ // suite.addTest(new TestCase("NamespaceEncoding")); // return suite; - return null; } - - } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletsession; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -45,7 +45,7 @@ try { session.getAttribute("doesnotexist"); - ExtendedAssert.fail(); + fail(); } catch (IllegalStateException expected) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletsession; -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.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; @@ -36,7 +33,12 @@ import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; import org.jboss.portal.test.portlet.framework.UTS1; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletsession; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5510 $ */ public class PortletSessionTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portletsession.war"); // @@ -76,6 +74,5 @@ // */ // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portleturl; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5510 $ */ public class PortletURLTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-portleturl.war"); // @@ -75,6 +73,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portleturl; -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.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; @@ -32,7 +29,12 @@ import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction; import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.preferences; -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.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; @@ -41,7 +38,12 @@ import org.jboss.portal.test.portlet.framework.UTP8; import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.CreateASingleInstanceOfValidatorValidator; import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.ValidationStoresValidator; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import static org.jboss.unit.api.Assert.*; + import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.Portlet; Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.preferences; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -31,7 +29,7 @@ */ public class PreferencesTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-preferences.war"); // @@ -116,6 +114,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.windowstates; -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.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; @@ -33,7 +29,14 @@ import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTP2; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.Failure; + import javax.portlet.Portlet; import javax.portlet.PortletURL; import javax.portlet.RenderRequest; @@ -71,7 +74,7 @@ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) { //if portlet was invoked we will have failure - return new FailureResponse("Render wasn't expected"); + return new FailureResponse(Failure.createAssertionFailure("Render wasn't expected")); } }); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.windowstates; -import junit.framework.Test; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a> @@ -31,7 +29,7 @@ */ public class WindowStatesTestSuite { - public static Test suite() + public static void suite() { // TestSuite suite = new TestSuite("test-jsr168-windowstates.war"); // @@ -44,6 +42,5 @@ // // // return suite; - return null; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -23,20 +23,24 @@ package org.jboss.portal.test.portlet.navigation; -import junit.framework.TestCase; import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.unit.api.pojo.annotations.Test; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 5976 $ * @since 2.4 (Apr 30, 2006) */ -public class StateStringTestCase extends TestCase +@Test +public class StateStringTestCase { public static final String NAME1 = "param1"; public static final String VALUE1 = "value1"; public static final String VALUE2 = "value2"; + @Test public void testNavigationalState() throws Exception { PortletParametersStateString ns = new PortletParametersStateString(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,13 +22,11 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.session; -import junit.framework.TestCase; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5448 $ */ -public class SessionSynchronizationTestCase extends TestCase +public class SessionSynchronizationTestCase { public SessionSynchronizationTestCase() @@ -36,12 +34,6 @@ System.out.println("SessionSynchronizationTestCase"); } - public SessionSynchronizationTestCase(String string) - { - super(string); - System.out.println("SessionSynchronizationTestCase: " + string); - } - public void testA() { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import junit.framework.TestCase; import org.jboss.portal.common.util.CollectionBuilder; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.value.StringValue; @@ -44,9 +43,10 @@ import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.PropertyContext; -import org.jboss.portal.test.portlet.state.ValueMapAssert; -import org.jboss.portal.test.portlet.state.PortletSupport; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; + import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -58,7 +58,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public abstract class AbstractStatefulPortletInvokerTestCase extends TestCase +public abstract class AbstractStatefulPortletInvokerTestCase { /** @@ -194,6 +194,7 @@ return createPOPRef(info); } + @Test public void testCloneWithNullContext() throws Exception { try @@ -207,6 +208,7 @@ assertNoExistingState(); } + @Test public void testCloneNonExistingPOP() throws Exception { PortletContext popCtx = createNonExistingPOPRef(); @@ -221,6 +223,7 @@ assertNoExistingState(); } + @Test public void testCloneNonExistingCCP() throws Exception { PortletContext ccpCtx = createNonExistingLocalCCPRef(); @@ -235,6 +238,7 @@ assertNoExistingState(); } +// @Test // public void testCloneInvalidCCP() throws Exception // { // PortletContext ccpCtx = getProducer().wrapCCP("InvalidPortletId"); @@ -249,6 +253,7 @@ // assertNoExistingState(); // } + @Test public void testCloneInvalidPOP() throws Exception { PortletContext popCtx = createInvalidPOPRef(); @@ -263,6 +268,7 @@ assertNoExistingState(); } + @Test public void testClonePortlet() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -284,7 +290,7 @@ Portlet ccp1 = getPortlet(ccp1Ctx); LocalizedString abc = ccp1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); assertEquals("MyPortlet", abc.getString(Locale.ENGLISH, true)); - assertEquals(ccp1Ctx, ccp1.getContext()); + _assertEquals(ccp1Ctx, ccp1.getContext()); // Update state PropertyChange[] changes = new PropertyChange[]{PropertyChange.newUpdate("ghi", new StringValue("jkl"))}; @@ -306,6 +312,7 @@ assertEquals("MyPortlet", def.getString(Locale.ENGLISH, true)); } + @Test public void testGetWithNullId() throws Exception { try @@ -318,6 +325,7 @@ } } + @Test public void testGetNonExistingPOP() throws Exception { PortletContext pop = createNonExistingPOPRef(); @@ -331,6 +339,7 @@ } } + @Test public void testGetNonExistingCCP() throws Exception { PortletContext ccpCtx = createNonExistingLocalCCPRef(); @@ -344,6 +353,7 @@ } } + @Test public void testGetInvalidPOP() throws Exception { PortletContext popCtx = createInvalidPOPRef(); @@ -357,6 +367,7 @@ } } +// @Test // public void testGetInvalidCCP() throws Exception // { // PortletContext ccpId = getProducer().wrapCCP("InvalidPortletId"); @@ -370,6 +381,7 @@ // } // } + @Test public void testDestroyWithNullId() throws Exception { try @@ -382,6 +394,7 @@ } } + @Test public void testDestroyPOP() throws Exception { PortletContext popCtx = createPOPRef(); @@ -391,6 +404,7 @@ assertEquals(getPortletId(popCtx), failure.getPortletId()); } + @Test public void testDestroyCCP() throws Exception { PortletContext popCtx = createPOPRef(); @@ -400,6 +414,7 @@ assertNoExistingState(); } +// @Test // public void testDestroyInvalidCCP() throws Exception // { // PortletContext ccpId = getProducer().wrapCCP("PortletId"); @@ -409,6 +424,7 @@ // assertEquals(ccpId.getId(), failure.getPortletId()); // } + @Test public void testDestroyNonExistingCCP() throws Exception { PortletContext ccpCtx = createNonExistingLocalCCPRef(); @@ -418,6 +434,7 @@ assertEquals(getPortletId(ccpCtx), failure.getPortletId()); } + @Test public void testGetPropertiesWithNullPortlet() throws Exception { try @@ -438,6 +455,7 @@ } } + @Test public void testGetNonExistingPOPProperties() throws Exception { PortletContext popCtx = createNonExistingPOPRef(); @@ -459,6 +477,7 @@ } } + @Test public void testGetInvalidPOPProperties() throws Exception { PortletContext popCtx = createInvalidPOPRef(); @@ -480,6 +499,7 @@ } } + @Test public void testGetNonExistingCCPProperties() throws Exception { PortletContext ccpCtx = createNonExistingLocalCCPRef(); @@ -501,6 +521,7 @@ } } +// @Test // public void testGetInvalidCCPProperties() throws Exception // { // PortletContext ccpId = getProducer().wrapCCP("InvalidPortletId"); @@ -522,6 +543,7 @@ // } // } + @Test public void testGetPOPWithNullKeys() throws Exception { PortletContext popCtx = createPOPRef(); @@ -535,6 +557,7 @@ } } + @Test public void testGetCCPWithNullKeys() throws Exception { PortletContext ccpCtx = createLocalCCPRef(); @@ -548,6 +571,7 @@ } } + @Test public void testGetPOPProperties() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -569,6 +593,7 @@ ValueMapAssert.assertEquals(expectedProps, props); } + @Test public void testGetCCPProperties() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -603,6 +628,7 @@ ValueMapAssert.assertEquals(expectedProps, props); } + @Test public void testSetPropertiesWithNullId() throws Exception { try @@ -615,6 +641,7 @@ } } + @Test public void testSetPropertiesWithNullProperties() throws Exception { PortletContext ccpCtx = createLocalCCPRef(); @@ -628,6 +655,7 @@ } } + @Test public void testSetPOPProperties() throws Exception { PortletContext popCtx = createPOPRef(); @@ -641,6 +669,7 @@ } } + @Test public void testSetNonExistingCCPProperties() throws Exception { PortletContext ccpCtx = createNonExistingLocalCCPRef(); @@ -654,6 +683,7 @@ } } + @Test public void testSetCCPProperties() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -708,6 +738,7 @@ ValueMapAssert.assertEquals(expectedProps, ccpProps); } + @Test public void testInvokeCloneBeforeWriteWithUpdate() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -738,6 +769,7 @@ ValueMapAssert.assertEquals(expectedProps, blah); } + @Test public void testInvokeReadOnlyWithUpdate() throws Exception { final Boolean[] ise = {Boolean.FALSE}; @@ -773,6 +805,7 @@ assertEquals(Boolean.TRUE, ise[0]); } + @Test public void testInvokeReadWriteWithUpdate() throws Exception { PortletInfoSupport info = new PortletInfoSupport(); @@ -806,7 +839,7 @@ ValueMapAssert.assertEquals(expectedProps, blah); } - private void assertEquals(PortletContext expected, PortletContext actual) + private void _assertEquals(PortletContext expected, PortletContext actual) { if (expected == null) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -41,6 +41,9 @@ import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.common.value.Value; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; + import java.util.Collections; import java.util.List; import java.util.Set; @@ -81,7 +84,8 @@ /** . */ protected StateConverter stateConverter; - protected void setUp() throws Exception + @Create + public void setUp() throws Exception { consumer = new ConsumerPortletInvoker(); consumerPersistenceManager = new ConsumerPersistenceManagerService(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -39,6 +39,9 @@ import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.common.value.Value; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; + import java.util.Collections; import java.util.List; import java.util.Set; @@ -73,7 +76,8 @@ /** . */ protected StateConverter stateConverter; - protected void setUp() throws Exception + @Create + public void create() throws Exception { producer = new ProducerPortletInvoker(); container = new PortletInvokerSupport(); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import junit.framework.TestCase; import org.jboss.portal.common.value.StringValue; import org.jboss.portal.portlet.impl.state.StateConverterV0; import org.jboss.portal.portlet.state.PropertyMap; @@ -30,17 +29,21 @@ import org.jboss.portal.portlet.state.StateConversionException; import org.jboss.portal.portlet.state.StateConverter; import org.jboss.portal.portlet.state.producer.PortletState; -import org.jboss.portal.test.portlet.state.ValueMapAssert; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class StateConverterV0TestCase extends TestCase +@Test +public class StateConverterV0TestCase { private final StateConverter converter = new StateConverterV0(); + @Test public void testIAE() throws StateConversionException { try @@ -61,6 +64,7 @@ } } + @Test public void testAlteredMagic() throws StateConversionException { byte[] bytes = converter.marshall(new PortletState("foo")); @@ -78,6 +82,7 @@ } } + @Test public void testBadVersionNumber() throws StateConversionException { byte[] bytes = converter.marshall(new PortletState("foo")); @@ -92,6 +97,7 @@ } } + @Test public void testWorks() throws Exception { assertWorks(new PortletState("foo")); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,18 +22,19 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import junit.framework.Assert; import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import java.util.HashSet; import java.util.Iterator; +import org.jboss.unit.api.Assert; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5448 $ */ -public class ValueMapAssert extends Assert +public class ValueMapAssert { public static void assertEquals(PropertyMap vm1, PropertyMap vm2) { @@ -41,22 +42,22 @@ { if (vm2 != null) { - fail("Value map should be null"); + Assert.fail("Value map should be null"); } } else { if (vm2 == null) { - fail("Value map should not be null"); + Assert.fail("Value map should not be null"); } - assertEquals("Value maps don't have the same keys", new HashSet(vm1.keySet()), new HashSet(vm2.keySet())); + Assert.assertEquals("Value maps don't have the same keys", new HashSet(vm1.keySet()), new HashSet(vm2.keySet())); for (Iterator i = vm1.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); Value v1 = vm1.getProperty(key); Value v2 = vm2.getProperty(key); - assertEquals("Values for key " + key + " are not equals", v1, v2); + Assert.assertEquals("Values for key " + key + " are not equals", v1, v2); } } } Added: modules/portlet/trunk/portlet/src/resources/test/local-jboss-unit.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/local-jboss-unit.xml (rev 0) +++ modules/portlet/trunk/portlet/src/resources/test/local-jboss-unit.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.state.RemoteStoreConsumerStatefulPortletInvokerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.state.StateConverterV0TestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.PortletRequestEncoderTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.ParametersTestCase"/> + </test> + <test> + <class name="org.jboss.portal.test.portlet.PropertiesTestCase"/> + </test> + </pojo> +</jboss-unit> Added: modules/portlet/trunk/portlet/src/resources/test/remote-jboss-unit.xml =================================================================== --- modules/portlet/trunk/portlet/src/resources/test/remote-jboss-unit.xml (rev 0) +++ modules/portlet/trunk/portlet/src/resources/test/remote-jboss-unit.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + + <!--Spec TCK Assertions tests--> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-dispatcher.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletconfig.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletcontext.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletinterface.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletmode.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletrequests.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletresponses.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portletsession.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-portleturl.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-preferences.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-windowstates.war"/> + </generic> + + <!--API Tests--> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-actionrequest.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-actionresponse.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portalcontext.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletconfig.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletcontext.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletmode.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletpreferences.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletsession.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portletsessionutil.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-portleturl.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-renderrequest.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-renderresponse.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-api-windowstate.war"/> + </generic> + + <!--Ext Tests--> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-dispatcher.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-portletconfig.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-portletmode.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-portletrequests.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-portletresponses.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-preferences.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-session.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-expiringcache.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-neverexpiringcache.war"/> + </generic> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-ext-nocache.war"/> + </generic> + + <!--Misc Tests--> +<!-- + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + <property name="archiveId" value="test-jsr168-misc-log4j.war"/> + </generic> +--> + +</jboss-unit> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/build.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -98,7 +98,6 @@ <path refid="jboss.jbossxb.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="junit.junit.classpath"/> </path> <!-- Configure modules --> @@ -158,26 +157,93 @@ <fileset dir="${build.classes}"/> </jar> + <filelist id="mc.concurrent" dir="${oswego.concurrent.lib}"> + <file name="concurrent.jar"/> + </filelist> + <filelist id="mc.trove" dir="${trove.trove.lib}"> + <file name="trove.jar"/> + </filelist> + <filelist id="mc.xerces" dir="${apache.xerces.lib}"> + <file name="xercesImpl.jar"/> + <file name="resolver.jar"/> + <file name="xml-apis.jar"/> + </filelist> + <filelist id="mc.javassist" dir="${javassist.javassist.lib}"> + <file name="javassist.jar"/> + </filelist> + <filelist id="mc.jboss_common_logging_spi" dir="${jboss/common.logging.spi.lib}"> + <file name="jboss-logging-spi.jar"/> + </filelist> + <filelist id="mc.jboss_common_logging_jdk" dir="${jboss/common.logging.jdk.lib}"> + <file name="jboss-logging-jdk.jar"/> + </filelist> + <filelist id="mc.jboss_common_logging_log4j" dir="${jboss/common.logging.log4j.lib}"> + <file name="jboss-logging-log4j.jar"/> + </filelist> + <filelist id="mc.jboss_common_core" dir="${jboss/common.core.lib}"> + <file name="jboss-common-core.jar"/> + </filelist> + <filelist id="mc.jboss_vfs" dir="${jboss/jboss.vfs.lib}"> + <file name="jboss-vfs.jar"/> + </filelist> + <filelist id="mc.jboss_xb" dir="${jboss.jbossxb.lib}"> + <file name="jboss-xml-binding.jar"/> + </filelist> + <filelist id="mc.jboss_aop" dir="${jboss.aop.lib}"> + <file name="jboss-aop-as4-deployer.jar"/> + <file name="jboss-aop-deployer-jdk50.jar"/> + <file name="jboss-aop-jdk50.jar"/> + <file name="jboss-aop-jdk50-client.jar"/> + <file name="jboss-standalone-aspect-library-jdk50.jar"/> + <file name="jrockit-pluggable-instrumentor.jar"/> + <file name="pluggable-instrumentor.jar"/> + </filelist> + <filelist id="mc.jboss_microcontainer" dir="${jboss.microcontainer.lib}"> + <file name="jboss-aop-mc-int.jar"/> + <file name="jboss-classloader.jar"/> + <file name="jboss-container.jar"/> + <file name="jboss-container-metadata.jar"/> + <file name="jboss-container-metadata-spi.jar"/> + <file name="jboss-dependency.jar"/> + <file name="jboss-deployers-core.jar"/> + <file name="jboss-deployers-core-spi.jar"/> + <file name="jboss-deployers-client.jar"/> + <file name="jboss-deployers-client-spi.jar"/> + <file name="jboss-deployers-impl.jar"/> + <file name="jboss-deployers-spi.jar"/> + <file name="jboss-deployers-structure-spi.jar"/> + <file name="jboss-deployers-vfs.jar"/> + <file name="jboss-deployers-vfs-spi.jar"/> + <file name="jboss-managed.jar"/> + <file name="jboss-metatype.jar"/> + <file name="jboss-kernel.jar"/> + </filelist> + <!-- JBoss 4.2 portlet-test.war --> <copy todir="${build.resources}/jboss-4.2/portlet-test-war/WEB-INF/lib"> + + <!-- --> <fileset dir="${build.lib}" includes="portlet-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar,portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> - <fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.core.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.logging.log4j.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.logging.spi.lib}" includes="*.jar"/> - <fileset dir="${jboss.aop.lib}" includes="*.jar"/> - <fileset dir="${jboss.jbossxb.lib}" includes="*.jar"/> - <fileset dir="${jboss/jboss.vfs.lib}" includes="*.jar"/> - <fileset dir="${javassist.javassist.lib}" includes="*.jar"/> - <fileset dir="${apache.xerces.lib}" includes="*.jar"/> - <fileset dir="${wutka.dtdparser.lib}" includes="*.jar"/> - <fileset dir="${oswego.concurrent.lib}" includes="*.jar"/> - <fileset dir="${trove.trove.lib}" includes="*.jar"/> + <!-- Remote plugin --> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> + <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/> + <!-- MC 2.0.0.Beta4 --> + <filelist refid="mc.trove"/> + <filelist refid="mc.javassist"/> + <filelist refid="mc.jboss_common_logging_spi"/> + <filelist refid="mc.jboss_common_logging_jdk"/> + <filelist refid="mc.jboss_common_logging_log4j"/> + <filelist refid="mc.jboss_common_core"/> + <filelist refid="mc.jboss_vfs"/> + <filelist refid="mc.jboss_xb"/> + <filelist refid="mc.jboss_aop"/> + <filelist refid="mc.jboss_microcontainer"/> + </copy> <mkdir dir="${build.lib}/jboss-4.2"/> <jar jarfile="${build.lib}/jboss-4.2/portlet-test.war" manifest="${build.etc}/portal-test-lib-jar.mf"> @@ -187,25 +253,28 @@ <!-- Tomcat 6.0 portlet-test.war --> <copy todir="${build.resources}/tomcat-6.0/portlet-test-war/WEB-INF/lib"> + + <!-- --> <fileset dir="${build.lib}" includes="portlet-test-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar,portal-common-mc-lib.jar"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> - <fileset dir="${jboss.remoting.lib}" includes="*.jar"/> + <!-- Remote plugin --> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> + <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/> - <fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.core.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.logging.log4j.lib}" includes="*.jar"/> - <fileset dir="${jboss/common.logging.spi.lib}" includes="*.jar"/> - <fileset dir="${jboss.aop.lib}" includes="*.jar"/> - <fileset dir="${jboss.jbossxb.lib}" includes="*.jar"/> - <fileset dir="${jboss/jboss.vfs.lib}" includes="*.jar"/> - <fileset dir="${javassist.javassist.lib}" includes="*.jar"/> - <fileset dir="${apache.xerces.lib}" includes="*.jar"/> - <fileset dir="${wutka.dtdparser.lib}" includes="*.jar"/> - <fileset dir="${oswego.concurrent.lib}" includes="*.jar"/> - <fileset dir="${trove.trove.lib}" includes="*.jar"/> + <!-- MC 2.0.0.Beta4 --> + <filelist refid="mc.trove"/> + <filelist refid="mc.xerces"/> + <filelist refid="mc.javassist"/> + <filelist refid="mc.jboss_common_logging_spi"/> + <filelist refid="mc.jboss_common_logging_jdk"/> + <filelist refid="mc.jboss_common_core"/> + <filelist refid="mc.jboss_vfs"/> + <filelist refid="mc.jboss_xb"/> + <filelist refid="mc.jboss_aop"/> + <filelist refid="mc.jboss_microcontainer"/> </copy> <mkdir dir="${build.lib}/tomcat-6.0"/> @@ -279,9 +348,10 @@ wait="${cargo.wait}"> <sharedClasspath> <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> - <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> <path location="${jboss.portal/modules/web.lib}/portal-web-lib.jar"/> - <path location="${junit.junit.lib}/junit.jar"/> + <path location="${jboss.portal/modules/test.lib}/jboss-unit-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/jboss-unit-remote-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> <path location="${jboss.portal-portlet-jsr168api.lib}/portal-portlet-jsr168api-lib.jar"/> </sharedClasspath> <configuration> @@ -357,18 +427,19 @@ wait="${cargo.wait}"> <sharedClasspath> <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/jboss-unit-lib.jar"/> + <path location="${jboss.portal/modules/test.lib}/jboss-unit-remote-lib.jar"/> <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> <path location="${jboss.portal/modules/web.lib}/portal-web-lib.jar"/> - <path location="${junit.junit.lib}/junit.jar"/> <path location="${jboss.portal-portlet-jsr168api.lib}/portal-portlet-jsr168api-lib.jar"/> <path location="${apache.log4j.lib}/log4j.jar"/> <path location="${oswego.concurrent.lib}/concurrent.jar"/> <path location="${sun.jaf.lib}/activation.jar"/> - <path location="${junit.junit.lib}/junit.jar"/> </sharedClasspath> <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> + <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>--> <property name="cargo.tomcat.connector.emptySessionPath" value="true"/> <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> <deployable type="war" file="${build.lib}/tomcat-6.0/portlet-test.war"/> @@ -424,331 +495,110 @@ <target name="tests.remote" depends="init"> - <execute-tests> - <x-test> + <path id="jboss.unit.tooling.test.classpath"> + <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> + </path> - <!--Spec TCK Assertions tests--> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-dispatcher.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletconfig.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletcontext.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletinterface.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletmode.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletrequests.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletresponses.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portletsession.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-portleturl.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-preferences.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-windowstates.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> + <taskdef + name="jboss-unit" + classname="org.jboss.unit.tooling.ant.JBossUnitTask" + classpathref="jboss.unit.tooling.test.classpath"/> - <!--API Tests--> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletmode.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletsession.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-portleturl.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-api-windowstate.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> + <jboss-unit> - <!--Ext Tests--> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-preferences.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-session.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-ext-nocache.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> + <tests config="${jboss.portal-portlet.root}/resources/test/remote-jboss-unit.xml"> + <property name="archivePath" value="${jboss.portal-portlet.root}/lib"/> + <property name="serverName" value="${server.name}"/> + </tests> - <!--Misc Tests--> -<!-- - <zest todir="${test.reports}" - name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" - id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase,${test.id}"> - <parameter name="archive" value="test-jsr168-misc-log4j.war"/> - <parameter name="serverName" value="${server.name}"/> - </zest> ---> + <reports> + <xml toDir="output/tests/xml/${server.name}"/> + <html toDir="output/tests/html/${server.name}"/> + </reports> - </x-test> - <x-sysproperty> - <sysproperty key="test.root" value="${jboss.portal-portlet.root}/lib"/> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - </x-sysproperty> - <x-classpath> + <classpath> + <pathelement location="${build.resources}/test"/> + <path refid="jboss.portal/modules/common.classpath"/> + <pathelement location="${build.lib}/portal-web-lib.jar"/> + <pathelement location="${build.lib}/portal-web-test-lib.jar"/> + + <path refid="jboss.portal/modules/test.classpath"/> + <path location="../tools/lib/ant.jar"/> + <path location="../tools/lib/ant-launcher.jar"/> + + <path refid="apache.log4j.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.remoting.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.aop.classpath"/> - <path refid="javassist.javassist.classpath"/> + <path refid="jboss/jboss.vfs.classpath"/> + <path refid="jboss/common.core.classpath"/> + <path refid="jboss/common.logging.log4j.classpath"/> + <path refid="jboss/common.logging.jdk.classpath"/> + <path refid="jboss/common.logging.spi.classpath"/> <path refid="trove.trove.classpath"/> + <path refid="javassist.javassist.classpath"/> + <path refid="jboss.jbossxb.classpath"/> + <path refid="apache.xerces.classpath"/> <path refid="apache.httpclient.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> - <pathelement location="${build.resources}/test"/> <path refid="codehaus.cargo.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="apache.xerces.classpath"/> - <pathelement location="${source.java}"/> - <pathelement location="${jboss.portal-portlet.root}/classes"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - </x-classpath> - </execute-tests> + </classpath> + </jboss-unit > + </target> <target name="tests.local" depends="init"> - <execute-tests> - <x-test> - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.EncoderTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.url.DecoderTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.portlet.test.StringCodecTestCase"/> - </x-test> - <x-sysproperty> -<!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> ---> - </x-sysproperty> - <x-classpath> + + <path id="jboss.unit.tooling.test.classpath"> + <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> + </path> + + <taskdef + name="jboss-unit" + classname="org.jboss.unit.tooling.ant.JBossUnitTask" + classpathref="jboss.unit.tooling.test.classpath"/> + + <jboss-unit> + + <tests config="${build.resources}/test/local-jboss-unit.xml"> + </tests> + + <reports> + <xml toDir="output/tests/xml/local"/> + <html toDir="output/tests/html/local"/> + </reports> + + <classpath> + + <path refid="jboss.portal/modules/test.classpath"/> + <path location="../tools/lib/ant.jar"/> + <path location="../tools/lib/ant-launcher.jar"/> + <path refid="oswego.concurrent.classpath"/> - <path refid="jboss.remoting.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.aop.classpath"/> - <path refid="javassist.javassist.classpath"/> + <path refid="jboss/jboss.vfs.classpath"/> + <path refid="jboss/common.core.classpath"/> + <path refid="jboss/common.logging.log4j.classpath"/> + <path refid="jboss/common.logging.jdk.classpath"/> + <path refid="jboss/common.logging.spi.classpath"/> <path refid="trove.trove.classpath"/> - <path refid="apache.httpclient.classpath"/> - <path refid="apache.logging.classpath"/> - <path refid="apache.codec.classpath"/> - <path refid="codehaus.cargo.classpath"/> + <path refid="javassist.javassist.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="apache.xerces.classpath"/> - <!--<path refid="jbossas/core.libs.classpath"/>--> - <pathelement location="${source.java}"/> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <pathelement location="${jboss.portal-portlet.root}/classes"/> + <path refid="apache.codec.classpath"/> + <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> - </x-classpath> - </execute-tests> + <pathelement location="${build.classes}"/> + + </classpath> + + </jboss-unit > + </target> </project> Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -77,6 +77,19 @@ /** . */ private final Map registrationContextMap = new HashMap(); + /** . */ + private Object driver; + + public Object getDriver() + { + return driver; + } + + public void setDriver(Object driver) + { + this.driver = driver; + } + public PortletApplicationRegistry getRegistry() { return registry; @@ -116,6 +129,10 @@ private void add(WebApp webApp) { + // Set the driver for the web app + webApp.getServletContext().setAttribute("TestDriverServer", driver); + + // PortletApplicationMetaData metaData = buildPortletApplicationMetaData(webApp); if (metaData != null) { Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -45,6 +45,9 @@ import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.PropertyMetaData; +import org.jboss.beans.metadata.spi.ParameterMetaData; +import org.jboss.beans.metadata.spi.InstallMetaData; import org.apache.log4j.Logger; import javax.servlet.ServletContext; @@ -109,23 +112,23 @@ bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); - bmd.setProperties(Collections.singleton(new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id)))); + bmd.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(id)))); AbstractInstallMetaData deployerinstallmd = new AbstractInstallMetaData(); deployerinstallmd.setBean("PortletApplicationDeployer"); - deployerinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + deployerinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); deployerinstallmd.setMethodName("installPortletContainer"); AbstractInstallMetaData applicationinstallmd = new AbstractInstallMetaData(); applicationinstallmd.setBean(id); - applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationinstallmd.setMethodName("addContainer"); bmd.setInstalls(new CollectionBuilder().add(deployerinstallmd).add(applicationinstallmd).toArrayList()); AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData(); deployeruninstallmd.setBean("PortletApplicationDeployer"); - deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); deployeruninstallmd.setMethodName("uninstallPortletContainer"); AbstractInstallMetaData applicationuninstallmd = new AbstractInstallMetaData(); applicationuninstallmd.setBean(id); - applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); applicationuninstallmd.setMethodName("removeContainer"); bmd.setUninstalls(new CollectionBuilder().add(deployeruninstallmd).add(applicationuninstallmd).toArrayList()); try @@ -154,14 +157,14 @@ bmd.setStop(new AbstractLifecycleMetaData("stop")); AbstractInstallMetaData installmd = new AbstractInstallMetaData(); installmd.setBean("PortletApplicationDeployer"); - installmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + installmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); installmd.setMethodName("installPortletApplication"); - bmd.setInstalls(Collections.singletonList(installmd)); + bmd.setInstalls(Collections.singletonList((InstallMetaData)installmd)); AbstractInstallMetaData uninstallmd = new AbstractInstallMetaData(); uninstallmd.setBean("PortletApplicationDeployer"); - uninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); + uninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); uninstallmd.setMethodName("uninstallPortletApplication"); - bmd.setUninstalls(Collections.singletonList(uninstallmd)); + bmd.setUninstalls(Collections.singletonList((InstallMetaData)uninstallmd)); // try Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,17 +22,20 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import junit.framework.TestCase; +import org.jboss.unit.api.pojo.annotations.Test; +import static org.jboss.unit.api.Assert.*; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class StringCodecTestCase extends TestCase +public class StringCodecTestCase { private static final char EURO_CHAR = '\u20AC'; + @Test public void testA() { @@ -46,6 +49,7 @@ } + @Test public void testB() { assertEquals("ABCDEFGHIJKLMNOPQRSTUVWXYZ", StringCodec.decode(StringCodec.encode("ABCDEFGHIJKLMNOPQRSTUVWXYZ"))); Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.deployment; -import junit.framework.TestCase; import org.jboss.portal.common.transaction.Transactions; import org.jboss.portal.common.net.URLTools; import org.jboss.portal.portlet.TransportGuarantee; @@ -40,13 +39,17 @@ import java.net.URL; import java.util.Locale; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 7379 $ */ -public class UnmarshallerTestCase extends TestCase +public class UnmarshallerTestCase { + @Test public void testJBossPortletXML() throws Exception { URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); @@ -91,6 +94,7 @@ assertTrue(remotable.booleanValue()); } + @Test public void testPortletXML() throws Exception { URL portletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/portlet.xml"); Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/DecoderTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/DecoderTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/DecoderTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,26 +22,30 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.url; -import junit.framework.TestCase; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.common.junit.ExtendedAssert; import java.util.ArrayList; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class DecoderTestCase extends TestCase +public class DecoderTestCase { Tester tester; - protected void setUp() throws Exception + @Create + public void setUp() throws Exception { tester = new Tester(); } + @Test public void testNoMeta() { tester.assertActual(0); @@ -59,12 +63,14 @@ tester.checkAndReset(); } + @Test public void testNoMetaCorruption() { tester.parameter("action", "a").assertFailed().checkAndReset(); tester.parameter("action", "1").assertFailed().checkAndReset(); } + @Test public void testOneMeta() { tester.builder.addMetaParameter("m1"); @@ -125,6 +131,7 @@ tester.checkAndReset(); } + @Test public void testOneMetaCorruption() { tester.builder.addMetaParameter("m1"); @@ -139,6 +146,7 @@ tester.parameter("action", "10").parameter("m1", "foo").assertFailed().checkAndReset(); } + @Test public void testTwoMeta() { tester.builder.addMetaParameter("m1"); @@ -344,7 +352,7 @@ public void doAssert() { assertFalse(failed); - ExtendedAssert.assertEquals(values, actualParameters.getValues(name)); + assertEquals(values, actualParameters.getValues(name)); } }); return this; @@ -368,7 +376,7 @@ public void doAssert() { assertFalse(failed); - ExtendedAssert.assertEquals(values, metaParameters.getValues(name)); + assertEquals(values, metaParameters.getValues(name)); } }); return this; Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/EncoderTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/EncoderTestCase.java 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/url/EncoderTestCase.java 2007-10-23 07:31:22 UTC (rev 8746) @@ -22,43 +22,48 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.url; -import junit.framework.TestCase; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.common.junit.ExtendedAssert; +import static org.jboss.unit.api.Assert.*; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class EncoderTestCase extends TestCase +public class EncoderTestCase { Tester tester; - protected void setUp() throws Exception + @Create + public void setUp() throws Exception { tester = new Tester(); } + @Test public void testEncodeNoMeta() { ParameterMap result = tester.encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"0"}, result.getValues("action")); // tester.actual("action", "foo"); result = tester.encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0","foo"}, result.getValues("action")); + assertEquals(new String[]{"0","foo"}, result.getValues("action")); // tester.meta("action", "foo"); result = tester.encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"0"}, result.getValues("action")); } + @Test public void testEncodeOneMeta() { tester.meta("m1"); @@ -66,30 +71,31 @@ // ParameterMap result = tester.encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"0"}, result.getValues("action")); // tester.meta("m1", "foo"); result = tester.encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); // tester.actual("m1", "foo"); result = tester.encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); // tester.meta("m1", "bar").actual("m1", "foo"); result = tester.encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"bar","foo"}, result.getValues("m1")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"bar","foo"}, result.getValues("m1")); } + @Test public void testEncodeTwoMeta() { tester.meta("m1"); @@ -100,464 +106,464 @@ // ParameterMap result = tester.encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"0"}, result.getValues("action")); // result = tester.meta("m1", "foo").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); // result = tester.meta("m2", "foo").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); // result = tester.meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); // result = tester.meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); // result = tester.meta("m3", "zuu").encode(); assertEquals(1, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"0"}, result.getValues("action")); // result = tester.meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); // result = tester.meta("m1", "foo").meta("m2", "bar").meta("m2", "bar").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); // {m1} actual parameter // result = tester.actual("m1", "a").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); // result = tester.actual("m1", "a").meta("m1", "foo").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); // result = tester.actual("m1", "a").meta("m2", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); // result = tester.actual("m1", "a").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); // result = tester.actual("m1", "a").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); // result = tester.actual("m1", "a").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); // result = tester.actual("m1", "a").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); // result = tester.actual("m1", "a").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); // {m2} actual parameter // result = tester.actual("m2", "b").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m1", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m2", "foo").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); // result = tester.actual("m2", "b").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); // {m3} actual parameter // result = tester.actual("m3", "c").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m1", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m2", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m3", "zuu").encode(); assertEquals(2, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m3", "c").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // {m1,m2} actual parameter // result = tester.actual("m1", "a").actual("m2", "b").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m1", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m2", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); // result = tester.actual("m1", "a").actual("m2", "b").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); // {m1,m3} actual parameter // result = tester.actual("m1", "a").actual("m3", "c").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m1", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m2", "foo").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // {m2,m3} actual parameter // result = tester.actual("m2", "b").actual("m3", "c").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m1", "foo").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m2", "foo").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(3, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // {m1,m2,m3} actual parameter // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m1", "foo").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m2", "foo").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"0"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"0"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"10"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"10"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m2", "foo").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"1"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"foo","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"1"}, result.getValues("action")); + assertEquals(new String[]{"a"}, result.getValues("m1")); + assertEquals(new String[]{"foo","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); // result = tester.actual("m1", "a").actual("m2", "b").actual("m3", "c").meta("m1", "foo").meta("m2", "bar").meta("m3", "zuu").encode(); assertEquals(4, result.size()); - ExtendedAssert.assertEquals(new String[]{"11"}, result.getValues("action")); - ExtendedAssert.assertEquals(new String[]{"foo","a"}, result.getValues("m1")); - ExtendedAssert.assertEquals(new String[]{"bar","b"}, result.getValues("m2")); - ExtendedAssert.assertEquals(new String[]{"c"}, result.getValues("m3")); + assertEquals(new String[]{"11"}, result.getValues("action")); + assertEquals(new String[]{"foo","a"}, result.getValues("m1")); + assertEquals(new String[]{"bar","b"}, result.getValues("m2")); + assertEquals(new String[]{"c"}, result.getValues("m3")); } private static class Tester Deleted: modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml =================================================================== --- modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 4.2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository>test:loader=portlet</loader-repository> - </class-loading> -</jboss-web> \ No newline at end of file Added: modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-web.xml =================================================================== --- modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-web.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-web.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -25,14 +25,14 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - <bean name="TestDriverServer" class="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer"> + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"> </bean> <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> <constructor> <parameter>socket://localhost:5400</parameter> <parameter><inject bean="TestDriverServer"/></parameter> - <parameter>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> </constructor> </bean> @@ -43,6 +43,7 @@ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.PortletApplicationDeployer"> <property name="registry"><inject bean="PortletApplicationRegistry"/></property> <property name="servletContainer"><inject bean="ServletContainer"/></property> + <property name="driver"><inject bean="TestDriverServer"/></property> </bean> <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"> Added: modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml =================================================================== --- modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/test/local-jboss-unit.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <pojo> + <test> + <class name="org.jboss.portal.portlet.test.deployment.UnmarshallerTestCase"/> + </test> + <test> + <class name="org.jboss.portal.portlet.test.url.DecoderTestCase"> + </class> + </test> + <test> + <class name="org.jboss.portal.portlet.test.url.EncoderTestCase"> + </class> + </test> + <test> + <class name="org.jboss.portal.portlet.test.StringCodecTestCase"> + </class> + </test> + </pojo> +</jboss-unit> Modified: modules/portlet/trunk/test/src/resources/test/servers.xml =================================================================== --- modules/portlet/trunk/test/src/resources/test/servers.xml 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/test/src/resources/test/servers.xml 2007-10-23 07:31:22 UTC (rev 8746) @@ -5,7 +5,7 @@ <node-id>default</node-id> <service> <service-name>TestDriverServer</service-name> - <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> <uri>socket://localhost:5400</uri> </service> <deployer> @@ -27,7 +27,7 @@ <node-id>default</node-id> <service> <service-name>TestDriverServer</service-name> - <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> <uri>socket://localhost:5400</uri> </service> <deployer> @@ -45,7 +45,7 @@ <node-id>default</node-id> <service> <service-name>TestDriverServer</service-name> - <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> <uri>socket://localhost:5400</uri> </service> <deployer> Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-10-23 07:31:22 UTC (rev 8746) @@ -165,15 +165,6 @@ <property file="${project.root}/build/etc/${portal.database}.properties"/> <property name="hibernate.properties" value="${project.root}/build/etc/${portal.database}.properties"/> - <!-- Load the junit extension --> - <path id="junit_.task.classpath"> - <pathelement location="${project.tools}/lib/explode.jar"/> - </path> - <taskdef - name="junit_" - classname="org.jboss.portal.common.junit.ant.ConfigurableJUnitTask" - classpathref="junit_.task.classpath"/> - <!-- Setup the build timestamp & build identifer properties --> <tstamp> <format property="build.number" pattern="yyyyMMddHHmm"/> @@ -676,57 +667,6 @@ </target> <!-- end _default:tests--> - <macrodef name="execute-tests"> - <element name="x-sysproperty" optional="true"/> - <element name="x-test"/> - <element name="x-classpath"/> - <sequential> - <property name="test.reports" value="${module.output}/tests"/> - <echo><![CDATA[ - build.reports=${build.reports} - test.reports=${test.reports} - module.output=${module.output} - driver.path=${driver.path} - junit.printsummary=${junit.printsummary} - junit.batchtest.haltonerror=${junit.batchtest.haltonerror} - junit.batchtest.haltonfailure=${junit.batchtest.haltonfailure} - junit.batchtest.fork=${junit.batchtest.fork} - junit.timeout=${junit.timeout} - junit.jvm=${junit.jvm} - junit.jvm.options=${junit.jvm.options} - junit.formatter.usefile=${junit.formatter.usefile} - ]]></echo> - <mkdir dir="${build.reports}"/> - <mkdir dir="${test.reports}"/> - <junit_ - dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - <formatter type="plain" usefile="false"/> - <formatter - classname="org.jboss.portal.common.junit.ant.ConfigurableXMLJUnitResultFormatter" - usefile="${junit.formatter.usefile}" - extension="${jboss-junit-configuration}.xml"/> - <sysproperty key="build.resources" value="${build.resources}"/> - <sysproperty key="build.lib" value="${build.lib}"/> - <!-- definition of the property for keeping results between configuration --> - <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> - <x-sysproperty/> - <jvmarg value="${junit.jvm.options}"/> - <x-test/> - <classpath> - <path refid="jboss.portal/modules/test.classpath"/> - <pathelement path="${driver.path}"/> - <x-classpath/> - </classpath> - </junit_> - </sequential> - </macrodef> - <!-- ================================================================== --> <!-- Documents --> <!-- ================================================================== --> Modified: modules/portlet/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-10-23 02:52:32 UTC (rev 8745) +++ modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-10-23 07:31:22 UTC (rev 8746) @@ -118,8 +118,8 @@ <property name="javac.depend.cachedir" value="${build.cache}/depends"/> - <property name="javac.source" value="1.4"/> - <property name="javac.target" value="1.4"/> + <property name="javac.source" value="1.5"/> + <property name="javac.target" value="1.5"/> <property name="rmic.stubVersion" value="1.2"/> <!-- classpath and local.classpath must have a value using with a path -->