[jbossws-commits] JBossWS SVN: r15946 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test: ws/jaxws/endpoint and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Mar 14 11:02:47 EDT 2012
Author: ropalka
Date: 2012-03-14 11:02:46 -0400 (Wed, 14 Mar 2012)
New Revision: 15946
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
[JBWS-3458] fixing tests to be IPv6 compatible
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -58,7 +58,12 @@
try
{
ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance();
- helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path);
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ helper.setTargetEndpoint("http://" + jbossBindAddress + ":8080" + path);
List<String> failedTests = new LinkedList<String>();
List<String> errorTests = new LinkedList<String>();
Method[] methods = helper.getClass().getMethods();
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -83,6 +83,7 @@
{
// Create the port
String hostName = System.getProperty("jboss.bind.address", "localhost");
+ hostName = hostName.indexOf(":") != -1 ? "[" + hostName + "]" : hostName;
// URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl");
URL wsdlURL = new URL("http://" + hostName + ":8081/jaxws-endpoint?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -40,9 +40,12 @@
String param = req.getParameter("param");
boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck"));
Client client = new Client(clCheck);
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- //URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl");
- URL wsdlURL = new URL("http://" + hostName + ":8080/jaxws-jbws3223?wsdl");
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ URL wsdlURL = new URL("http://" + jbossBindAddress + ":8080/jaxws-jbws3223?wsdl");
String retStr = client.run(param, wsdlURL);
// Return the result
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -48,7 +48,7 @@
public void testAnonymousEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/AnonymousPOJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase1/AnonymousPOJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
@@ -58,7 +58,7 @@
public void testDeclaredEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "POJOImplService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/POJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase1/POJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -48,7 +48,7 @@
public void testAnonymousEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase2/AnonymousPOJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase2/AnonymousPOJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -50,7 +50,7 @@
public void testPOJOEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "POJOEndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/POJOEndpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/POJOEndpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
@@ -60,7 +60,7 @@
public void testEJB3Endpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/EJB3Endpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -50,7 +50,7 @@
public void testEJB3Endpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/EJB3Endpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -88,10 +88,15 @@
}
//call endpoint
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
res.getWriter().print("1");
}
More information about the jbossws-commits
mailing list