cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Fix test failures
Date Fri, 30 Oct 2015 15:58:29 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes ec5a2135a -> 7dbada761


Fix test failures


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7dbada76
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7dbada76
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7dbada76

Branch: refs/heads/2.7.x-fixes
Commit: 7dbada76113a5ac539f70319ba90a9427bdde0fe
Parents: ec5a213
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Oct 30 11:56:59 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Oct 30 11:56:59 2015 -0400

----------------------------------------------------------------------
 .../systest/jms/JMSClientServerGzipTest.java    | 23 ++++++++++++--------
 .../systest/jms/JMSClientServerSoap12Test.java  | 22 ++++++++++++-------
 2 files changed, 28 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7dbada76/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
index b372232..97b7b71 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
@@ -47,8 +47,8 @@ public class JMSClientServerGzipTest extends AbstractBusClientServerTestBase
{
     public static final String PORT = allocatePort(GzipServer.class);
     
     static EmbeddedJMSBrokerLauncher broker;
-    private String wsdlString;
-    
+    private static String serverWsdlString;
+    private static String wsdlString;
     
     public static class GzipServer extends AbstractBusTestServerBase {
         Endpoint ep;
@@ -58,7 +58,14 @@ public class JMSClientServerGzipTest extends AbstractBusClientServerTestBase
{
             Bus bus = bf.createBus("org/apache/cxf/systest/jms/gzipBus.xml");
             BusFactory.setDefaultBus(bus);
             setBus(bus);
-            broker.updateWsdl(bus, "testutils/hello_world_doc_lit.wsdl");
+            
+            serverWsdlString = "testutils/hello_world_doc_lit.wsdl".intern();
+            broker.updateWsdl(bus, serverWsdlString);
+            
+            URL u = getClass().getResource("/wsdl/hello_world_doc_lit.wsdl");
+            wsdlString = u.toString().intern();
+            broker.updateWsdl(getBus(), wsdlString);
+
             ep = Endpoint.publish(null, impleDoc);
         }
         public void tearDown() {
@@ -74,12 +81,10 @@ public class JMSClientServerGzipTest extends AbstractBusClientServerTestBase
{
         
     }
     
-    public URL getWSDLURL(String s) throws Exception {
+    public URL getWSDLURL(String s, Bus bus) throws Exception {
         URL u = getClass().getResource(s);
         wsdlString = u.toString().intern();
-        broker.updateWsdl(getBus(), wsdlString);
-        System.gc();
-        System.gc();
+        broker.updateWsdl(bus, wsdlString);
         return u;
     }
     public QName getServiceName(QName q) {
@@ -94,10 +99,10 @@ public class JMSClientServerGzipTest extends AbstractBusClientServerTestBase
{
         SpringBusFactory bf = new SpringBusFactory();
         Bus bus = bf.createBus("org/apache/cxf/systest/jms/gzipBus.xml");
         BusFactory.setDefaultBus(bus);
-        QName serviceName = getServiceName(new QName("http://apache.org/hello_world_doc_lit",

+        QName serviceName = getServiceName(new QName("http://apache.org/hello_world_doc_lit",
                                  "SOAPService2"));
         QName portName = getPortName(new QName("http://apache.org/hello_world_doc_lit", "SoapPort2"));
-        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl", bus);
         assertNotNull(wsdl);
 
         SOAPService2 service = new SOAPService2(wsdl, serviceName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/7dbada76/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
index 5fa1620..4b2a9e9 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
@@ -50,7 +50,8 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
     
     static EmbeddedJMSBrokerLauncher broker;
 
-    private String wsdlString;
+    private static String serverWsdlString;
+    private static String wsdlString;
     
     public static class Soap12Server extends AbstractBusTestServerBase {
         public static final String PORT = allocatePort(Soap12Server.class);
@@ -61,7 +62,14 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
             Bus bus = bf.createBus("org/apache/cxf/systest/jms/soap12Bus.xml");
             BusFactory.setDefaultBus(bus);
             setBus(bus);
-            broker.updateWsdl(bus, "testutils/hello_world_doc_lit.wsdl");
+            
+            serverWsdlString = "testutils/hello_world_doc_lit.wsdl".intern();
+            broker.updateWsdl(bus, serverWsdlString);
+            
+            URL u = getClass().getResource("/wsdl/hello_world_doc_lit.wsdl");
+            wsdlString = u.toString().intern();
+            broker.updateWsdl(getBus(), wsdlString);
+            
             Endpoint.publish(null, impleDoc);
         }
     }
@@ -75,12 +83,10 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
                    launchServer(Soap12Server.class, true));
     }
     
-    public URL getWSDLURL(String s) throws Exception {
+    public URL getWSDLURL(String s, Bus bus) throws Exception {
         URL u = getClass().getResource(s);
         wsdlString = u.toString().intern();
-        broker.updateWsdl(getBus(), wsdlString);
-        System.gc();
-        System.gc();
+        broker.updateWsdl(bus, wsdlString);
         return u;
     }
     public QName getServiceName(QName q) {
@@ -98,7 +104,7 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
         QName serviceName = getServiceName(new QName("http://apache.org/hello_world_doc_lit",

                                  "SOAPService8"));
         QName portName = getPortName(new QName("http://apache.org/hello_world_doc_lit", "SoapPort8"));
-        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl", bus);
         assertNotNull(wsdl);
 
         SOAPService2 service = new SOAPService2(wsdl, serviceName);
@@ -154,7 +160,7 @@ public class JMSClientServerSoap12Test extends AbstractBusClientServerTestBase
{
         QName serviceName = new QName("http://apache.org/hello_world_doc_lit", 
                                  "SOAPService8");
         QName portName = new QName("http://apache.org/hello_world_doc_lit", "SoapPort8");
-        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl", bus);
         SOAPService2 service = new SOAPService2(wsdl, serviceName);
         Greeter greeter = service.getPort(portName, Greeter.class, new AddressingFeature());
 


Mime
View raw message