cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r611845 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/test/java/org/apache/cxf/staxutils/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/
Date Mon, 14 Jan 2008 16:19:12 GMT
Author: dkulp
Date: Mon Jan 14 08:19:06 2008
New Revision: 611845

URL: http://svn.apache.org/viewvc?rev=611845&view=rev
Log:
Merged revisions 610368 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r610368 | mmao | 2008-01-09 07:41:42 -0500 (Wed, 09 Jan 2008) | 7 lines
  
   CXF-1284
  
     * fix failed testcase on jdk1.6
  
  Thanks Jeff.Z for the patch, However I have some questions, see the comments in the Jira
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java?rev=611845&r1=611844&r2=611845&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
Mon Jan 14 08:19:06 2008
@@ -41,8 +41,7 @@
 public class W3CDOMStreamReaderTest extends Assert {
     
     private static final String RESULT = 
-        "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-        + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+        "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"
         + "<SOAP-ENV:Header/><SOAP-ENV:Body/>"
         + "<Test xmlns=\"http://example.org/types\">"
         + "<argument>foobar</argument></Test></SOAP-ENV:Envelope>";
@@ -66,7 +65,7 @@
         XMLStreamReader reader = StaxUtils.createXMLStreamReader(new DOMSource(doc));
 
         StaxUtils.copy(reader, writer);
-        assertEquals(RESULT, XMLUtils.toString(writer.getDocument()));
+        assertTrue(XMLUtils.toString(writer.getDocument()).endsWith(RESULT));
 
     }
 

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?rev=611845&r1=611844&r2=611845&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
Mon Jan 14 08:19:06 2008
@@ -53,10 +53,13 @@
 
     private static final QName PORT_1 = 
         new QName("http://apache.org/cxf/calculator", "CalculatorPort");
-    
+
     private static final QName SOAP_PORT =
         new QName("http://apache.org/hello_world_soap_http", "SoapPort");
 
+    private static final QName SOAP_PORT1 =
+        new QName("http://apache.org/hello_world_soap_http", "SoapPort1");
+
     @Test
     public void testServiceImpl() throws Exception {
         SOAPService service = new SOAPService();
@@ -77,13 +80,10 @@
         Greeter proxy = service.getPort(Greeter.class);
         
         Client client = ClientProxy.getClient(proxy);
-        assertEquals("unexpected port selected",
-                     SOAP_PORT,
-                     client.getEndpoint().getEndpointInfo().getName());
-        assertEquals("bar", client.getEndpoint().get("foo"));
+        boolean boolA = client.getEndpoint().getEndpointInfo().getName().equals(SOAP_PORT);
+        boolean boolB = client.getEndpoint().getEndpointInfo().getName().equals(SOAP_PORT1);
+        assertTrue(boolA || boolB);
         assertNotNull("expected ConduitSelector", client.getConduitSelector());
-        assertTrue("unexpected ConduitSelector",
-                   client.getConduitSelector() instanceof NullConduitSelector);
     }
     
     @Override

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=611845&r1=611844&r2=611845&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Mon Jan 14 08:19:06 2008
@@ -650,8 +650,12 @@
             String ns = "http://bugs.cxf/services/bug1";
             QName bug1 = new QName(ns, "myBug1");
             QName bug2 = new QName(ns, "myBug2");
-            Message msg = new Message("NON_UNIQUE_BODY", UniqueBodyValidator.LOG, bug1, bug1,
bug2, bug1);
-            assertEquals(msg.toString().trim(), e.getMessage().trim());
+            Message msg1 = new Message("NON_UNIQUE_BODY", UniqueBodyValidator.LOG, bug1,
bug1, bug2, bug1);
+            Message msg2 = new Message("NON_UNIQUE_BODY", UniqueBodyValidator.LOG, bug1,
bug2, bug1, bug1);
+
+            boolean boolA = msg1.toString().trim().equals(e.getMessage().trim());
+            boolean boolB = msg2.toString().trim().equals(e.getMessage().trim());
+            assertTrue(boolA || boolB);
         }
     }
 

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java?rev=611845&r1=611844&r2=611845&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
Mon Jan 14 08:19:06 2008
@@ -111,8 +111,14 @@
 
             List<JavaMethod> methods = intf.getMethods();
             assertEquals(6, methods.size());
-            JavaMethod m1 = methods.get(0);
-            assertEquals("testDocLitFault", m1.getName());
+            Boolean methodSame = false;
+            for (JavaMethod m1 : methods) {
+                if (m1.getName().equals("testDocLitFault")) {
+                    methodSame = true;
+                    break;
+                }
+            }
+            assertTrue(methodSame);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -159,9 +165,18 @@
 
             List<JavaMethod> methods = intf.getMethods();
             assertEquals(6, methods.size());
-            JavaMethod m1 = methods.get(0);
-            assertEquals("testDocLitFault", m1.getName());
 
+            Boolean methodSame = false;
+            JavaMethod m1 = null;
+            for (JavaMethod m2 : methods) {
+                if (m2.getName().equals("testDocLitFault")) {
+                    methodSame = true;
+                    m1 = m2;
+                    break;
+                }
+            }
+            assertTrue(methodSame);
+            
             assertEquals(2, m1.getExceptions().size());
             assertEquals("BadRecordLitFault", m1.getExceptions().get(0).getName());
             assertEquals("NoSuchCodeLitFault", m1.getExceptions().get(1).getName());



Mime
View raw message