[jboss-svn-commits] JBoss Portal SVN: r5570 - in trunk: cms/src/main/org/jboss/portal/test/cms/clustering portlet portlet/src/main/org/jboss/portal/test/framework/portlet portlet/src/main/org/jboss/portal/test/portlet portlet/src/main/org/jboss/portal/test/portlet/info portlet/src/main/org/jboss/portal/test/portlet/jsr168/api portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck portlet/src/resources/test/info/test-info-sar/META-INF portlet/src/resources/test-sar/META-INF server server/src/main/org/jboss/portal/test server/src/main/org/jboss/portal/test/framework server/src/main/org/jboss/portal/test/framework/server server/src/main/org/jboss/portal/test/framework/server/driver server/src/main/org/jboss/portal/test/framework/server/runner server/src/main/org/jboss/portal/test/server server/src/main/org/jboss/portal/test/server/charset server/src/main/org/jboss/porta! l/test/server/parameters server/src/main/org/jboss/portal/test/server/servlet server/src/resources/test/test-charset-sar/META-INF server/src/resources/test/test-parameters-sar/META-INF server/src/resources/test/test-servlet-sar/META-INF tools/etc/buildfragments wsrp wsrp/src/main/org/jboss/portal/test/wsrp wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 3 08:19:02 EST 2006
Author: julien at jboss.com
Date: 2006-11-03 08:17:41 -0500 (Fri, 03 Nov 2006)
New Revision: 5570
Added:
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
trunk/server/src/main/org/jboss/portal/test/framework/
trunk/server/src/main/org/jboss/portal/test/framework/server/
trunk/server/src/main/org/jboss/portal/test/framework/server/driver/
trunk/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java
trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistry.java
trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistryService.java
trunk/server/src/main/org/jboss/portal/test/framework/server/runner/
trunk/server/src/main/org/jboss/portal/test/framework/server/runner/ServerTestRunner.java
Removed:
trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java
trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java
trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java
trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java
trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java
Modified:
trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
trunk/portlet/build.xml
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionRequestTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionResponseTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortalContextTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletConfigTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletContextTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletModeTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletPreferencesTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionUtilTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletURLTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderRequestTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderResponseTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/WindowStateTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/DispatcherTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletConfigTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletModeTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletRequestsTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletResponsesTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PreferencesTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/SessionTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/Log4jTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/DispatcherTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletConfigTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletContextTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletInterfaceTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletModeTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletRequestsTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletResponsesTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletSessionTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletURLTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PreferencesTestCase.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/WindowStatesTestCase.java
trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
trunk/server/build.xml
trunk/server/src/main/org/jboss/portal/test/server/CharsetTestCase.java
trunk/server/src/main/org/jboss/portal/test/server/ParametersTestCase.java
trunk/server/src/main/org/jboss/portal/test/server/ServletTestCase.java
trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
trunk/tools/etc/buildfragments/modules.ent
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ConsumerTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestRunner.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestRunner.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestRunner.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestRunner.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ProducerTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestRunner.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestRunner.java
trunk/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
- added common parent class for portlet info test cases
- make the distinction between test framework classes and test classes with different jars (for exemple server-test-lib.jar and server-test-framework-lib.jar). The test framework classes can be imported by other modules in order to increase reusability
- remove obsolete code (PortalTestSetup)
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.cms.clustering;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.server.NodeId;
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -33,7 +33,7 @@
import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.server.NodeId;
Modified: trunk/portlet/build.xml
===================================================================
--- trunk/portlet/build.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/build.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -195,7 +195,7 @@
</jar>
<!-- Portlet test lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-test-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-test-framework-lib.jar">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
</jar>
@@ -308,13 +308,13 @@
<fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
- <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${build.lib}" includes="portal-portlet-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-portlet-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-portlet-test-framework-lib.jar"/>
<fileset dir="${build.lib}" includes="test.war"/>
</copy>
<jar jarfile="${build.lib}/test.sar">
@@ -330,6 +330,7 @@
<fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet;
-import org.jboss.portal.test.server.HttpTestDriverRegistry;
+import org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistry;
import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -24,18 +24,19 @@
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.portlet.Parameters;
-import org.jboss.portal.test.AbstractTestCase;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
*/
public class ParametersTestCase
- extends AbstractTestCase
+ extends TestCase
{
public ParametersTestCase(String name)
Added: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.portlet.info;
+
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
+import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class AbstractInfoTest extends AbstractTest
+{
+
+ /** . */
+ protected PortletApplicationRegistry registry;
+
+ public AbstractInfoTest(String testCaseId, String path)
+ {
+ super(testCaseId, path);
+ }
+
+ public PortletApplicationRegistry getRegistry()
+ {
+ return registry;
+ }
+
+ public void setRegistry(PortletApplicationRegistry registry)
+ {
+ this.registry = registry;
+ }
+}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.test.portlet.info;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.CacheInfo;
import org.jboss.portal.portlet.info.PortletInfo;
@@ -30,14 +29,13 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class CacheInfoTest extends AbstractTest
+public class CacheInfoTest extends AbstractInfoTest
{
public CacheInfoTest()
@@ -45,18 +43,6 @@
super("CacheInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.CachePortlet");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -25,7 +25,6 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
import org.jboss.portal.portlet.info.ModeInfo;
@@ -35,7 +34,6 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.HashSet;
@@ -47,27 +45,14 @@
* @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class CapabilitiesInfoTest extends AbstractTest
+public class CapabilitiesInfoTest extends AbstractInfoTest
{
-
public CapabilitiesInfoTest()
{
super("CapabilitiesInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.CapabilitiesPortlet");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.info;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.portlet.info;
import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.info.PortletInfo;
@@ -31,7 +30,6 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.Locale;
@@ -40,27 +38,14 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class MetaInfoTest extends AbstractTest
+public class MetaInfoTest extends AbstractInfoTest
{
-
public MetaInfoTest()
{
super("MetaInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.NoBundlePortlet");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.portlet.info;
import org.jboss.portal.Mode;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
import org.jboss.portal.portlet.info.ModeInfo;
@@ -31,7 +30,6 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.HashSet;
@@ -42,27 +40,14 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class ModeInfoTest extends AbstractTest
+public class ModeInfoTest extends AbstractInfoTest
{
-
public ModeInfoTest()
{
super("ModeInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container1 = registry.getPortletContainer("/test-info.ModePortlet1");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,41 +22,26 @@
******************************************************************************/
package org.jboss.portal.test.portlet.info;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class PortletInfoTest extends AbstractTest
+public class PortletInfoTest extends AbstractInfoTest
{
-
public PortletInfoTest()
{
super("PortletInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
//This asserts only .isRemotable() as rest is checked in other tests
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -31,7 +31,6 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import java.util.Locale;
@@ -41,27 +40,14 @@
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class PreferenceInfoTest extends AbstractTest
+public class PreferenceInfoTest extends AbstractInfoTest
{
-
public PreferenceInfoTest()
{
super("PreferenceInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.PreferenceInfoPortlet");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -23,7 +23,6 @@
package org.jboss.portal.test.portlet.info;
import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
@@ -31,34 +30,20 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class SecurityInfoTest extends AbstractTest
+public class SecurityInfoTest extends AbstractInfoTest
{
-
public SecurityInfoTest()
{
super("SecurityInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
//This asserts only .isRemotable() as rest is checked in other tests
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.test.portlet.info;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SessionInfo;
@@ -30,34 +29,20 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class SessionInfoTest extends AbstractTest
+public class SessionInfoTest extends AbstractInfoTest
{
-
public SessionInfoTest()
{
super("SessionInfoTest", "/test");
}
- private PortletApplicationRegistry registry;
-
- public PortletApplicationRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(PortletApplicationRegistry registry)
- {
- this.registry = registry;
- }
-
public DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext)
{
PortletContainer container = registry.getPortletContainer("/test-info.DistributedPortlet1");
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionRequestTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionRequestTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionRequestTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionResponseTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionResponseTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/ActionResponseTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortalContextTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortalContextTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortalContextTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletConfigTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletConfigTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletConfigTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletContextTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletContextTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletContextTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletModeTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletModeTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletModeTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletPreferencesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletPreferencesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletPreferencesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionUtilTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionUtilTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletSessionUtilTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletURLTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletURLTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/PortletURLTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderRequestTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderRequestTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderRequestTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderResponseTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderResponseTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/RenderResponseTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/WindowStateTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/WindowStateTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/WindowStateTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.api;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/DispatcherTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/DispatcherTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/DispatcherTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletConfigTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletConfigTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletConfigTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletModeTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletModeTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletModeTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletRequestsTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletRequestsTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletRequestsTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletResponsesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletResponsesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PortletResponsesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PreferencesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PreferencesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/PreferencesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/SessionTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/SessionTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/SessionTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.ext;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/Log4jTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/Log4jTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/Log4jTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.misc;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/DispatcherTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/DispatcherTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/DispatcherTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletConfigTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletConfigTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletConfigTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletContextTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletContextTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletContextTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletInterfaceTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletInterfaceTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletInterfaceTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletModeTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletModeTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletModeTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletRequestsTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletRequestsTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletRequestsTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletResponsesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletResponsesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletResponsesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletSessionTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletSessionTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletSessionTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletURLTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletURLTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PortletURLTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PreferencesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PreferencesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/PreferencesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/WindowStatesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/WindowStatesTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/WindowStatesTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -25,7 +25,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -26,7 +26,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/build.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -177,8 +177,11 @@
<fileset dir="${build.resources}/portal-server-sar"/>
</jar>
<jar jarfile="${build.lib}/portal-server-test-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/server/**"/>
</jar>
+ <jar jarfile="${build.lib}/portal-server-test-framework-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/**"/>
+ </jar>
</target>
<!-- generates artifacts used for tests, requires output to be previously run -->
@@ -196,6 +199,7 @@
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${build.resources}/test/test-parameters-sar"/>
</jar>
@@ -216,6 +220,7 @@
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${build.resources}/test/test-servlet-sar"/>
<fileset dir="${build.lib}" includes="test-servlet-rootpathmapping.war"/>
<fileset dir="${build.lib}" includes="test-servlet-pathmapping.war"/>
@@ -230,6 +235,7 @@
<fileset dir="${build.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
<fileset dir="${build.resources}/test/test-charset-sar"/>
</jar>
</target>
Deleted: trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,64 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test;
-
-import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.File;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public abstract class AbstractTestCase extends TestCase
-{
-
- protected final Logger log = Logger.getLogger(getClass());
- protected final File resources;
-
- protected AbstractTestCase(String name)
- {
- super(name);
- resources = new File(System.getProperty("build.resources"));
- }
-
- public Document parseXML(File file)
- {
- try
- {
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- return builder.parse(file);
- }
- catch (Exception e)
- {
- log.error("Cannot parse XML file", e);
- fail("Cannot parse XML file");
- return null;
- }
- }
-
-}
Deleted: trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,135 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.portal.test;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * Deals with deployment and undeployment of archives to the JBoss server
- *
- * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- * @since Feb 1, 2006
- */
-public class PortalTestSetup
-{
- private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
- /** Deploy the given archive */
- public void deploy(String archive) throws Exception
- {
- MBeanServerConnection server = getServer();
- URL url = getArchiveURL(archive);
-
- server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy",
- new Object[]{url}, new String[]{"java.net.URL"});
- }
-
- /** Undeploy the given archive */
- public void undeploy(String archive) throws Exception
- {
- MBeanServerConnection server = getServer();
- URL url = getArchiveURL(archive);
-
- server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy",
- new Object[]{url}, new String[]{"java.net.URL"});
- }
-
- /** Get the MBeanServerConnection from JNDI */
- public MBeanServerConnection getServer() throws NamingException
- {
- InitialContext ctx = new InitialContext();
- MBeanServerConnection server = (MBeanServerConnection)ctx.lookup("jmx/invoker/RMIAdaptor");
- return server;
- }
-
- /** Try to discover the URL for the deployment archive */
- private URL getArchiveURL(String archive) throws MalformedURLException
- {
- URL url = null;
- try
- {
- url = new URL(archive);
- }
- catch (MalformedURLException ignore)
- {
- // ignore
- }
-
- String locs[] = {archive, "output/libs/" + archive,
- "test/outputs/libs/" + archive,
- "output/lib/" + archive,
- "test/output/lib/" + archive,
- "../output/lib/" + archive,
- "../test/output/lib/" + archive};
-
- for (int i = 0; i < locs.length && url == null; i++)
- {
- File file = new File(locs[i]);
- if (file.exists())
- {
- url = file.toURL();
- }
- }
- /*if (url == null)
- {
- File file = new File(archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- {
- File file = new File("output/libs/" + archive);
- if (file.exists())
- url = file.toURL();
- }
-
- if (url == null)
- {
- File file = new File("test/output/libs/" + archive);
- if (file.exists())
- url = file.toURL();
- }*/
-
-
- if (url == null)
- {
- throw new IllegalArgumentException("Cannot obtain URL for: " + archive);
- }
-
- return url;
- }
-}
Copied: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java (from rev 5568, trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java)
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -0,0 +1,158 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.server.driver;
+
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.common.test.driver.DriverCommand;
+import org.jboss.portal.common.test.driver.TestDriverException;
+import org.jboss.portal.common.test.driver.command.StartTestCommand;
+import org.jboss.portal.common.test.info.TestItemInfo;
+import org.jboss.portal.common.test.info.TestInfo;
+import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public abstract class AbstractTest extends AbstractJBossService implements HttpTestDriverServer
+{
+
+ /** The test id. */
+ private final String testCaseId;
+
+ /** The test path. */
+ private final String path;
+
+ /** The controller. */
+ private HttpTestDriverRegistry testDriverRegistry;
+
+ /** The test info. */
+ private TestInfo testInfo;
+
+ /** The test info. */
+ private HttpTestContext context;
+
+ public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
+ {
+ if (cmd instanceof StartTestCommand)
+ {
+ return new InvokeGetResponse(path);
+ }
+ else
+ {
+ throw new TestDriverException("Unrecognized command " + cmd);
+ }
+ }
+
+ public TestItemInfo getInfo()
+ {
+ return testInfo;
+ }
+
+ public AbstractTest(String testCaseId, String path)
+ {
+ if (testCaseId == null)
+ {
+ throw new IllegalArgumentException("No null test case id accepted");
+ }
+ if (path == null)
+ {
+ throw new IllegalArgumentException("No null test path accepted");
+ }
+
+ //
+ this.testCaseId = testCaseId;
+ this.path = path;
+ this.testInfo = new TestInfo(testCaseId);
+ }
+
+ public HttpTestDriverRegistry getTestDriverRegistry()
+ {
+ return testDriverRegistry;
+ }
+
+ public void setTestDriverRegistry(HttpTestDriverRegistry testDriverRegistry)
+ {
+ this.testDriverRegistry = testDriverRegistry;
+ }
+
+ public String getTestCaseId()
+ {
+ return testCaseId;
+ }
+
+ public String getPath()
+ {
+ return path;
+ }
+
+ protected void createService()
+ {
+ testDriverRegistry.register(this);
+ }
+
+ protected void destroyService()
+ {
+ testDriverRegistry.unregister(this);
+ }
+
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ this.context = ctx;
+ }
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ return context;
+ }
+
+ /**
+ *
+ */
+ public void execute(ServerInvocation invocation)
+ {
+ DriverResponse response = execute(invocation, context);
+ context.setResponse(response);
+ }
+
+ /**
+ *
+ */
+ public abstract DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext);
+
+ /** Get the test id from the class name. It can be overriden. */
+ protected String createCaseTestId(Class clazz)
+ {
+ String s = clazz.getName();
+ int index = s.lastIndexOf('.');
+ if (index != -1)
+ {
+ s = s.substring(index + 1);
+ }
+ return s;
+ }
+}
Property changes on: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistry.java (from rev 5568, trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java)
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistry.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.server.driver;
+
+import org.jboss.portal.common.test.driver.TestDriver;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public interface HttpTestDriverRegistry extends HttpTestDriverServer
+{
+ /**
+ * Regisgter a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or already registered
+ */
+ void register(TestDriver driver) throws IllegalArgumentException;
+
+ /**
+ * Unregister a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or does not exist
+ */
+ void unregister(TestDriver driver) throws IllegalArgumentException;
+
+ /**
+ * Return a driver that is able to understand the specified id.
+ *
+ * @param itemId
+ * @return
+ * @throws IllegalArgumentException
+ */
+ TestDriver getDriver(String itemId) throws IllegalArgumentException;
+}
Property changes on: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistry.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistryService.java (from rev 5568, trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java)
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java 2006-11-02 23:02:12 UTC (rev 5568)
+++ trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistryService.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -0,0 +1,193 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.server.driver;
+
+import org.jboss.portal.test.framework.driver.http.AbstractHttpTestDriverServerService;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
+import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.common.test.driver.TestDriverException;
+import org.jboss.portal.common.test.driver.TestDriver;
+import org.jboss.portal.common.test.driver.DriverCommand;
+import org.jboss.portal.common.test.driver.command.StartTestCommand;
+import org.jboss.portal.common.test.info.TestItemInfo;
+import org.jboss.portal.common.test.info.TestContainerInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision$
+ */
+public class HttpTestDriverRegistryService extends AbstractHttpTestDriverServerService implements HttpTestDriverRegistry
+{
+
+ /** . */
+ private Map _entries;
+
+ /** . */
+ private TestContainerInfo _container;
+
+ public HttpTestDriverRegistryService()
+ {
+ _entries = new HashMap();
+ _container = new TestContainerInfo("Main");
+ }
+
+ public synchronized void registerTestDriver(TestDriver test) throws IllegalArgumentException
+ {
+ if (test == null)
+ {
+ throw new IllegalArgumentException("Cannot add null test");
+ }
+ TestItemInfo itemInfo = test.getInfo();
+ String entryKey = itemInfo.getName();
+ if (_entries.containsKey(entryKey))
+ {
+ throw new IllegalArgumentException("Cannot have two tests with the same id " + entryKey);
+ }
+
+ //
+ _container.addChild(itemInfo);
+ _entries.put(entryKey, test);
+ }
+
+ public synchronized void unregisterTestDriver(TestDriver test) throws IllegalArgumentException
+ {
+ if (test == null)
+ {
+ throw new IllegalArgumentException("Cannot add null test");
+ }
+ String entryKey = test.getInfo().getName();
+ if (!_entries.containsKey(entryKey))
+ {
+ throw new IllegalArgumentException("Cannot remove test that was not added previously " + entryKey);
+ }
+
+ //
+ _entries.remove(entryKey);
+ _container.removeChild(entryKey);
+ }
+
+ public synchronized void register(TestDriver driver)
+ {
+ registerTestDriver(driver);
+ }
+
+ public synchronized void unregister(TestDriver driver)
+ {
+ unregisterTestDriver(driver);
+ }
+
+ public TestDriver getDriver(String itemId)
+ {
+ TestItemInfo itemInfo = _container.findItem(itemId);
+ if (itemInfo == null)
+ {
+ return null;
+ }
+
+ // Find original parent
+ TestItemInfo currentInfo = itemInfo;
+ while (true)
+ {
+ TestContainerInfo parentInfo = currentInfo.getParent();
+ if (parentInfo == null)
+ {
+ //
+ return null;
+ }
+ else if (parentInfo == _container)
+ {
+ break;
+ }
+ else
+ {
+ currentInfo = parentInfo;
+ }
+ }
+
+ //
+ return (TestDriver)_entries.get(currentInfo.getName());
+ }
+
+ public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
+ {
+ if (cmd instanceof StartTestCommand)
+ {
+ StartTestCommand stc = (StartTestCommand)cmd;
+ String testId = stc.getTestId();
+
+ //
+ TestItemInfo item = _container.findItem(testId);
+ if (item == null)
+ {
+ throw new TestDriverException("Driver not found for " + testId);
+ }
+
+ // Get associated test driver
+ TestDriver driver = getDriver(testId);
+
+ //
+ String testId2 = item.getId(driver.getInfo());
+ StartTestCommand cmd2 = new StartTestCommand(testId2, stc.getParametrization());
+ return driver.invoke(cmd2);
+ }
+ else
+ {
+ throw new TestDriverException("Unrecognized command " + cmd);
+ }
+ }
+
+ public TestItemInfo getInfo()
+ {
+ return _container;
+ }
+
+ public void updateContext(String testId, HttpTestContext ctx)
+ {
+ TestDriver driver = getDriver(testId);
+ if (driver instanceof HttpTestDriverServer)
+ {
+ HttpTestDriverServer httpDriver = (HttpTestDriverServer)driver;
+ TestItemInfo item = _container.findItem(testId);
+ String newId = item.getId(httpDriver.getInfo());
+ HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath());
+ ctx2.setTestAgent(getAgent());
+ httpDriver.updateContext(newId, ctx2);
+ }
+ }
+
+ public HttpTestContext retrieveContext(String testId)
+ {
+ TestDriver tmp = getDriver(testId);
+ HttpTestDriverServer driver = (HttpTestDriverServer)tmp;
+ TestItemInfo item = _container.findItem(testId);
+ String newId = item.getId(driver.getInfo());
+ HttpTestContext context = driver.retrieveContext(newId);
+ context = new HttpTestContext(context);
+ context.setTestAgent(null);
+ return context;
+ }
+}
Property changes on: trunk/server/src/main/org/jboss/portal/test/framework/server/driver/HttpTestDriverRegistryService.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/server/src/main/org/jboss/portal/test/framework/server/runner/ServerTestRunner.java (from rev 5563, trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java)
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java 2006-11-02 21:35:17 UTC (rev 5563)
+++ trunk/server/src/main/org/jboss/portal/test/framework/server/runner/ServerTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -0,0 +1,82 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.server.runner;
+
+import org.jboss.portal.test.framework.runner.BaseRunner;
+import org.jboss.portal.test.framework.server.NodeId;
+import org.jboss.portal.common.test.TestParameterValue;
+import org.jboss.portal.common.test.TestParametrization;
+import org.jboss.portal.common.test.junit.JUnitAdapter;
+import junit.framework.AssertionFailedError;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class ServerTestRunner extends BaseRunner
+{
+
+ public ServerTestRunner()
+ {
+ TestParametrization abc = JUnitAdapter.getParametrization();
+ archiveName = (String)abc.getParameterValue("archive").get();
+ }
+
+ public ServerTestRunner(String archiveName)
+ {
+ this.archiveName = archiveName;
+ }
+
+ /** . */
+ private String archiveName;
+
+ public void startRunner() throws Exception
+ {
+ File root = new File(getArchivePath());
+ File f = new File(root, archiveName);
+ getDeployer().deploy(f.toURL(), getNodeManager().getNode(NodeId.DEFAULT));
+ }
+
+ public void stopRunner()
+ {
+ try
+ {
+ File root = new File(getArchivePath());
+ File f = new File(root, archiveName);
+ getDeployer().undeploy(f.toURL());
+ }
+ catch (MalformedURLException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public void testDummy()
+ {
+ throw new AssertionFailedError("Test dummy should not be called, it's a place holder so that running it from ant does not fail");
+ }
+}
Deleted: trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,158 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.server;
-
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.common.test.driver.DriverResponse;
-import org.jboss.portal.common.test.driver.DriverCommand;
-import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.command.StartTestCommand;
-import org.jboss.portal.common.test.info.TestItemInfo;
-import org.jboss.portal.common.test.info.TestInfo;
-import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public abstract class AbstractTest extends AbstractJBossService implements HttpTestDriverServer
-{
-
- /** The test id. */
- private final String testCaseId;
-
- /** The test path. */
- private final String path;
-
- /** The controller. */
- private HttpTestDriverRegistry testDriverRegistry;
-
- /** The test info. */
- private TestInfo testInfo;
-
- /** The test info. */
- private HttpTestContext context;
-
- public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
- {
- if (cmd instanceof StartTestCommand)
- {
- return new InvokeGetResponse(path);
- }
- else
- {
- throw new TestDriverException("Unrecognized command " + cmd);
- }
- }
-
- public TestItemInfo getInfo()
- {
- return testInfo;
- }
-
- public AbstractTest(String testCaseId, String path)
- {
- if (testCaseId == null)
- {
- throw new IllegalArgumentException("No null test case id accepted");
- }
- if (path == null)
- {
- throw new IllegalArgumentException("No null test path accepted");
- }
-
- //
- this.testCaseId = testCaseId;
- this.path = path;
- this.testInfo = new TestInfo(testCaseId);
- }
-
- public HttpTestDriverRegistry getTestDriverRegistry()
- {
- return testDriverRegistry;
- }
-
- public void setTestDriverRegistry(HttpTestDriverRegistry testDriverRegistry)
- {
- this.testDriverRegistry = testDriverRegistry;
- }
-
- public String getTestCaseId()
- {
- return testCaseId;
- }
-
- public String getPath()
- {
- return path;
- }
-
- protected void createService()
- {
- testDriverRegistry.register(this);
- }
-
- protected void destroyService()
- {
- testDriverRegistry.unregister(this);
- }
-
- public void updateContext(String testId, HttpTestContext ctx)
- {
- this.context = ctx;
- }
-
- public HttpTestContext retrieveContext(String testId)
- {
- return context;
- }
-
- /**
- *
- */
- public void execute(ServerInvocation invocation)
- {
- DriverResponse response = execute(invocation, context);
- context.setResponse(response);
- }
-
- /**
- *
- */
- public abstract DriverResponse execute(ServerInvocation invocation, HttpTestContext testContext);
-
- /** Get the test id from the class name. It can be overriden. */
- protected String createCaseTestId(Class clazz)
- {
- String s = clazz.getName();
- int index = s.lastIndexOf('.');
- if (index != -1)
- {
- s = s.substring(index + 1);
- }
- return s;
- }
-}
Modified: trunk/server/src/main/org/jboss/portal/test/server/CharsetTestCase.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/CharsetTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/CharsetTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.server;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
Deleted: trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistry.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,58 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.server;
-
-import org.jboss.portal.common.test.driver.TestDriver;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public interface HttpTestDriverRegistry extends HttpTestDriverServer
-{
- /**
- * Regisgter a driver.
- *
- * @param driver
- * @throws IllegalArgumentException if the driver is null or already registered
- */
- void register(TestDriver driver) throws IllegalArgumentException;
-
- /**
- * Unregister a driver.
- *
- * @param driver
- * @throws IllegalArgumentException if the driver is null or does not exist
- */
- void unregister(TestDriver driver) throws IllegalArgumentException;
-
- /**
- * Return a driver that is able to understand the specified id.
- *
- * @param itemId
- * @return
- * @throws IllegalArgumentException
- */
- TestDriver getDriver(String itemId) throws IllegalArgumentException;
-}
Deleted: trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/HttpTestDriverRegistryService.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,193 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.server;
-
-import org.jboss.portal.test.framework.driver.http.AbstractHttpTestDriverServerService;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
-import org.jboss.portal.common.test.driver.DriverResponse;
-import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.TestDriver;
-import org.jboss.portal.common.test.driver.DriverCommand;
-import org.jboss.portal.common.test.driver.command.StartTestCommand;
-import org.jboss.portal.common.test.info.TestItemInfo;
-import org.jboss.portal.common.test.info.TestContainerInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class HttpTestDriverRegistryService extends AbstractHttpTestDriverServerService implements HttpTestDriverRegistry
-{
-
- /** . */
- private Map _entries;
-
- /** . */
- private TestContainerInfo _container;
-
- public HttpTestDriverRegistryService()
- {
- _entries = new HashMap();
- _container = new TestContainerInfo("Main");
- }
-
- public synchronized void registerTestDriver(TestDriver test) throws IllegalArgumentException
- {
- if (test == null)
- {
- throw new IllegalArgumentException("Cannot add null test");
- }
- TestItemInfo itemInfo = test.getInfo();
- String entryKey = itemInfo.getName();
- if (_entries.containsKey(entryKey))
- {
- throw new IllegalArgumentException("Cannot have two tests with the same id " + entryKey);
- }
-
- //
- _container.addChild(itemInfo);
- _entries.put(entryKey, test);
- }
-
- public synchronized void unregisterTestDriver(TestDriver test) throws IllegalArgumentException
- {
- if (test == null)
- {
- throw new IllegalArgumentException("Cannot add null test");
- }
- String entryKey = test.getInfo().getName();
- if (!_entries.containsKey(entryKey))
- {
- throw new IllegalArgumentException("Cannot remove test that was not added previously " + entryKey);
- }
-
- //
- _entries.remove(entryKey);
- _container.removeChild(entryKey);
- }
-
- public synchronized void register(TestDriver driver)
- {
- registerTestDriver(driver);
- }
-
- public synchronized void unregister(TestDriver driver)
- {
- unregisterTestDriver(driver);
- }
-
- public TestDriver getDriver(String itemId)
- {
- TestItemInfo itemInfo = _container.findItem(itemId);
- if (itemInfo == null)
- {
- return null;
- }
-
- // Find original parent
- TestItemInfo currentInfo = itemInfo;
- while (true)
- {
- TestContainerInfo parentInfo = currentInfo.getParent();
- if (parentInfo == null)
- {
- //
- return null;
- }
- else if (parentInfo == _container)
- {
- break;
- }
- else
- {
- currentInfo = parentInfo;
- }
- }
-
- //
- return (TestDriver)_entries.get(currentInfo.getName());
- }
-
- public DriverResponse invoke(DriverCommand cmd) throws TestDriverException
- {
- if (cmd instanceof StartTestCommand)
- {
- StartTestCommand stc = (StartTestCommand)cmd;
- String testId = stc.getTestId();
-
- //
- TestItemInfo item = _container.findItem(testId);
- if (item == null)
- {
- throw new TestDriverException("Driver not found for " + testId);
- }
-
- // Get associated test driver
- TestDriver driver = getDriver(testId);
-
- //
- String testId2 = item.getId(driver.getInfo());
- StartTestCommand cmd2 = new StartTestCommand(testId2, stc.getParametrization());
- return driver.invoke(cmd2);
- }
- else
- {
- throw new TestDriverException("Unrecognized command " + cmd);
- }
- }
-
- public TestItemInfo getInfo()
- {
- return _container;
- }
-
- public void updateContext(String testId, HttpTestContext ctx)
- {
- TestDriver driver = getDriver(testId);
- if (driver instanceof HttpTestDriverServer)
- {
- HttpTestDriverServer httpDriver = (HttpTestDriverServer)driver;
- TestItemInfo item = _container.findItem(testId);
- String newId = item.getId(httpDriver.getInfo());
- HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath());
- ctx2.setTestAgent(getAgent());
- httpDriver.updateContext(newId, ctx2);
- }
- }
-
- public HttpTestContext retrieveContext(String testId)
- {
- TestDriver tmp = getDriver(testId);
- HttpTestDriverServer driver = (HttpTestDriverServer)tmp;
- TestItemInfo item = _container.findItem(testId);
- String newId = item.getId(driver.getInfo());
- HttpTestContext context = driver.retrieveContext(newId);
- context = new HttpTestContext(context);
- context.setTestAgent(null);
- return context;
- }
-}
Modified: trunk/server/src/main/org/jboss/portal/test/server/ParametersTestCase.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/ParametersTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/ParametersTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.server;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
Deleted: trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/ServerTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -1,82 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.server;
-
-import org.jboss.portal.test.framework.runner.BaseRunner;
-import org.jboss.portal.test.framework.server.NodeId;
-import org.jboss.portal.common.test.TestParameterValue;
-import org.jboss.portal.common.test.TestParametrization;
-import org.jboss.portal.common.test.junit.JUnitAdapter;
-import junit.framework.AssertionFailedError;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class ServerTestRunner extends BaseRunner
-{
-
- public ServerTestRunner()
- {
- TestParametrization abc = JUnitAdapter.getParametrization();
- archiveName = (String)abc.getParameterValue("archive").get();
- }
-
- public ServerTestRunner(String archiveName)
- {
- this.archiveName = archiveName;
- }
-
- /** . */
- private String archiveName;
-
- public void startRunner() throws Exception
- {
- File root = new File(getArchivePath());
- File f = new File(root, archiveName);
- getDeployer().deploy(f.toURL(), getNodeManager().getNode(NodeId.DEFAULT));
- }
-
- public void stopRunner()
- {
- try
- {
- File root = new File(getArchivePath());
- File f = new File(root, archiveName);
- getDeployer().undeploy(f.toURL());
- }
- catch (MalformedURLException e)
- {
- e.printStackTrace();
- }
- }
-
- public void testDummy()
- {
- throw new AssertionFailedError("Test dummy should not be called, it's a place holder so that running it from ant does not fail");
- }
-}
Modified: trunk/server/src/main/org/jboss/portal/test/server/ServletTestCase.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/ServletTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/ServletTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.server;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
Modified: trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -29,6 +29,9 @@
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.TestDriverException;
import org.jboss.portal.common.test.driver.command.StartTestCommand;
+import org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistry;
+import org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -28,9 +28,9 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -28,10 +28,10 @@
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -31,7 +31,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -30,7 +30,7 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -28,10 +28,10 @@
import org.jboss.portal.server.ServerInvocationContext;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -31,7 +31,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -30,7 +30,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import java.util.Map;
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -28,9 +28,9 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import java.util.Map;
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -28,9 +28,9 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
import java.util.Map;
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -30,7 +30,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -27,10 +27,10 @@
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -24,14 +24,13 @@
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.ServerInvocationContext;
-import org.jboss.portal.server.ServerRequest;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.server.AbstractTest;
+import org.jboss.portal.test.framework.server.driver.AbstractTest;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -25,7 +25,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -25,7 +25,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -25,7 +25,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/tools/etc/buildfragments/modules.ent
===================================================================
--- trunk/tools/etc/buildfragments/modules.ent 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/tools/etc/buildfragments/modules.ent 2006-11-03 13:17:41 UTC (rev 5570)
@@ -24,12 +24,12 @@
<pathelement path="${jboss.portal-cms.lib}/portal-cms-lib.jar"/>
</path>
- <!-- portal -->
+ <!-- server -->
<property name="jboss.portal-server.root" value="${project.root}/server/output"/>
<property name="jboss.portal-server.lib" value="${jboss.portal-server.root}/lib"/>
<path id="jboss.portal-server.classpath">
<pathelement path="${jboss.portal-server.lib}/portal-server-lib.jar"/>
- <pathelement path="${jboss.portal-server.lib}/portal-server-test-lib.jar"/>
+ <pathelement path="${jboss.portal-server.lib}/portal-server-test-framework-lib.jar"/>
</path>
<!-- api -->
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/build.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -394,7 +394,7 @@
includes="portal-portlet-lib.jar, portal-portlet-test-lib.jar"/>
<fileset dir="${jboss.portal-federation.root}/lib" includes="portal-federation-lib.jar"/>
<fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/>
</copy>
<jar jarfile="${build.lib.test}/test-wsrp-consumer.sar">
@@ -453,7 +453,7 @@
<fileset dir="${build.lib.test}" includes="test-wsrp-producer.jar"/>
<fileset dir="${build.lib.test}" includes="test-wsrp-producer-client.jar"/>
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
- <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${jboss.portal-server.lib}" includes="portal-server-test-framework-lib.jar"/>
</copy>
<jar jarfile="${build.lib.test}/test-wsrp-producer.sar">
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
-import org.jboss.portal.test.server.HttpTestDriverRegistry;
+import org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistry;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.DriverCommand;
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ConsumerTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ConsumerTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ConsumerTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.consumer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.consumer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/ServiceDescriptionTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.consumer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.producer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/PortletManagementTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.producer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ProducerTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ProducerTestCase.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ProducerTestCase.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.producer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.producer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestRunner.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestRunner.java 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestRunner.java 2006-11-03 13:17:41 UTC (rev 5570)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.wsrp.v1.producer;
-import org.jboss.portal.test.server.ServerTestRunner;
+import org.jboss.portal.test.framework.server.runner.ServerTestRunner;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: trunk/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -26,7 +26,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2006-11-02 23:38:33 UTC (rev 5569)
+++ trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2006-11-03 13:17:41 UTC (rev 5570)
@@ -26,7 +26,7 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.server.HttpTestDriverRegistryService"
+ code="org.jboss.portal.test.framework.server.driver.HttpTestDriverRegistryService"
name="portal.test:service=HttpTestDriverServer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
More information about the jboss-svn-commits
mailing list