[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations
[CXF-6923] Fix test execution for different ORB implementations
(cherry picked from commit 08c2c22439dcd85c19b21e555d45692135faae43)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/25578641
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/25578641
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/25578641
Branch: refs/heads/3.0.x-fixes
Commit: 25578641211049fcf65705eabbddc179a09313d0
Parents: 99036e5
Author: Grzegorz Grzybek
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Freeman Fang
Committed: Tue May 31 14:28:29 2016 +0800
--
.../systest/corba/BaseGreeterTimeoutImpl.java | 25 +--
.../cxf/systest/corba/CorbaTimeoutTest.java | 24 ++-
.../apache/cxf/systest/corba/ServerTimeout.java | 2 +-
.../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
4 files changed, 214 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/25578641/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
*/
package org.apache.cxf.systest.corba;
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
import org.junit.Assert;
/**
@@ -46,14 +41,13 @@ import org.junit.Assert;
* under the License.
*/
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
targetNamespace = "http://cxf.apache.org/hello_world_corba";,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation =
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
public static final String GREETME_OUT = "test out";
static final String EX_STRING = "CXF RUNTIME EXCEPTION";
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements
Greeter {
}
public void greetMeOneWay(String me) {
-assertEquals("William", me);
}
public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert
implements Greeter {
}
public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/25578641/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
package org.apache.cxf.systest.corba;
import java.io.File;
+import java.lang.reflect.Field;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import org.junit.Test;
import org.omg.CORBA.TIMEOUT;
[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations
[CXF-6923] Fix test execution for different ORB implementations
(cherry picked from commit 08c2c22439dcd85c19b21e555d45692135faae43)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/76f7fad3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/76f7fad3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/76f7fad3
Branch: refs/heads/master
Commit: 76f7fad3558a129e1e34352b0188eced086d8c36
Parents: 0865c3a
Author: Grzegorz Grzybek
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Freeman Fang
Committed: Tue May 31 14:22:46 2016 +0800
--
.../systest/corba/BaseGreeterTimeoutImpl.java | 25 +--
.../cxf/systest/corba/CorbaTimeoutTest.java | 24 ++-
.../apache/cxf/systest/corba/ServerTimeout.java | 2 +-
.../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
4 files changed, 214 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/76f7fad3/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
*/
package org.apache.cxf.systest.corba;
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
import org.junit.Assert;
/**
@@ -46,14 +41,13 @@ import org.junit.Assert;
* under the License.
*/
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
targetNamespace = "http://cxf.apache.org/hello_world_corba";,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation =
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
public static final String GREETME_OUT = "test out";
static final String EX_STRING = "CXF RUNTIME EXCEPTION";
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements
Greeter {
}
public void greetMeOneWay(String me) {
-assertEquals("William", me);
}
public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert
implements Greeter {
}
public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/76f7fad3/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
package org.apache.cxf.systest.corba;
import java.io.File;
+import java.lang.reflect.Field;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import org.junit.Test;
import org.omg.CORBA.TIMEOUT;
/**
[2/3] cxf git commit: [CXF-6923] Fix test execution for different ORB implementations
[CXF-6923] Fix test execution for different ORB implementations
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08c2c224
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08c2c224
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08c2c224
Branch: refs/heads/3.1.x-fixes
Commit: 08c2c22439dcd85c19b21e555d45692135faae43
Parents: 0759f57
Author: Grzegorz Grzybek
Authored: Mon May 30 20:57:15 2016 +0200
Committer: Grzegorz Grzybek
Committed: Mon May 30 21:06:34 2016 +0200
--
.../systest/corba/BaseGreeterTimeoutImpl.java | 25 +--
.../cxf/systest/corba/CorbaTimeoutTest.java | 24 ++-
.../apache/cxf/systest/corba/ServerTimeout.java | 2 +-
.../wsdl_systest/hello_world_corba_timeout.wsdl | 191 +++
4 files changed, 214 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/08c2c224/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
index efa0503..b89b993 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java
@@ -18,13 +18,8 @@
*/
package org.apache.cxf.systest.corba;
-import java.util.ResourceBundle;
-
-import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.PingMeFault;
-import org.apache.cxf.hello_world_corba.types.FaultDetail;
-import org.apache.cxf.interceptor.Fault;
import org.junit.Assert;
/**
@@ -46,14 +41,13 @@ import org.junit.Assert;
* under the License.
*/
-@javax.jws.WebService(portName = "GreeterCORBAPort",
-serviceName = "GreeterCORBAService",
+@javax.jws.WebService(portName = "GreeterTimeoutCORBAPort",
+serviceName = "GreeterTimeoutCORBAService",
targetNamespace = "http://cxf.apache.org/hello_world_corba";,
-wsdlLocation = "classpath:/wsdl_systest/hello_world_corba.wsdl",
+wsdlLocation =
"classpath:/wsdl_systest/hello_world_corba_timeout.wsdl",
endpointInterface = "org.apache.cxf.hello_world_corba.Greeter")
public class BaseGreeterTimeoutImpl extends Assert implements Greeter {
-public static final String GREETME_IN = "test in";
public static final String GREETME_OUT = "test out";
static final String EX_STRING = "CXF RUNTIME EXCEPTION";
@@ -72,7 +66,6 @@ public class BaseGreeterTimeoutImpl extends Assert implements
Greeter {
}
public void greetMeOneWay(String me) {
-assertEquals("William", me);
}
public String sayHi() {
@@ -80,17 +73,5 @@ public class BaseGreeterTimeoutImpl extends Assert
implements Greeter {
}
public void pingMe(String faultType) throws PingMeFault {
-if ("USER".equals(faultType)) {
-
-FaultDetail detail = new FaultDetail();
-detail.setMajor((short)1);
-detail.setMinor((short)2);
-throw new PingMeFault("USER FAULT TEST", detail);
-} else if ("SYSTEM".equals(faultType)) {
-throw new Fault(new Message(EX_STRING, (ResourceBundle)null,
-new Object[]{"FAULT TEST"}));
-} else {
-throw new IllegalArgumentException(EX_STRING);
-}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/08c2c224/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
--
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index db7fb34..a52c0d8 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -20,10 +20,12 @@
package org.apache.cxf.systest.corba;
import java.io.File;
+import java.lang.reflect.Field;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
+import org.apache.cxf.binding.corba.utils.CorbaBindingHelper;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.hello_world_corba.Greeter;
import org.apache.cxf.hello_world_corba.GreeterCORBAService;
@@ -34,7 +36,7 @@ import org.junit.Test;
import org.omg.CORBA.TIMEOUT;
/**
- *
+ * This test uses Jacorb implementation, but cleans aft
