5:12 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-06-14 06:12:04 -0400 (Fri, 14 Jun 2013)
New Revision: 17674
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
Log:
Misc refactoring of tests to avoid "polluting" buses that might be used by other
threads or later by other tests running on the same threads
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-06-14
09:08:07 UTC (rev 17673)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-06-14
10:12:04 UTC (rev 17674)
@@ -26,7 +26,6 @@
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
@@ -50,27 +49,31 @@
public void testInfoset() throws Exception
- {
- ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
- ByteArrayOutputStream in = new java.io.ByteArrayOutputStream();
- LoggingInInterceptor login = new LoggingInInterceptor(new PrintWriter(in));
- LoggingOutInterceptor logout = new LoggingOutInterceptor(new PrintWriter(out));
- Bus bus = BusFactory.getThreadDefaultBus();
- bus.getInInterceptors().add(login);
- bus.getOutInterceptors().add(logout);
-
- URL wsdlURL = new URL(endpointURl + "?wsdl");
- QName serviceName = new
QName("http://org.jboss.ws/jaxws/cxf/fastinfoset",
"HelloWorldService");
- Service service = Service.create(wsdlURL, serviceName);
- QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset",
"HelloWorldImplPort");
- HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class);
-
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:9090/jaxws-cxf-fastinfoset/HelloWorldService/HelloWorldImpl");
- assertEquals("helloworld" , port.echo("helloworld"));
- assertTrue("request is expected fastinfoset", new
String(out.toByteArray()).indexOf("application/fastinfoset") > -1);
- assertTrue("response is expected fastinfoset", new
String(in.toByteArray()).indexOf("application/fastinfoset") > -1);
- out.close();
- in.close();
-
+ {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ByteArrayOutputStream in = new ByteArrayOutputStream();
+ PrintWriter pwIn = new PrintWriter(in);
+ PrintWriter pwOut = new PrintWriter(out);
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ try {
+ bus.getInInterceptors().add(new LoggingInInterceptor(pwIn));
+ bus.getOutInterceptors().add(new LoggingOutInterceptor(pwOut));
+
+ URL wsdlURL = new URL(endpointURl + "?wsdl");
+ QName serviceName = new
QName("http://org.jboss.ws/jaxws/cxf/fastinfoset",
"HelloWorldService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new
QName("http://org.jboss.ws/jaxws/cxf/fastinfoset",
"HelloWorldImplPort");
+ HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class);
+ assertEquals("helloworld", port.echo("helloworld"));
+ assertTrue("request is expected fastinfoset",
out.toString().indexOf("application/fastinfoset") > -1);
+ assertTrue("response is expected fastinfoset",
in.toString().indexOf("application/fastinfoset") > -1);
+ } finally {
+ bus.shutdown(true);
+ pwOut.close();
+ pwIn.close();
+ }
+
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-06-14
09:08:07 UTC (rev 17673)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-06-14
10:12:04 UTC (rev 17674)
@@ -77,7 +77,7 @@
Client client = ClientProxy.getClient(port);
GZIPFeature gzipFeature = new GZIPFeature();
gzipFeature.setThreshold(0);
- gzipFeature.initialize(client, BusFactory.getThreadDefaultBus());
+ gzipFeature.initialize(client, null); //bus parameter not actually used
return ("foo".equals(port.echo("foo")));
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-06-14
09:08:07 UTC (rev 17673)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-06-14
10:12:04 UTC (rev 17674)
@@ -56,35 +56,45 @@
public void testClientLifeCycleManager()
{
Bus bus = BusFactory.newInstance().createBus();
- assertNotNull("Cannot find ClientLifeCycleManager impl in current bus",
bus.getExtension(ClientLifeCycleManager.class));
- bus.shutdown(true);
+ try {
+ assertNotNull("Cannot find ClientLifeCycleManager impl in current
bus", bus.getExtension(ClientLifeCycleManager.class));
+ } finally {
+ bus.shutdown(true);
+ }
}
public void testServerLifeCycleManager()
{
Bus bus = BusFactory.newInstance().createBus();
- assertNotNull("Cannot find ServerLifeCycleManager impl in current bus",
bus.getExtension(ServerLifeCycleManager.class));
- bus.shutdown(true);
+ try {
+ assertNotNull("Cannot find ServerLifeCycleManager impl in current
bus", bus.getExtension(ServerLifeCycleManager.class));
+ } finally {
+ bus.shutdown(true);
+ }
}
public void testCustomClientLifeCycleListener() throws Exception
{
- URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
- QName serviceOneName = new QName(targetNS, "ServiceOne");
- Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
- Bus bus = BusFactory.getThreadDefaultBus(false);
- CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
- ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
try {
- mgr.registerListener(listener);
- assertEquals(0, listener.getCount());
- EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
- assertEquals(1, listener.getCount());
- assertEquals("Foo", portOne.echo("Foo"));
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener();
+ ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class);
+ try {
+ mgr.registerListener(listener);
+ assertEquals(0, listener.getCount());
+ EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ assertEquals(1, listener.getCount());
+ assertEquals("Foo", portOne.echo("Foo"));
+ } finally {
+ mgr.unRegisterListener(listener);
+ }
} finally {
- mgr.unRegisterListener(listener);
+ bus.shutdown(true);
}
-
}
private class CustomClientLifeCycleListener implements ClientLifeCycleListener