[jboss-cvs] JBossAS SVN: r109598 - in branches/JBoss-AS-6.0.x-ipv6/testsuite: src/main/org/jboss/test/ejb3/jbas7526/unit and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 30 18:18:28 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-11-30 18:18:28 -0500 (Tue, 30 Nov 2010)
New Revision: 109598
Modified:
branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
Log:
Fix URL generation in a number of test cases (JBAS-8540)
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml 2010-11-30 23:16:31 UTC (rev 109597)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml 2010-11-30 23:18:28 UTC (rev 109598)
@@ -1626,6 +1626,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.useJBM" value="true"/>
<sysproperty key="java.net.preferIPv4Stack" value="true"/>
@@ -1709,6 +1710,7 @@
<sysproperty key="java.naming.factory.initial" value="org.jboss.naming.HttpNamingContextFactory"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.http.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.useJBM" value="true"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -1771,6 +1773,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.useJBM" value="true"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -1816,6 +1819,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -1870,6 +1874,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -1960,6 +1965,7 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jboss.home" file="${project.root}"/>
<sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/>
<sysproperty key="jboss.tools.dir" file="${project.root}/tools"/>
@@ -2566,6 +2572,7 @@
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="java.security.policy" value="${build.resources}/iiop/client.policy"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2714,6 +2721,7 @@
<!-- Prevent IOException: unknown protocol: vfs -->
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -2774,6 +2782,7 @@
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -2838,6 +2847,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -3011,6 +3021,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.useJBM" value="true"/>
<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
@@ -3093,6 +3104,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.useJBM" value="true"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -3162,6 +3174,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -3390,6 +3403,7 @@
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -3542,6 +3556,7 @@
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.resource1.server.host" value="${node2}"/>
<sysproperty key="jbosstest.resource2.server.host" value="${node3}"/>
<sysproperty key="java.net.preferIPv4Stack" value="true"/>
@@ -3603,11 +3618,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="jbosstest.secure" value="true"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -3686,6 +3700,7 @@
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<sysproperty key="jbosstest.resource1.server.host" value="${node2}"/>
<sysproperty key="jbosstest.resource2.server.host" value="${node3}"/>
<!-- Pass along any jbosstest.* system properties -->
@@ -4005,6 +4020,7 @@
<sysproperty key="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java 2010-11-30 23:16:31 UTC (rev 109597)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/jbas7526/unit/ServletAndEJBUnitTestCase.java 2010-11-30 23:18:28 UTC (rev 109598)
@@ -39,19 +39,13 @@
public class ServletAndEJBUnitTestCase extends JBossTestCase
{
// JBAS-8540
- private String baseURL = null;
+ private String baseURL = "http://" + System.getProperty("jbosstest.server.host.url","localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jbas7526/calculator";;
public ServletAndEJBUnitTestCase(String name)
{
super(name);
}
- public void setUp()
- {
- super.setUp();
- baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/jbas7526/calculator";
- }
-
private String accessURL(String url) throws Exception
{
HttpClient httpConn = new HttpClient();
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java 2010-11-30 23:16:31 UTC (rev 109597)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jpa/test/AbstractWebJPATest.java 2010-11-30 23:18:28 UTC (rev 109598)
@@ -37,19 +37,13 @@
public abstract class AbstractWebJPATest extends JBossTestCase
{
// JBAS-8540
- private String baseURL = null;
+ private String baseURL = "http://" + System.getProperty("jbosstest.server.host.url","localhost") + ":" + Integer.getInteger("web.port", 8080) + "/jpa-test/Test?mode=";;
public AbstractWebJPATest(String name)
{
super(name);
}
-
- public void setUp()
- {
- super.setUp();
- baseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080) + "/jpa-test/Test?mode=";
- }
-
+
public void testWebJPA() throws Exception
{
accessURL("Write");
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java 2010-11-30 23:16:31 UTC (rev 109597)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.java 2010-11-30 23:18:28 UTC (rev 109598)
@@ -85,7 +85,7 @@
{
super.setUp();
// JBAS-8540
- this.testAppBaseURL = "http://" + super.getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080)
+ this.testAppBaseURL = "http://" + getServerHostForURL() + ":" + Integer.getInteger("web.port", 8080)
+ "/generic-header-auth/";
}
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-11-30 23:16:31 UTC (rev 109597)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/web/test/RemoteClassloadingServiceUnitTestCase.java 2010-11-30 23:18:28 UTC (rev 109598)
@@ -38,19 +38,13 @@
public class RemoteClassloadingServiceUnitTestCase extends JBossTestCase
{
//JBAS-8540
- String baseURL = null ;
+ String baseURL = "http://" + System.getProperty("jbosstest.server.host.url", "localhost") + ":8083/";
public RemoteClassloadingServiceUnitTestCase(String name)
{
super(name);
}
- public setUp()()
- {
- super.setUp();
- baseURL = "http://" + getServerHostForURL() + ":8083/";
- }
-
/**
* JBAS-4540, don't leak installation directory info
* through the classloading service.
More information about the jboss-cvs-commits
mailing list