Author: dkulp
Date: Fri Jun 11 17:55:21 2010
New Revision: 953794
URL: http://svn.apache.org/viewvc?rev=953794&view=rev
Log:
Merged revisions 951153 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r951153 | dkulp | 2010-06-03 17:05:33 -0400 (Thu, 03 Jun 2010) | 1 line
Missed converting some tests to dynamic ports
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerNoBodyParts.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java?rev=953794&r1=953793&r2=953794&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
Fri Jun 11 17:55:21 2010
@@ -31,10 +31,13 @@ import org.apache.cxf.jaxws.endpoint.dyn
import org.apache.cxf.no_body_parts.types.Operation1;
import org.apache.cxf.no_body_parts.types.Operation1Response;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.BeforeClass;
import org.junit.Test;
public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
+ static final String PORT = TestUtil.getPortNumber(ServerNoBodyParts.class);
private String md5(byte[] bytes) {
MessageDigest algorithm;
@@ -64,7 +67,7 @@ public class JaxWsDynamicClientTest exte
public void testInvocation() throws Exception {
JaxWsDynamicClientFactory dcf =
JaxWsDynamicClientFactory.newInstance();
- URL wsdlURL = new
URL("http://localhost:9020/NoBodyParts/NoBodyPartsService?wsdl";);
+ URL wsdlURL = new URL("http://localhost:"; + PORT +
"/NoBodyParts/NoBodyPartsService?wsdl");
Client client = dcf.createClient(wsdlURL);
byte[] bucketOfBytes =
IOUtils.readBytesFromStream(getClass().getResourceAsStream("/wsdl/no_body_parts.wsdl"));
Modified:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java?rev=953794&r1=953793&r2=953794&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java
Fri Jun 11 17:55:21 2010
@@ -37,12 +37,13 @@ import org.junit.Test;
*
*/
public class JaxwsExecutorTest extends AbstractBusClientServerTestBase {
-
+ static final String PORT = allocatePort(ServerNoBodyParts.class);
+
public static class Server extends AbstractBusTestServerBase {
protected void run() {
GreeterImpl implementor = new GreeterImpl();
- String address = "http://localhost:9020/SoapContext/GreeterPort";;
+ String address = "http://localhost:"; + PORT +
"/SoapContext/GreeterPort";
javax.xml.ws.Endpoint.publish(address, implementor);
}
@@ -97,6 +98,7 @@ public class JaxwsExecutorTest extends
assertSame(executor, service.getExecutor());
Greeter proxy = service.getGreeterPort();
+ updateAddressPort(proxy, PORT);
assertEquals(0, executor.getCount());
Modified:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?rev=953794&r1=953793&r2=953794&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
Fri Jun 11 17:55:21 2010
@@ -39,6 +39,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
+ static final String PORT = allocatePort(MyServer.class);
static final Logger LOG =
LogUtils.getLogger(LocatorClientServerTest.class);
private final QName serviceName = new QName("http://apache.org/locator";,
"LocatorService");
@@ -47,7 +48,7 @@ public class LocatorClientServerTest ext
protected void run() {
Object implementor = new LocatorServiceImpl();
- String address = "http://localhost:6006/services/LocatorService";;
+ String address = "http://localhost:"; + PORT +
"/services/LocatorService";
Endpoint.publish(address, implementor);
}
@@ -78,7 +79,7 @@ public class LocatorClientServerTest ext
LocatorService_Service ss = new LocatorService_Service(wsdl,
serviceName);
LocatorService port = ss.getLocatorServicePort();
-
+ updateAddressPort(port, PORT);
W3CEndpointReferenceBuilder builder = new
W3CEndpointReferenceBuilder();
W3CEndpointReference w3cEpr = builder.build();
port.registerPeerManager(w3cEpr,
Modified:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?rev=953794&r1=953793&r2=953794&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
Fri Jun 11 17:55:21 2010
@@ -35,6 +35,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.testutil.common.TestUtil;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
@@ -46,7 +47,8 @@ import org.junit.Assert;
import org.junit.Test;
public class OASISCatalogTest extends Assert {
-
+ static final String PORT = TestUtil.getPortNumber(OASISCatalogTest.class);
+
private final QName serviceName =
new QName("http://apache.org/hello_world/services";,
"SOAPService");
@@ -57,21 +59,22 @@ public class OASISCatalogTest extends As
@Test
public void testWSDLPublishWithCatalogs() throws Exception {
- Endpoint ep = Endpoint.publish(null, new GreeterImpl());
+ Endpoint ep = Endpoint.publish("http://localhost:"; + PORT +
"/SoapContext/SoapPort",
+ new GreeterImpl());
try {
- URL url = new URL("http://localhost:9000/SoapContext/SoapPort?";
+ URL url = new URL("http://localhost:"; + PORT +
"/SoapContext/SoapPort?"
+ "xsd=hello_world_schema2.xsd");
assertNotNull(url.getContent());
String result = IOUtils.toString((InputStream)url.getContent());
assertTrue(result, result.contains("xsd=hello_world_schema.xsd"));
- url = new URL("http://localhost:9000/SoapContext/SoapPort";
+ url = new URL("http://localhost:"; + PORT + "/SoapContext/SoapPort"
+ "?xsd=hello_world_schema.xsd");
result = IOUtils.toString((InputStream)url.getContent());
assertTrue(result, result.contains("xsd=hello_world_schema2.xsd"));
- url = new URL("http://localhost:9000/SoapContext/SoapPort";
+ url = new URL("http://localhost:"; + PORT + "/SoapContext/SoapPort"
+
"?wsdl=testutils/others/hello_world_messages_catalog.wsdl");
result = IOUtils.toString((InputStream)url.getContent());
assertTrue(result, result.contains("xsd=hello_world_schema.xsd"));
Modified:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerNoBodyParts.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerNoBodyParts.java?rev=953794&r1=953793&r2=953794&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerNoBodyParts.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerNoBodyParts.java
Fri Jun 11 17:55:21 2010
@@ -25,10 +25,11 @@ import org.apache.cxf.no_body_parts.NoBo
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class ServerNoBodyParts extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(ServerNoBodyParts.class);
protected void run() {
Object implementor = new NoBodyPartsImpl();
- String address =
"http://localhost:9020/NoBodyParts/NoBodyPartsService";;
+ String address = "http://localhost:"; + PORT +
"/NoBodyParts/NoBodyPartsService";
Endpoint.publish(address, implementor);
}
