You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/04/26 07:19:33 UTC
svn commit: r532615 [9/13] - in /webservices/axis2/branches/java/1_2/modules:
jaxws-api/src/javax/xml/ws/handler/soap/ jaxws-api/src/javax/xml/ws/soap/
jaxws/ jaxws/src/org/apache/axis2/jaxws/
jaxws/src/org/apache/axis2/jaxws/binding/ jaxws/src/org/apa...
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.provider.source;
+import org.apache.axis2.jaxws.TestLogger;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.StringWriter;
@@ -38,8 +40,8 @@
// Same logic as StringProvider
public Source invoke(Source source) {
-
- System.out.println(">> SourceProvider: Request received.\n");
+
+ TestLogger.logger.debug(">> SourceProvider: Request received.\n");
if (source == null) {
return source;
}
@@ -59,7 +61,7 @@
throw new WebServiceException(e);
}
String text = writer.getBuffer().toString();
- System.out.println(">> Source Request on Server: \n"+ text);
+ TestLogger.logger.debug(">> Source Request on Server: \n" + text);
if (text != null && text.contains("throwWebServiceException")) {
throw new WebServiceException("provider");
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.provider.sourcemsg;
+import org.apache.axis2.jaxws.TestLogger;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.StringWriter;
@@ -36,7 +38,7 @@
public class SourceMessageProvider implements Provider<Source> {
String responseAsString = new String("<?xml version=\"1.0\" encoding=\"UTF-8\"?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"><soapenv:Header/><soapenv:Body><ns2:ReturnType xmlns:ns2=\"http://test\"><return_str>some response</return_str></ns2:ReturnType></soapenv:Body></soapenv:Envelope>");
public Source invoke(Source source) {
- System.out.println(">> SourceMessageProvider: Request received.");
+ TestLogger.logger.debug(">> SourceMessageProvider: Request received.");
//System.out.println(">> Source toString: \n"+source.toString());
try{
@@ -44,7 +46,8 @@
Transformer t = TransformerFactory.newInstance().newTransformer();
Result result = new StreamResult(writer);
t.transform(source, result);
- System.out.println(">> Source Request on Server: \n"+writer.getBuffer().toString());
+ TestLogger.logger
+ .debug(">> Source Request on Server: \n" + writer.getBuffer().toString());
byte[] bytes = responseAsString.getBytes();
ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/string/StringProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/string/StringProvider.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/string/StringProvider.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/string/StringProvider.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.provider.string;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceProvider;
@@ -24,7 +26,7 @@
public class StringProvider implements Provider<String> {
public String invoke(String text) {
- System.out.println("StringProvider invoke received the message [" + text + "]");
+ TestLogger.logger.debug("StringProvider invoke received the message [" + text + "]");
if (text != null && text.contains("throwWebServiceException")) {
throw new WebServiceException("provider");
} else {
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.provider.stringmsg;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.Provider;
import javax.xml.ws.Service;
import javax.xml.ws.ServiceMode;
@@ -30,12 +32,12 @@
public String invoke(String obj) {
if (obj != null) {
String str = (String) obj;
- System.out.println(">> StringMessageProvider received a new request");
- System.out.println(">> request [" + str + "]");
+ TestLogger.logger.debug(">> StringMessageProvider received a new request");
+ TestLogger.logger.debug(">> request [" + str + "]");
return responseGood;
}
- System.out.println(">> ERROR:null request received");
+ TestLogger.logger.debug(">> ERROR:null request received");
return responseBad;
}
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java Wed Apr 25 22:19:23 2007
@@ -24,6 +24,7 @@
import javax.xml.ws.Response;
import org.test.proxy.doclitwrapped.ReturnType;
+import org.apache.axis2.jaxws.TestLogger;
/**
*
@@ -42,15 +43,15 @@
Object obj = response.get();
if(obj instanceof ReturnType){
ReturnType type = (ReturnType)obj;
- System.out.println(">>Return String = "+type.getReturnStr());
+ TestLogger.logger.debug(">>Return String = " + type.getReturnStr());
return;
}
if(obj instanceof org.test.proxy.doclitnonwrapped.ReturnType){
org.test.proxy.doclitnonwrapped.ReturnType returnType = (org.test.proxy.doclitnonwrapped.ReturnType)obj;
- System.out.println(">>Return String = "+returnType.getReturnStr());
+ TestLogger.logger.debug(">>Return String = " + returnType.getReturnStr());
return;
}
- System.out.println("Response.get should have been ReturnType" );
+ TestLogger.logger.debug("Response.get should have been ReturnType");
}catch(ExecutionException e){
e.printStackTrace();
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Wed Apr 25 22:19:23 2007
@@ -34,6 +34,7 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
+import org.apache.axis2.jaxws.TestLogger;
public class GorillaDLWProxyTests extends TestCase {
@@ -88,7 +89,7 @@
String response = proxy.echoString(request);
assertTrue(response != null);
- assert(response.equals(request));
+ assertEquals(response, request);
}catch(Exception e){
e.printStackTrace();
@@ -369,7 +370,7 @@
private boolean compareLists(List in, List out) {
if (in.size() != out.size()) {
- System.out.println("Size mismatch " + in.size() + "!=" + out.size());
+ TestLogger.logger.debug("Size mismatch " + in.size() + "!=" + out.size());
return false;
}
for (int i=0; i<in.size(); i++) {
@@ -377,7 +378,7 @@
Object outItem = out.get(i);
if (inItem != null && !inItem.equals(outItem) ||
(inItem == null && inItem != outItem)) {
- System.out.println("Item " + i + " mismatch " + inItem + "!=" + outItem);
+ TestLogger.logger.debug("Item " + i + " mismatch " + inItem + "!=" + outItem);
return false;
}
@@ -387,7 +388,7 @@
private boolean compareArrays(String[] in, String[] out) {
if (in.length != out.length) {
- System.out.println("Size mismatch " + in.length + "!=" + out.length);
+ TestLogger.logger.debug("Size mismatch " + in.length + "!=" + out.length);
return false;
}
for (int i=0; i<in.length; i++) {
@@ -395,7 +396,7 @@
Object outItem = out[i];
if (inItem != null && !inItem.equals(outItem) ||
(inItem == null && inItem != outItem)) {
- System.out.println("Item " + i + " mismatch " + inItem + "!=" + outItem);
+ TestLogger.logger.debug("Item " + i + " mismatch " + inItem + "!=" + outItem);
return false;
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java Wed Apr 25 22:19:23 2007
@@ -30,6 +30,7 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.DocLitnonWrappedProxy;
import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.ProxyDocLitUnwrappedService;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.proxy.doclitnonwrapped.Invoke;
import org.test.proxy.doclitnonwrapped.ObjectFactory;
import org.test.proxy.doclitnonwrapped.ReturnType;
@@ -58,9 +59,9 @@
}
public void testInvoke(){
- System.out.println("-----------------------------------");
- System.out.println("test: " + getName());
- System.out.println(">>Testing Sync Inovoke on Proxy DocLit non-wrapped");
+ TestLogger.logger.debug("-----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+ TestLogger.logger.debug(">>Testing Sync Inovoke on Proxy DocLit non-wrapped");
ObjectFactory factory = new ObjectFactory();
Invoke invokeObj = factory.createInvoke();
invokeObj.setInvokeStr("test request for twoWay Operation");
@@ -72,15 +73,33 @@
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
ReturnType response = proxy.invoke(invokeObj);
assertNotNull(response);
- System.out.println(">>Response =" +response.getReturnStr());
-
- System.out.println("-------------------------------------");
+ TestLogger.logger.debug(">>Response =" + response.getReturnStr());
+
+ TestLogger.logger.debug("-------------------------------------");
+ }
+
+ public void testNullInvoke(){
+ TestLogger.logger.debug("-----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+ TestLogger.logger.debug(">>Testing Sync Invoke on Proxy DocLit bare with a null parameter");
+ ObjectFactory factory = new ObjectFactory();
+ Invoke invokeObj = null;
+ Service service = Service.create(null, serviceName);
+ assertNotNull(service);
+ DocLitnonWrappedProxy proxy = service.getPort(portName, DocLitnonWrappedProxy.class);
+ assertNotNull(proxy);
+ BindingProvider p = (BindingProvider)proxy;
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
+ ReturnType response = proxy.invoke(invokeObj);
+ assertNull(response);
+
+ TestLogger.logger.debug("-------------------------------------");
}
public void testInvokeAsyncCallback(){
- try{
- System.out.println("---------------------------------------");
- System.out.println("DocLitNonWrapped test case: " + getName());
+ try{
+ TestLogger.logger.debug("---------------------------------------");
+ TestLogger.logger.debug("DocLitNonWrapped test case: " + getName());
//Create wsdl url
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
@@ -91,19 +110,19 @@
//Create Service
ProxyDocLitUnwrappedService service = new ProxyDocLitUnwrappedService(wsdlUrl, serviceName);
//Create proxy
- DocLitnonWrappedProxy proxy = service.getProxyDocLitnonWrappedPort();
- System.out.println(">>Invoking Binding Provider property");
+ DocLitnonWrappedProxy proxy = service.getProxyDocLitnonWrappedPort();
+ TestLogger.logger.debug(">>Invoking Binding Provider property");
//Setup Endpoint url -- optional.
BindingProvider p = (BindingProvider)proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
- System.out.println(">> Invoking Proxy Asynchronous Callback");
+ TestLogger.logger.debug(">> Invoking Proxy Asynchronous Callback");
AsyncHandler<ReturnType> handler = new AsyncCallback();
//Invoke operation Asynchronously.
Future<?> monitor = proxy.invokeAsync(invokeObj, handler);
while(!monitor.isDone()){
Thread.sleep(1000);
}
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
e.printStackTrace();
fail("Exception received" + e);
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Wed Apr 25 22:19:23 2007
@@ -31,6 +31,7 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.DocLitWrappedProxy;
import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.ProxyDocLitWrappedService;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.proxy.doclitwrapped.ReturnType;
public class ProxyTests extends TestCase {
@@ -47,26 +48,26 @@
if(!runningOnAxis){
return;
}
- System.out.println("---------------------------------------");
- System.out.println("test:" +getName());
+ TestLogger.logger.debug("---------------------------------------");
+ TestLogger.logger.debug("test:" + getName());
String request = new String("some string request");
- System.out.println("Service Call #1");
+ TestLogger.logger.debug("Service Call #1");
ProxyDocLitWrappedService service1 = new ProxyDocLitWrappedService();
DocLitWrappedProxy proxy1 = service1.getProxyDocLitWrappedPort();
BindingProvider p1 = (BindingProvider)proxy1;
p1.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
String response1 = proxy1.invoke(request);
- System.out.println("Proxy Response =" + response1);
- System.out.println("---------------------------------------");
-
- System.out.println("Service Call #2");
+ TestLogger.logger.debug("Proxy Response =" + response1);
+ TestLogger.logger.debug("---------------------------------------");
+
+ TestLogger.logger.debug("Service Call #2");
ProxyDocLitWrappedService service2 = new ProxyDocLitWrappedService();
DocLitWrappedProxy proxy2 = service2.getProxyDocLitWrappedPort();
BindingProvider p2 = (BindingProvider)proxy2;
p2.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
String response2 = proxy2.invoke(request);
- System.out.println("Proxy Response =" + response2);
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("Proxy Response =" + response2);
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
//fail(getName() + " failed");
@@ -79,22 +80,22 @@
if(!runningOnAxis){
return;
}
- System.out.println("---------------------------------------");
- System.out.println("Test Name: "+getName());
+ TestLogger.logger.debug("---------------------------------------");
+ TestLogger.logger.debug("Test Name: " + getName());
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
Service service = Service.create(null, serviceName);
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
- System.out.println(">>Invoking Binding Provider property");
+ TestLogger.logger.debug(">>Invoking Binding Provider property");
BindingProvider p = (BindingProvider)proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
DocLitWrappedProxy dwp = (DocLitWrappedProxy)proxy;
- System.out.println(">> Invoking Proxy Synchronously");
+ TestLogger.logger.debug(">> Invoking Proxy Synchronously");
String request = null;
String response = dwp.invoke(request);
- System.out.println("Proxy Response =" + response);
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("Proxy Response =" + response);
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
e.printStackTrace();
fail("Exception received" + e);
@@ -105,22 +106,22 @@
if(!runningOnAxis){
return;
}
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
- System.out.println(">>Invoking Binding Provider property");
+ TestLogger.logger.debug(">>Invoking Binding Provider property");
BindingProvider p = (BindingProvider)proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
DocLitWrappedProxy dwp = (DocLitWrappedProxy)proxy;
- System.out.println(">> Invoking Proxy Synchronously");
+ TestLogger.logger.debug(">> Invoking Proxy Synchronously");
String response = dwp.invoke(request);
- System.out.println("Proxy Response =" + response);
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("Proxy Response =" + response);
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
e.printStackTrace();
fail("Exception received" + e);
@@ -132,21 +133,21 @@
if(!runningOnAxis){
return;
}
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
Service service = Service.create(wsdlUrl, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
- System.out.println(">>Invoking Binding Provider property");
+ TestLogger.logger.debug(">>Invoking Binding Provider property");
BindingProvider p = (BindingProvider)proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
DocLitWrappedProxy dwp = (DocLitWrappedProxy)proxy;
- System.out.println(">> Invoking Proxy Synchronously");
+ TestLogger.logger.debug(">> Invoking Proxy Synchronously");
String response = dwp.invoke(request);
- System.out.println("Proxy Response =" + response);
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("Proxy Response =" + response);
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
e.printStackTrace();
fail("Exception received" + e);
@@ -158,22 +159,22 @@
if(!runningOnAxis){
return;
}
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
- System.out.println(">>Invoking Binding Provider property");
+ TestLogger.logger.debug(">>Invoking Binding Provider property");
BindingProvider p = (BindingProvider)proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,axisEndpoint);
DocLitWrappedProxy dwp = (DocLitWrappedProxy)proxy;
- System.out.println(">> Invoking Proxy Asynchronous Callback");
+ TestLogger.logger.debug(">> Invoking Proxy Asynchronous Callback");
AsyncHandler handler = new AsyncCallback();
Future<?> response = dwp.invokeAsync(request, handler);
- System.out.println("---------------------------------------");
+ TestLogger.logger.debug("---------------------------------------");
}catch(Exception e){
e.printStackTrace();
fail("Exception received" + e);
@@ -181,25 +182,25 @@
}
public void testInvokeAsyncPolling() {
- try {
- System.out.println("---------------------------------------");
+ try {
+ TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
URL wsdlUrl = wsdl.toURL();
Service service = Service.create(null, serviceName);
DocLitWrappedProxy proxy =service.getPort(portName, DocLitWrappedProxy.class);
- String request = new String("some string request");
-
- System.out.println(">> Invoking Binding Provider property");
+ String request = new String("some string request");
+
+ TestLogger.logger.debug(">> Invoking Binding Provider property");
BindingProvider p = (BindingProvider) proxy;
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, axisEndpoint);
-
- System.out.println(">> Invoking Proxy with async polling request");
+
+ TestLogger.logger.debug(">> Invoking Proxy with async polling request");
Response<ReturnType> asyncResponse = proxy.invokeAsync(request);
while (!asyncResponse.isDone()) {
- System.out.println(">> Async invocation still not complete");
+ TestLogger.logger.debug(">> Async invocation still not complete");
Thread.sleep(1000);
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java Wed Apr 25 22:19:23 2007
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
+import javax.xml.ws.Holder;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
@@ -37,6 +38,7 @@
import org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl;
import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.proxy.rpclit.ComplexAll;
import org.test.proxy.rpclit.Enum;
@@ -99,6 +101,26 @@
/**
* Simple test that ensures that we can echo a string to an rpc/lit web service
*/
+ public void testSimpleInOut() throws Exception {
+ try{
+ RPCLit proxy = getProxy();
+ String request = "This is a test...";
+ Holder<String> requestParam = new Holder<String>();
+ requestParam.value = request;
+
+ String response = proxy.testSimpleInOut(requestParam);
+ assertTrue(response != null);
+ assertTrue(response.equals(request));
+ assertTrue(requestParam.value.equals(request));
+ }catch(Exception e){
+ e.printStackTrace();
+ fail("Exception received" + e);
+ }
+ }
+
+ /**
+ * Simple test that ensures that we can echo a string to an rpc/lit web service
+ */
public void testSimple2() throws Exception {
try{
RPCLit proxy = getProxy();
@@ -159,7 +181,7 @@
fail("RPC/LIT should throw webserviceException when operation is invoked with null input parameter");
}catch(Exception e){
assertTrue(e instanceof WebServiceException);
- System.out.println(e.getMessage());
+ TestLogger.logger.debug(e.getMessage());
}
}
@@ -174,7 +196,7 @@
fail("RPC/LIT should throw webserviceException when operation is invoked with null out parameter");
}catch(Exception e){
assertTrue(e instanceof WebServiceException);
- System.out.println(e.getMessage());
+ TestLogger.logger.debug(e.getMessage());
}
}
@@ -191,7 +213,7 @@
String response = dispatch.invoke(request);
assertNotNull("dispatch invoke returned null", response);
- System.out.println(response);
+ TestLogger.logger.debug(response);
// Check to make sure the content is correct
assertTrue(!response.contains("soap"));
@@ -219,7 +241,7 @@
assertNotNull("dispatch invoke returned null", response);
- System.out.println(response);
+ TestLogger.logger.debug(response);
// Check to make sure the content is correct
assertTrue(!response.contains("soap"));
@@ -244,7 +266,7 @@
assertNotNull("dispatch invoke returned null", response);
- System.out.println(response);
+ TestLogger.logger.debug(response);
// Check to make sure the content is correct
assertTrue(!response.contains("soap"));
@@ -288,7 +310,7 @@
String response = dispatch.invoke(request);
assertNotNull("dispatch invoke returned null", response);
- System.out.println(response);
+ TestLogger.logger.debug(response);
// Check to make sure the content is correct
assertTrue(!response.contains("soap"));
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java Wed Apr 25 22:19:23 2007
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.proxy.soap12.Echo;
import org.apache.axis2.jaxws.proxy.soap12.SOAP12EchoService;
+import org.apache.axis2.jaxws.TestLogger;
/**
* A suite of tests to test dynamic proxy clients sending SOAP 1.2
@@ -43,8 +44,8 @@
* Send a SOAP 1.2 request and expect a SOAP 1.2 response.
*/
public void testSOAP12RequestSOAP12Response() throws Exception {
- System.out.println("---------------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("---------------------------------------");
+ TestLogger.logger.debug("test: " + getName());
// create the proxy instance. the WSDL used by this proxy
// should have a proper SOAP 1.2 binding configured
@@ -54,7 +55,7 @@
// invoke the remote operation. send a key that tells the
// service send back a SOAP 1.2 response.
String response = proxy.echo(SEND_SOAP12_RESPONSE);
- System.out.println("response returned [" + response + "]");
+ TestLogger.logger.debug("response returned [" + response + "]");
// validate the results
assertNotNull(response);
@@ -67,8 +68,8 @@
*/
// TODO fix and re-enable
public void _testSOAP12RequestSOAP11Response() {
- System.out.println("---------------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("---------------------------------------");
+ TestLogger.logger.debug("test: " + getName());
// create the proxy instance. the WSDL used by this proxy
// should have a proper SOAP 1.2 binding configured
@@ -80,14 +81,14 @@
// in an error.
try {
String response = proxy.echo(SEND_SOAP11_RESPONSE);
- System.out.println("response returned [" + response + "]");
+ TestLogger.logger.debug("response returned [" + response + "]");
// if we've gotten this far, then something went wrong.
fail();
}
catch (WebServiceException wse) {
- System.out.println("an exception was thrown, as expected");
- System.out.println(wse.getMessage());
+ TestLogger.logger.debug("an exception was thrown, as expected");
+ TestLogger.logger.debug(wse.getMessage());
}
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.proxy.doclitnonwrapped;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
@@ -29,12 +31,15 @@
// TODO Auto-generated constructor stub
}
- /* (non-Javadoc)
- * @see javax.xml.ws.Provider#invoke(T)
- */
- public String invoke(String invoke_str) {
- System.out.println("End point called with String value =" + invoke_str);
- return new String("<ns2:ReturnType xmlns:ns2=\"http://doclitnonwrapped.proxy.test.org\"><return_str>some response</return_str></ns2:ReturnType>");
- }
-
+ /* (non-Javadoc)
+ * @see javax.xml.ws.Provider#invoke(T)
+ */
+ public String invoke(String invoke_str) {
+ TestLogger.logger.debug("End point called with String value =" + invoke_str);
+ if (invoke_str.contains("nil")) {
+ return new String("<ns2:ReturnType xsi:nil='true' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns2=\"http://doclitnonwrapped.proxy.test.org\"/>");
+ } else {
+ return new String("<ns2:ReturnType xmlns:ns2=\"http://doclitnonwrapped.proxy.test.org\"><return_str>some response</return_str></ns2:ReturnType>");
+ }
+ }
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl Wed Apr 25 22:19:23 2007
@@ -20,7 +20,7 @@
- <xsd:element name="invoke">
+ <xsd:element name="invoke" nillable="true">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="invoke_str" type="xsd:string" />
@@ -28,7 +28,7 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="ReturnType">
+ <xsd:element name="ReturnType" nillable="true">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="return_str" type="xsd:string" />
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java Wed Apr 25 22:19:23 2007
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.jaxws.proxy.doclitwrapped;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
@@ -24,7 +26,7 @@
public String invoke(String invoke_str) {
// TODO Auto-generated method stub
- System.out.println("End point called with String value =" + invoke_str);
+ TestLogger.logger.debug("End point called with String value =" + invoke_str);
return new String("<ns2:ReturnType xmlns:ns2=\"http://doclitwrapped.proxy.test.org\"><return_str>some response</return_str></ns2:ReturnType>");
}
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl Wed Apr 25 22:19:23 2007
@@ -216,6 +216,19 @@
</wsdl:message>
+ <wsdl:message name="testSimpleInOutRequest">
+
+ <wsdl:part name="simpleInOut" type="xsd:string"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="testSimpleInOutResponse">
+
+ <wsdl:part name="simpleOut" type="xsd:string"/>
+ <wsdl:part name="simpleInOut" type="xsd:string"/>
+
+ </wsdl:message>
+
<wsdl:message name="testSimple2Request">
<wsdl:part name="simple2In1" type="xsd:string"/>
@@ -259,6 +272,14 @@
</wsdl:operation>
+ <wsdl:operation name="testSimpleInOut" parameterOrder="simpleInOut">
+
+ <wsdl:input message="impl:testSimpleInOutRequest" name="testSimpleInOutRequest"/>
+
+ <wsdl:output message="impl:testSimpleInOutResponse" name="testSimpleInOutResponse"/>
+
+ </wsdl:operation>
+
<wsdl:operation name="testSimple2" parameterOrder="simple2In1 simple2In2">
<wsdl:input message="impl:testSimple2Request" name="testSimple2Request"/>
@@ -360,6 +381,18 @@
</wsdl:input>
<wsdl:output name="testSimpleResponse">
+ <wsdlsoap:body namespace="http://org/apache/axis2/jaxws/proxy/rpclit" use="literal"/>
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ <wsdl:operation name="testSimpleInOut">
+
+ <wsdl:input name="testSimpleInOutRequest">
+ <wsdlsoap:body namespace="http://org/apache/axis2/jaxws/proxy/rpclit" use="literal"/>
+ </wsdl:input>
+
+ <wsdl:output name="testSimpleInOutResponse">
<wsdlsoap:body namespace="http://org/apache/axis2/jaxws/proxy/rpclit" use="literal"/>
</wsdl:output>
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java Wed Apr 25 22:19:23 2007
@@ -24,9 +24,11 @@
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
+import javax.xml.ws.Holder;
import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.proxy.rpclit.ComplexAll;
import org.test.proxy.rpclit.Enum;
@@ -60,7 +62,7 @@
* Echo the input
*/
public String testSimple(String simpleIn) {
- assert(simpleIn != null); // According to JAX-WS an RPC service should never receive a null
+ assertTrue(simpleIn != null); // According to JAX-WS an RPC service should never receive a null
// Test to ensure that returning null causes the proper exception
if (simpleIn.contains("returnNull")) {
@@ -146,7 +148,7 @@
private void assertTrue(boolean value) throws RuntimeException {
if (!value) {
RuntimeException re = new RuntimeException();
- System.out.println("Test FAILURE=" +re);
+ TestLogger.logger.debug("Test FAILURE=" + re);
throw re;
}
}
@@ -158,4 +160,9 @@
public void testFault() throws RPCFault {
throw new RPCFault("Throw RPCFault", 123);
}
+
+ public String testSimpleInOut(Holder<String> simpleInOut) {
+ return simpleInOut.value;
+ }
+
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java Wed Apr 25 22:19:23 2007
@@ -7,11 +7,13 @@
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
+import javax.jws.WebParam.Mode;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
import javax.xml.bind.annotation.XmlList;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
+import javax.xml.ws.Holder;
import org.test.proxy.rpclit.ComplexAll;
import org.test.proxy.rpclit.Enum;
@@ -38,6 +40,20 @@
public String testSimple(
@WebParam(name = "simpleIn", partName = "simpleIn")
String simpleIn);
+
+ /**
+ *
+ * @param simpleInOut
+ * @return
+ * returns java.lang.String
+ * TESTS combination of out and return values
+ */
+ @WebMethod
+ @WebResult(name = "simpleOut", partName = "simpleOut")
+ public String testSimpleInOut(
+ @WebParam(name = "simpleInOut", partName = "simpleInOut", mode=Mode.INOUT)
+ Holder<String> simpleInOut);
+
/**
*
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java Wed Apr 25 22:19:23 2007
@@ -18,6 +18,8 @@
*/
package org.apache.axis2.jaxws.proxy.soap12.server;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.Service.Mode;
@@ -57,7 +59,7 @@
"</soapenv:Envelope>";
public String invoke(String input) {
- System.out.println("received request [" + input + "]");
+ TestLogger.logger.debug("received request [" + input + "]");
// check the request to see if it contains the SOAP 1.1 namespace
// URI. if so, then that is an error and we should respond with
@@ -65,11 +67,11 @@
String status = "FAIL";
if (input.indexOf(SOAP12_NS_URI) > 0) {
status = "PASS";
- System.out.println("the request contains the SOAP 1.2 namespace as expected.");
+ TestLogger.logger.debug("the request contains the SOAP 1.2 namespace as expected.");
}
else {
- System.out.println("the request did NOT contain the SOAP 1.2 namespace.");
- System.out.println("sending back a failure");
+ TestLogger.logger.debug("the request did NOT contain the SOAP 1.2 namespace.");
+ TestLogger.logger.debug("sending back a failure");
}
// the contents of the response should contain the status
@@ -91,8 +93,8 @@
response.append(responseBody);
response.append(SOAP12_ENVELOPE_TAIL);
}
-
- System.out.println("sending response [" + response + "]");
+
+ TestLogger.logger.debug("sending response [" + response + "]");
return response.toString();
}
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java Wed Apr 25 22:19:23 2007
@@ -26,6 +26,7 @@
import javax.xml.ws.handler.MessageContext;
import org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType;
+import org.apache.axis2.jaxws.TestLogger;
@WebService(endpointInterface="org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType")
public class ResourceInjectionPortTypeImpl implements ResourceInjectionPortType {
@@ -63,14 +64,14 @@
@PostConstruct
public void initialize(){
//Called after resource injection and before a method is called.
- System.out.println("Calling PostConstruct to Initialize");
+ TestLogger.logger.debug("Calling PostConstruct to Initialize");
}
@PreDestroy
public void distructor(){
//Called before the scope of request or session or application ends.
-
- System.out.println("Calling PreDestroy ");
+
+ TestLogger.logger.debug("Calling PreDestroy ");
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java Wed Apr 25 22:19:23 2007
@@ -20,6 +20,7 @@
import javax.xml.ws.Holder;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.rpclit.schema.ElementString;
@WebService(endpointInterface="org.apache.axis2.jaxws.rpclit.enumtype.PortTypeImpl")
@@ -31,9 +32,9 @@
public void echoString(Holder<ElementString> pString) {
ElementString es = pString.value;
if(es == es.A){
- System.out.println("Enum A");
+ TestLogger.logger.debug("Enum A");
}
- System.out.println("resetting Enum to B");
+ TestLogger.logger.debug("resetting Enum to B");
es = es.B;
pString.value = es;
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java Wed Apr 25 22:19:23 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.Service;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.rpclit.schema.ElementString;
import junit.framework.TestCase;
@@ -29,15 +30,15 @@
public class RPCLitEnumTests extends TestCase {
public void testEnumSimpleType(){
- System.out.println("------------------------------");
- System.out.println("Test : "+getName());
+ TestLogger.logger.debug("------------------------------");
+ TestLogger.logger.debug("Test : " + getName());
try{
Service service = new Service();
PortType portType = service.getPort();
Holder<ElementString> pString = new Holder<ElementString>(ElementString.A);
portType.echoString(pString);
ElementString es = pString.value;
- System.out.println("Response =" + es);
+ TestLogger.logger.debug("Response =" + es);
System.out.print("---------------------------------");
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java Wed Apr 25 22:19:23 2007
@@ -18,21 +18,38 @@
*/
package org.apache.axis2.jaxws.sample;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import javax.xml.ws.AsyncHandler;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Response;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.HandlerResolver;
+import javax.xml.ws.handler.PortInfo;
import javax.xml.ws.soap.SOAPFaultException;
import junit.framework.TestCase;
+
+import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientLogicalHandler;
+import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientLogicalHandler2;
+import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientLogicalHandler3;
+import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientLogicalHandler4;
+import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersClientProtocolHandler;
import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerPortType;
import org.apache.axis2.jaxws.sample.addnumbershandler.AddNumbersHandlerService;
+import org.apache.axis2.jaxws.TestLogger;
+import org.test.addnumbershandler.AddNumbersHandlerResponse;
public class AddNumbersHandlerTests extends TestCase {
String axisEndpoint = "http://localhost:8080/axis2/services/AddNumbersHandlerService";
- // TODO: disabled until handler support is more complete
- public void _testAddNumbersHandler() {
+
+ public void testAddNumbersHandler() {
try{
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
AddNumbersHandlerService service = new AddNumbersHandlerService();
AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
@@ -42,9 +59,9 @@
axisEndpoint);
int total = proxy.addNumbersHandler(10,10);
- assertEquals("With handler manipulation, total should be 2 less than a proper sumation.", 18, total);
- System.out.println("Total (after handler manipulation) = " +total);
- System.out.println("----------------------------------");
+ assertEquals("With handler manipulation, total should be 3 less than a proper sumation.", 17, total);
+ TestLogger.logger.debug("Total (after handler manipulation) = " + total);
+ TestLogger.logger.debug("----------------------------------");
} catch(Exception e) {
e.printStackTrace();
fail();
@@ -54,8 +71,8 @@
// TODO: disabled until handler support is more complete
public void _testAddNumbersHandlerWithFault() {
try{
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
AddNumbersHandlerService service = new AddNumbersHandlerService();
AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
@@ -75,13 +92,185 @@
assertTrue("Exception should be SOAPFaultException", e instanceof SOAPFaultException);
assertEquals(((SOAPFaultException)e).getMessage(), "AddNumbersLogicalHandler2 was here");
}
- System.out.println("----------------------------------");
+ TestLogger.logger.debug("----------------------------------");
+ }
+
+ public void testAddNumbersClientHandler() {
+ try{
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+
+ AddNumbersHandlerService service = new AddNumbersHandlerService();
+ AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+ BindingProvider p = (BindingProvider)proxy;
+
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ axisEndpoint);
+
+ List<Handler> handlers = p.getBinding().getHandlerChain();
+ if (handlers == null)
+ handlers = new ArrayList<Handler>();
+ handlers.add(new AddNumbersClientLogicalHandler());
+ p.getBinding().setHandlerChain(handlers);
+
+ int total = proxy.addNumbersHandler(10,10);
+
+ assertEquals("With handler manipulation, total should be 4 less than a proper sumation.", 16, total);
+ TestLogger.logger.debug("Total (after handler manipulation) = " + total);
+ TestLogger.logger.debug("----------------------------------");
+ } catch(Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+ /*
+ * uses a custom HandlerResolver instead of the default
+ */
+ public void testAddNumbersClientHandlerMyResolver() {
+ try{
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+
+ AddNumbersHandlerService service = new AddNumbersHandlerService();
+
+ // There's a HandlerChain annotation on the SEI, but since
+ // we're using our own handlerresolver that returns an empty list
+ // no client-side handlers will be run
+ service.setHandlerResolver(new MyHandlerResolver());
+
+ AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+ BindingProvider p = (BindingProvider)proxy;
+
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ axisEndpoint);
+
+ int total = proxy.addNumbersHandler(10,10);
+
+ assertEquals("With server-side only handler manipulation, total should be a 17.", 17, total);
+ TestLogger.logger.debug("Total (after handler manipulation) = " + total);
+ TestLogger.logger.debug("----------------------------------");
+ } catch(Exception e) {
+ e.printStackTrace();
+ fail();
+ }
+ }
+
+
+ // TODO: disabled until handler support is more complete
+ public void _testAddNumbersClientProtoAndLogicalHandler() {
+ try{
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+
+ AddNumbersHandlerService service = new AddNumbersHandlerService();
+ AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+ BindingProvider p = (BindingProvider)proxy;
+
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ axisEndpoint);
+
+ List<Handler> handlers = p.getBinding().getHandlerChain();
+ if (handlers == null)
+ handlers = new ArrayList<Handler>();
+ handlers.add(new AddNumbersClientLogicalHandler());
+ handlers.add(new AddNumbersClientProtocolHandler());
+ p.getBinding().setHandlerChain(handlers);
+
+ // value 102 triggers an endpoint exception, which will run through the server outbound
+ // handleFault methods, then client inbound handleFault methods
+ int total = proxy.addNumbersHandler(102,10);
+
+ fail("should have got an exception, but didn't");
+ } catch(Exception e) {
+ e.printStackTrace();
+ assertTrue("Exception should be SOAPFaultException", e instanceof SOAPFaultException);
+ assertEquals(((SOAPFaultException)e).getMessage(), "AddNumbersLogicalHandler2 was here");
+ }
+ TestLogger.logger.debug("----------------------------------");
+ }
+
+ // TODO: disabled until handler support is more complete
+ public void _testAddNumbersClientHandlerWithFault() {
+ try{
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+
+ AddNumbersHandlerService service = new AddNumbersHandlerService();
+ AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+ BindingProvider p = (BindingProvider)proxy;
+
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ axisEndpoint);
+
+ List<Handler> handlers = p.getBinding().getHandlerChain();
+ if (handlers == null)
+ handlers = new ArrayList<Handler>();
+ handlers.add(new AddNumbersClientLogicalHandler4());
+ handlers.add(new AddNumbersClientLogicalHandler3());
+ handlers.add(new AddNumbersClientLogicalHandler());
+
+ p.getBinding().setHandlerChain(handlers);
+
+ int total = proxy.addNumbersHandler(99,10);
+
+ fail("Should have got an exception, but we didn't.");
+ TestLogger.logger.debug("----------------------------------");
+ } catch(Exception e) {
+ e.printStackTrace();
+ assertTrue("Exception should be SOAPFaultException", e instanceof SOAPFaultException);
+ assertEquals(((SOAPFaultException)e).getMessage(), "I don't like the value 99");
+ }
+ }
+
+ public void testAddNumbersClientHandlerAsync() {
+ try{
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
+
+ AddNumbersHandlerService service = new AddNumbersHandlerService();
+ AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
+
+ BindingProvider p = (BindingProvider)proxy;
+
+ p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ axisEndpoint);
+
+ List<Handler> handlers = p.getBinding().getHandlerChain();
+ if (handlers == null)
+ handlers = new ArrayList<Handler>();
+ handlers.add(new AddNumbersClientLogicalHandler());
+ handlers.add(new AddNumbersClientLogicalHandler2());
+ p.getBinding().setHandlerChain(handlers);
+
+
+ AddNumbersHandlerAsyncCallback callback = new AddNumbersHandlerAsyncCallback();
+ Future<?> future = proxy.addNumbersHandlerAsync(10, 10, callback);
+
+ while (!future.isDone()) {
+ Thread.sleep(1000);
+ TestLogger.logger.debug("Async invocation incomplete");
+ }
+
+ int total = callback.getResponseValue();
+
+ assertEquals("With handler manipulation, total should be 26.", 26, total);
+ TestLogger.logger.debug("Total (after handler manipulation) = " + total);
+ TestLogger.logger.debug("----------------------------------");
+ } catch(Exception e) {
+ e.printStackTrace();
+ fail(e.toString());
+ }
}
public void testOneWay() {
try {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
AddNumbersHandlerService service = new AddNumbersHandlerService();
AddNumbersHandlerPortType proxy = service.getAddNumbersHandlerPort();
@@ -90,10 +279,49 @@
bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
proxy.oneWayInt(11);
- System.out.println("----------------------------------");
+ TestLogger.logger.debug("----------------------------------");
} catch (Exception e) {
e.printStackTrace();
fail();
}
}
+
+ /*
+ * A callback implementation that can be used to collect the exceptions
+ */
+ class AddNumbersHandlerAsyncCallback implements AsyncHandler<AddNumbersHandlerResponse> {
+
+ private Exception exception;
+ private int retVal;
+
+ public void handleResponse(Response<AddNumbersHandlerResponse> response) {
+ try {
+ TestLogger.logger.debug("FaultyAsyncHandler.handleResponse() was called");
+ AddNumbersHandlerResponse r = response.get();
+ TestLogger.logger.debug("No exception was thrown from Response.get()");
+ retVal = r.getReturn();
+ }
+ catch (Exception e) {
+ TestLogger.logger.debug("An exception was thrown: " + e.getClass());
+ exception = e;
+ }
+ }
+
+ public int getResponseValue() {
+ return retVal;
+ }
+
+ public Exception getException() {
+ return exception;
+ }
+ }
+
+ class MyHandlerResolver implements HandlerResolver {
+
+ public List<Handler> getHandlerChain(PortInfo portinfo) {
+ return new ArrayList<Handler>();
+ }
+
+ }
+
}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddNumbersTests.java Wed Apr 25 22:19:23 2007
@@ -23,14 +23,16 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersPortType;
import org.apache.axis2.jaxws.sample.addnumbers.AddNumbersService;
+import org.apache.axis2.jaxws.TestLogger;
public class AddNumbersTests extends TestCase {
String axisEndpoint = "http://localhost:8080/axis2/services/AddNumbersService";
- public void testAddNumbers() throws Exception {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ public void testAddNumbers() {
+ try {
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
AddNumbersService service = new AddNumbersService();
AddNumbersPortType proxy = service.getAddNumbersPort();
@@ -39,15 +41,19 @@
p.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
int total = proxy.addNumbers(10,10);
-
- System.out.println("Total =" +total);
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("Total =" + total);
+ TestLogger.logger.debug("----------------------------------");
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ }
}
public void testOneWay() {
try {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
AddNumbersService service = new AddNumbersService();
AddNumbersPortType proxy = service.getAddNumbersPort();
@@ -56,7 +62,7 @@
bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
axisEndpoint);
proxy.oneWayInt(11);
- System.out.println("----------------------------------");
+ TestLogger.logger.debug("----------------------------------");
} catch (Exception e) {
e.printStackTrace();
fail();
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AddressBookTests.java Wed Apr 25 22:19:23 2007
@@ -30,6 +30,7 @@
import org.apache.axis2.jaxws.sample.addressbook.AddressBook;
import org.apache.axis2.jaxws.sample.addressbook.AddressBookEntry;
import org.apache.axis2.jaxws.sample.addressbook.ObjectFactory;
+import org.apache.axis2.jaxws.TestLogger;
/**
* This tests the AddressBook same service that exists under
@@ -50,8 +51,8 @@
public void testAddressBookWithDispatch() throws Exception {
try {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
JAXBContext jbc = JAXBContext.newInstance("org.apache.axis2.jaxws.sample.addressbook");
@@ -79,8 +80,8 @@
// Validate the results
assertNotNull(response);
assertTrue(response.isStatus());
- System.out.println("[pass] - valid response received");
- System.out.println("[response] - " + response.isStatus());
+ TestLogger.logger.debug("[pass] - valid response received");
+ TestLogger.logger.debug("[response] - " + response.isStatus());
} catch (Exception e) {
e.printStackTrace();
throw e;
@@ -93,8 +94,8 @@
* a simple type.
*/
public void testAddEntry() throws Exception {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
// Create the JAX-WS client needed to send the request
Service service = Service.create(QNAME_SERVICE);
@@ -120,8 +121,8 @@
* returns a complex type.
*/
public void testFindEntryByName() throws Exception {
- System.out.println("----------------------------------");
- System.out.println("test: " + getName());
+ TestLogger.logger.debug("----------------------------------");
+ TestLogger.logger.debug("test: " + getName());
// Create the JAX-WS client needed to send the request
Service service = Service.create(QNAME_SERVICE);
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AsyncCallback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AsyncCallback.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AsyncCallback.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/AsyncCallback.java Wed Apr 25 22:19:23 2007
@@ -10,7 +10,7 @@
import org.test.sample.nonwrap.ReturnType;
import org.test.sample.nonwrap.TwoWayHolder;
-
+import org.apache.axis2.jaxws.TestLogger;
public class AsyncCallback implements AsyncHandler {
@@ -31,13 +31,13 @@
Object obj = response.get();
if(obj instanceof ReturnType){
ReturnType type = (ReturnType)obj;
- System.out.println(">>Return String = "+type.getReturnStr());
+ TestLogger.logger.debug(">>Return String = " + type.getReturnStr());
return;
}
if(obj instanceof TwoWayHolder){
TwoWayHolder twh = (TwoWayHolder)obj;
- System.out.println("AsyncCallback Holder string ="+twh.getTwoWayHolderStr());
- System.out.println("AsyncCallback Holder int ="+twh.getTwoWayHolderInt());
+ TestLogger.logger.debug("AsyncCallback Holder string =" + twh.getTwoWayHolderStr());
+ TestLogger.logger.debug("AsyncCallback Holder int =" + twh.getTwoWayHolderInt());
}
}catch(ExecutionException e){
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/BareTests.java Wed Apr 25 22:19:23 2007
@@ -8,13 +8,14 @@
import junit.framework.TestCase;
import org.apache.axis2.jaxws.sample.doclitbare.sei.BareDocLitService;
import org.apache.axis2.jaxws.sample.doclitbare.sei.DocLitBarePortType;
+import org.apache.axis2.jaxws.TestLogger;
import org.apache.log4j.BasicConfigurator;
public class BareTests extends TestCase {
public void testTwoWaySync(){
- System.out.println("------------------------------");
- System.out.println("Test : "+getName());
+ TestLogger.logger.debug("------------------------------");
+ TestLogger.logger.debug("Test : " + getName());
try{
@@ -26,8 +27,8 @@
p.getRequestContext().put(
BindingProvider.SOAPACTION_URI_PROPERTY, "twoWaySimple");
String response = proxy.twoWaySimple(10);
- System.out.println("Sync Response =" + response);
- System.out.println("------------------------------");
+ TestLogger.logger.debug("Sync Response =" + response);
+ TestLogger.logger.debug("------------------------------");
}catch(Exception e){
e.printStackTrace();
fail();
@@ -35,16 +36,16 @@
}
public void testTwoWaySyncWithBodyRouting(){
- System.out.println("------------------------------");
- System.out.println("Test : "+getName());
+ TestLogger.logger.debug("------------------------------");
+ TestLogger.logger.debug("Test : " + getName());
try{
BareDocLitService service = new BareDocLitService();
DocLitBarePortType proxy = service.getBareDocLitPort();
String response = proxy.twoWaySimple(10);
- System.out.println("Sync Response =" + response);
- System.out.println("------------------------------");
+ TestLogger.logger.debug("Sync Response =" + response);
+ TestLogger.logger.debug("------------------------------");
}catch(Exception e){
e.printStackTrace();
fail();
@@ -52,8 +53,8 @@
}
public void testOneWayEmpty(){
- System.out.println("------------------------------");
- System.out.println("Test : "+getName());
+ TestLogger.logger.debug("------------------------------");
+ TestLogger.logger.debug("Test : " + getName());
try{
@@ -66,8 +67,8 @@
p.getRequestContext().put(
BindingProvider.SOAPACTION_URI_PROPERTY, "oneWayEmpty");
proxy.oneWayEmpty();
-
- System.out.println("------------------------------");
+
+ TestLogger.logger.debug("------------------------------");
}catch(Exception e){
e.printStackTrace();
fail();
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DLWMinTests.java Wed Apr 25 22:19:23 2007
@@ -28,6 +28,7 @@
import org.apache.axis2.jaxws.sample.dlwmin.sei.TestException2;
import org.apache.axis2.jaxws.sample.dlwmin.sei.TestException3;
import org.apache.axis2.jaxws.sample.dlwmin.types.TestBean;
+import org.apache.axis2.jaxws.TestLogger;
import junit.framework.TestCase;
@@ -92,9 +93,9 @@
"<pre:greetMe xmlns:pre='http://apache.org/axis2/jaxws/sample/dlwmin'>" +
"<pre:requestType>Scheu</pre:requestType>" +
"</pre:greetMe>";
- System.out.println("Doc/Lit Wrapped Minimal Request =" + request);
+ TestLogger.logger.debug("Doc/Lit Wrapped Minimal Request =" + request);
String response = dispatch.invoke(request);
- System.out.println("Doc/Lit Wrapped Minimal Response =" + response);
+ TestLogger.logger.debug("Doc/Lit Wrapped Minimal Response =" + response);
assertTrue(response.contains("Hello Scheu"));
assertTrue(response.contains("dlwmin:greetMeResponse"));
@@ -128,9 +129,9 @@
"<pre:unqualifiedTestResponse xmlns:pre='http://apache.org/axis2/jaxws/sample/dlwmin'>" +
"<unqualifiedRequest>hello world</unqualifiedRequest>" +
"</pre:unqualifiedTestResponse>";
- System.out.println("Doc/Lit Wrapped Minimal Request =" + request);
+ TestLogger.logger.debug("Doc/Lit Wrapped Minimal Request =" + request);
String response = dispatch.invoke(request);
- System.out.println("Doc/Lit Wrapped Minimal Response =" + response);
+ TestLogger.logger.debug("Doc/Lit Wrapped Minimal Response =" + response);
assertTrue(response.contains("hello world"));
assertTrue(response.contains("dlwmin:testUnqualifiedResponse"));
Added: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DocLitBareMinTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DocLitBareMinTests.java?view=auto&rev=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DocLitBareMinTests.java (added)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/DocLitBareMinTests.java Wed Apr 25 22:19:23 2007
@@ -0,0 +1,36 @@
+/**
+ *
+ */
+package org.apache.axis2.jaxws.sample;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
+
+import org.apache.axis2.jaxws.sample.doclitbaremin.sei.BareDocLitMinService;
+import org.apache.axis2.jaxws.sample.doclitbaremin.sei.DocLitBareMinPortType;
+import org.apache.axis2.jaxws.TestLogger;
+
+import junit.framework.TestCase;
+
+
+public class DocLitBareMinTests extends TestCase {
+
+ public void testEcho() throws Exception {
+ TestLogger.logger.debug("------------------------------");
+ TestLogger.logger.debug("Test : " + getName());
+
+
+ BareDocLitMinService service = new BareDocLitMinService();
+ DocLitBareMinPortType proxy = service.getBareDocLitMinPort();
+ BindingProvider p = (BindingProvider) proxy;
+ p.getRequestContext().put(
+ BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
+ p.getRequestContext().put(
+ BindingProvider.SOAPACTION_URI_PROPERTY, "echo");
+ String request = "dlroW elloH";
+ String response = proxy.echo(request);
+
+ assertTrue(request.equals(response));
+
+ }
+}
Modified: webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java?view=diff&rev=532615&r1=532614&r2=532615
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java (original)
+++ webservices/axis2/branches/java/1_2/modules/jaxws/test/org/apache/axis2/jaxws/sample/FaultsServiceTests.java Wed Apr 25 22:19:23 2007
@@ -18,6 +18,7 @@
import org.apache.axis2.jaxws.sample.faultsservice.FaultsServicePortType;
import org.apache.axis2.jaxws.sample.faultsservice.InvalidTickerFault_Exception;
import org.apache.axis2.jaxws.sample.faultsservice.SimpleFault;
+import org.apache.axis2.jaxws.TestLogger;
import org.test.polymorphicfaults.BaseFault;
import org.test.polymorphicfaults.ComplexFault;
import org.test.polymorphicfaults.DerivedFault1;
@@ -54,8 +55,8 @@
} catch (ComplexFault_Exception e) {
fail("Should not get ComplexFault_Exception in this testcase");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
Object fault = ((BaseFault_Exception)exception).getFaultInfo();
@@ -79,8 +80,8 @@
} catch (ComplexFault_Exception e) {
fail("Should not get ComplexFault_Exception in this testcase");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
Object fault = ((BaseFault_Exception)exception).getFaultInfo();
@@ -105,8 +106,8 @@
} catch (ComplexFault_Exception e) {
fail("Should not get ComplexFault_Exception in this testcase");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
Object fault = ((BaseFault_Exception)exception).getFaultInfo();
@@ -133,8 +134,8 @@
} catch (ComplexFault_Exception e) {
exception = e;
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
Object fault = ((ComplexFault_Exception)exception).getFaultInfo();
@@ -276,8 +277,8 @@
} catch (Exception e) {
fail("Did not get a SOAPFaultException");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
SOAPFaultException sfe = (SOAPFaultException) exception;
@@ -305,8 +306,8 @@
} catch (Exception e) {
fail("Did not get a SOAPFaultException");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
SOAPFaultException sfe = (SOAPFaultException) exception;
@@ -339,8 +340,8 @@
} catch (Exception e) {
fail("Did not get a SOAPFaultException");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
SOAPFaultException sfe = (SOAPFaultException) exception;
@@ -366,8 +367,8 @@
} catch (Exception e) {
fail("Did not get a SOAPFaultException");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
SOAPFaultException sfe = (SOAPFaultException) exception;
@@ -393,8 +394,8 @@
} catch (Exception e) {
fail("Did not get a SOAPFaultException");
}
-
- System.out.println("----------------------------------");
+
+ TestLogger.logger.debug("----------------------------------");
assertNotNull(exception);
SOAPFaultException sfe = (SOAPFaultException) exception;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org