cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Get the tools/wsdlto/test tests to behave identically inside and outside of eclipse
Date Fri, 09 May 2014 18:33:45 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 2bc5efe54 -> 4491a840c


Get the tools/wsdlto/test tests to behave identically inside and outside of eclipse


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

Branch: refs/heads/master
Commit: 4491a840c61a9355e8fd645ae0c054c7ea70f65e
Parents: 2bc5efe
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri May 9 14:33:13 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri May 9 14:33:13 2014 -0400

----------------------------------------------------------------------
 tools/wsdlto/test/pom.xml                                     | 6 ++++++
 .../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java   | 2 +-
 .../tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 7 ++++---
 .../src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl     | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4491a840/tools/wsdlto/test/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml
index da7eb1f..eb90a23 100644
--- a/tools/wsdlto/test/pom.xml
+++ b/tools/wsdlto/test/pom.xml
@@ -91,6 +91,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4491a840/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index daf989b..f71a0fc 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1172,7 +1172,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
                        // to figure out which parts are headers and which are body for rpc/lit
         processor.setContext(env);
         processor.execute();
-        Class<?> cls = classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeader");
+        Class<?> cls = classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeaderPort");
 
         Method meths[] = cls.getMethods();
         for (Method m : meths) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/4491a840/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index f15d061..ee08c7b 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -20,13 +20,13 @@
 package org.apache.cxf.tools.wsdlto.jaxws.wsdl11;
 
 import java.util.Map;
+
 import javax.wsdl.Binding;
 import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
-import javax.wsdl.extensions.http.HTTPAddress;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.BusFactory;
@@ -34,6 +34,7 @@ import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
 import org.apache.cxf.wsdl.JAXBExtensibilityElement;
+import org.apache.cxf.wsdl.http.AddressType;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -76,8 +77,8 @@ public class JAXWSDefinitionBuilderTest extends Assert {
         if (obj instanceof JAXBExtensibilityElement) {
             obj = ((JAXBExtensibilityElement)obj).getValue();
         }
-        assertTrue(obj.getClass().getName() + " is not an HTTPAddress",
-                   obj instanceof HTTPAddress);
+        assertTrue(obj.getClass().getName() + " is not an AddressType",
+                   obj instanceof AddressType);
 
         Binding binding = port.getBinding();
         assertNotNull(binding);

http://git-wip-us.apache.org/repos/asf/cxf/blob/4491a840/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
index 9e2abcf..376dac0 100644
--- a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
@@ -44,7 +44,7 @@
         <wsdl:part name="out" type="xsd:string"/>
         <wsdl:part name="inOutHeader" element="x1:headerMessage"/>
     </wsdl:message>
-    <wsdl:portType name="TestRPCHeader">
+    <wsdl:portType name="TestRPCHeaderPort">
         <wsdl:operation name="testHeader1">
             <wsdl:input name="testHeader1Request" message="tns:testHeader1Request"/>
             <wsdl:output name="testHeader1Response" message="tns:testHeader1Response"/>
@@ -54,7 +54,7 @@
             <wsdl:output name="testInOutHeaderResponse" message="tns:testInOutHeaderResponse"/>
         </wsdl:operation>
     </wsdl:portType>
-    <wsdl:binding name="TestHeader_SOAPRPCBinding" type="tns:TestRPCHeader">
+    <wsdl:binding name="TestHeader_SOAPRPCBinding" type="tns:TestRPCHeaderPort">
         <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
         <wsdl:operation name="testHeader1">
             <soap:operation/>


Mime
View raw message