You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2014/04/28 10:53:21 UTC
git commit: Improved test for URIDomainBuilder: register builder
locally
Repository: cxf
Updated Branches:
refs/heads/master 76e65e786 -> 99a1f19ab
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/99a1f19a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99a1f19a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99a1f19a
Branch: refs/heads/master
Commit: 99a1f19ab072952f3a774018f252ee7d2f973f1a
Parents: 76e65e7
Author: Andrei Shakirin <an...@gmail.com>
Authored: Mon Apr 28 10:53:05 2014 +0200
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Mon Apr 28 10:53:05 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/99a1f19a/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/99a1f19a/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/99a1f19a/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