Author: asoldano
Date: 2014-05-06 09:38:19 -0400 (Tue, 06 May 2014)
New Revision: 18615
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
Log:
[JBWS-3686] Workaround for CXF-5726 (move oneway invocations to wsrm endpoints after
req-res ones) + explicit close of client proxy in WS-RM testcases (unless the Bus is
already being shutdown)
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2014-05-06
11:49:15 UTC (rev 18614)
+++
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2014-05-06
13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -66,5 +67,6 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+ ((Client)port).destroy();
}
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2014-05-06
11:49:15 UTC (rev 18614)
+++
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2014-05-06
13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -66,5 +67,6 @@
Object retObj = port.echo("Hello");
assertEquals("Hello", retObj);
+ ((Client)port).destroy();
}
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2014-05-06
11:49:15 UTC (rev 18614)
+++
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2014-05-06
13:38:19 UTC (rev 18615)
@@ -28,6 +28,7 @@
import junit.framework.Test;
+import org.apache.cxf.endpoint.Client;
import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
@@ -57,11 +58,19 @@
Service service = Service.create(wsdlURL, serviceName);
proxy = (SimpleService)service.getPort(SimpleService.class);
}
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (proxy != null) {
+ ((Client)proxy).destroy();
+ }
+ }
public void test() throws Exception
{
+ assertEquals("Hello World!", proxy.echo("Hello World!")); //
request responce call
proxy.ping(); // one way call
- assertEquals("Hello World!", proxy.echo("Hello World!")); //
request responce call
}
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-05-06
11:49:15 UTC (rev 18614)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2014-05-06
13:38:19 UTC (rev 18615)
@@ -62,8 +62,8 @@
SimpleService proxy = (SimpleService)service.getPort(SimpleService.class);
((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
serviceURL);
+ assertEquals("Hello World!", proxy.echo("Hello World!")); //
request response call
proxy.ping(); // one way call
- assertEquals("Hello World!", proxy.echo("Hello World!")); //
request response call
} finally {
bus.shutdown(true);
}
Show replies by date