cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashaki...@apache.org
Subject git commit: Improved test for URIDomainBuilder: register builder locally
Date Mon, 28 Apr 2014 09:37:54 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 3594f3313 -> 586393e29


Improved test for URIDomainBuilder: register builder locally


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

Branch: refs/heads/2.7.x-fixes
Commit: 586393e298e11092da216489fc636c35709e99b2
Parents: 3594f33
Author: Andrei Shakirin <andrei.shakirin@gmail.com>
Authored: Mon Apr 28 10:53:05 2014 +0200
Committer: Andrei Shakirin <andrei.shakirin@gmail.com>
Committed: Mon Apr 28 10:54:30 2014 +0200

----------------------------------------------------------------------
 ...ssingPolicyExternalAttachmentWsdl11Test.java | 23 --------------------
 .../cxf/systest/ws/policy/addr-wsdl11.xml       |  2 ++
 .../resources/META-INF/cxf/bus-extensions.txt   |  1 -
 3 files changed, 2 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/586393e2/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java
index b813f28..d44ee8d 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java
@@ -30,7 +30,6 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.greeter_control.BasicGreeterService;
 import org.apache.cxf.greeter_control.Greeter;
-import org.apache.cxf.greeter_control.PingMeFault;
 import org.apache.cxf.helpers.FileUtils;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -38,7 +37,6 @@ import org.apache.cxf.systest.ws.util.ConnectionHelper;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.testutil.common.TestUtil;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -130,29 +128,8 @@ public class AddressingPolicyExternalAttachmentWsdl11Test extends AbstractBusCli
         LOG.fine("Created greeter client.");     
         ConnectionHelper.setKeepAliveConnection(greeter, true);
 
-        // oneway
-
-        //greeter.greetMeOneWay("CXF");
-
-        // two-way
-
         assertEquals("CXF", greeter.greetMe("cxf")); 
      
-        // exception
-
-        try {
-            greeter.pingMe();
-        } catch (PingMeFault ex) {
-            fail("First invocation should have succeeded.");
-        } 
-       
-        try {
-            greeter.pingMe();
-            fail("Expected PingMeFault not thrown.");
-        } catch (PingMeFault ex) {
-            assertEquals(2, ex.getFaultInfo().getMajor());
-            assertEquals(1, ex.getFaultInfo().getMinor());
-        } 
         ((Closeable)greeter).close();
 
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/586393e2/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
index 8017ebd..046c92b 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-wsdl11.xml
@@ -28,4 +28,6 @@
         </cxf:features>
     </cxf:bus>
     <p:externalAttachment location="${temp.location}/addr-external-wsdl11.xml"/>
+    <bean id="uriDomainExpressionBuilder" class="org.apache.cxf.ws.policy.attachment.external.URIDomainExpressionBuilder"/>
+    
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/586393e2/systests/ws-specs/src/test/resources/META-INF/cxf/bus-extensions.txt
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/resources/META-INF/cxf/bus-extensions.txt b/systests/ws-specs/src/test/resources/META-INF/cxf/bus-extensions.txt
deleted file mode 100644
index d61606c..0000000
--- a/systests/ws-specs/src/test/resources/META-INF/cxf/bus-extensions.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.ws.policy.attachment.external.URIDomainExpressionBuilder::true
\ No newline at end of file


Mime
View raw message