Author: woodroy
Date: Wed Mar 5 12:07:00 2008
New Revision: 634011
URL: http://svn.apache.org/viewvc?rev=634011&view=rev
Log:
JIRA: AXIS2-3550
Contributor: Roy Wood
Description: Improve structure of JAXWS end-to-end tests
Final checkin to complete the transition of the JAXWS test framework
Added:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatchTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXBTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSourceTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSourceTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageStringTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadStringTests.java
- copied, changed from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java
Removed:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DispatchTestSuite.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/wrapper/
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/spi/handler/
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/ParamTests.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
webservices/axis2/trunk/java/modules/jaxws/pom.xml
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml?rev=634011&r1=634010&r2=634011&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml Wed Mar 5
12:07:00 2008
@@ -1098,8 +1098,7 @@
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
-
- <!-- Possibly non-server tests -->
+ <!-- Possibly non-server tests
-->
<include>**/MultiRedirectionCatalogTest.java</include>
<include>**/DispatchSoapActionTest.java</include>
<include>**/ProxySoapActionTest.java</include>
@@ -1110,7 +1109,6 @@
<include>**/JAXBContextTest.java</include>
<!-- Possible server tests -->
-
<include>**/MessageContextTests.java</include>
<include>**/StringProviderTests.java</include>
<include>**/SoapFaultProviderTests.java</include>
<include>**/StringMessageProviderTests.java</include>
@@ -1130,7 +1128,6 @@
<include>**/MtomSampleTests.java</include>
<include>**/BareTests.java</include>
- <!-- Anything over 25 tests is potential for an
OOM
<include>**/AddNumbersHandlerTests.java</include>
<include>**/AddNumbersTests.java</include>
<include>**/DLWMinTests.java</include>
@@ -1142,9 +1139,26 @@
<include>**/ResourceInjectionTests.java</include>
<include>**/AnyTypeTests.java</include>
<include>**/PolymorphicTests.java</include>
- -->
+
<include>**/DispatchXPayloadStringTests.java</include>
+
<include>**/DispatchXMessageStringTests.java</include>
+
<include>**/DispatchXPayloadSourceTests.java</include>
+
<include>**/DispatchXMessageSourceTests.java</include>
+
<include>**/DispatchXPayloadJAXBTests.java</include>
+
<include>**/DispatchXMessageDataSourceTests.java</include>
+
<include>**/RPCLitEnumTests.java</include>
+
<include>**/RPCLitStringArrayTests.java</include>
+
<include>**/StreamSourceDispatchTests.java</include>
+
<include>**/DOMSourceDispatchTests.java</include>
+
<include>**/SAXSourceDispatchTests.java</include>
+
<include>**/SOAPMessageDispatchTests.java</include>
+
<include>**/JAXBDispatchTests.java</include>
+
<include>**/JAXBSourceDispatchTests.java</include>
+
<include>**/StringDispatchTests.java</include>
+
<include>**/ParamTests.java</include>
+
<include>**/MessageContextTests.java</include>
+
<!-- These tests are currently failing -->
<!--
<include>**/MtomSampleByteArrayTests.java</include> -->
<!--
<include>**/DocLitBareMinTests.java</include> -->
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/DOMSourceDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,11 +18,8 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.message.util.Reader2Writer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.Future;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -34,17 +31,29 @@
import javax.xml.ws.Response;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.util.concurrent.Future;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import org.apache.axis2.jaxws.sample.AddNumbersHandlerTests;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* This class tests the JAX-WS Dispatch with various forms of the
* javax.xml.transform.dom.DOMSource
*/
-public class DOMSourceDispatch extends TestCase{
+public class DOMSourceDispatchTests extends AbstractTestCase{
private static final XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
-
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DOMSourceDispatchTests.class));
+ }
+
public void testSyncPayloadMode() throws Exception {
TestLogger.logger.debug("---------------------------------------");
TestLogger.logger.debug("test: " + getName());
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,30 +18,35 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
+import java.util.concurrent.Future;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.xmlsoap.schemas.soap.envelope.Body;
import org.xmlsoap.schemas.soap.envelope.Envelope;
+
import test.EchoString;
import test.EchoStringResponse;
import test.ObjectFactory;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import java.util.concurrent.Future;
-
-public class JAXBDispatch extends TestCase {
+public class JAXBDispatchTests extends AbstractTestCase {
private Dispatch<Object> dispatchPayload;
private Dispatch<Object> dispatchMessage;
private JAXBContext jbc;
- public JAXBDispatch(String name) {
- super(name);
+ public static Test suite() {
+ return getTestSetup(new TestSuite(JAXBDispatchTests.class));
}
-
+
public void setUp() throws Exception {
//Create the Service object
Service svc = Service.create(DispatchTestConstants.QNAME_SERVICE);
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/JAXBSourceDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,8 +18,13 @@
*/
package org.apache.axis2.jaxws.dispatch;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.sample.AddNumbersHandlerTests;
import org.test.dispatch.jaxbsource.Invoke;
import org.test.dispatch.jaxbsource.ObjectFactory;
@@ -42,7 +47,7 @@
*/
-public class JAXBSourceDispatch extends TestCase {
+public class JAXBSourceDispatchTests extends AbstractTestCase {
/**
* Invoke a sync Dispatch<JAXBSource> in PAYLOAD mode
*/
@@ -50,7 +55,11 @@
private String url =
"http://localhost:6060/axis2/services/SourceProviderService";;
private QName serviceName = new QName("http://ws.apache.org/axis2";,
"SourceProviderService");
private QName portName =new QName("http://ws.apache.org/axis2";,
"SimpleProviderServiceSOAP11port0");
-
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(JAXBSourceDispatchTests.class));
+ }
+
public void testJAXBSourceSyncPayloadMode() throws Exception {
TestLogger.logger.debug("---------------------------------------");
TestLogger.logger.debug("test: " + getName());
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/ParamTests.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/ParamTests.java?rev=634011&r1=634010&r2=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/ParamTests.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/ParamTests.java
Wed Mar 5 12:07:00 2008
@@ -18,24 +18,27 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
-import javax.xml.ws.Service.Mode;
import javax.xml.ws.WebServiceException;
+import javax.xml.ws.Service.Mode;
import javax.xml.ws.soap.SOAPBinding;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
/**
* A suite for some tests for specific behavior in the Dispatch with
* null and invalid params.
*/
-public class ParamTests extends TestCase {
+public class ParamTests extends AbstractTestCase {
- public ParamTests(String name) {
- super(name);
+ public static Test suite() {
+ return getTestSetup(new TestSuite(ParamTests.class));
}
public void testNullSoapParamWithMessageMode() {
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SAXSourceDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,10 +18,8 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.message.util.Reader2Writer;
-import org.xml.sax.InputSource;
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.Future;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -31,17 +29,27 @@
import javax.xml.ws.Response;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.util.concurrent.Future;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import org.xml.sax.InputSource;
/**
* This class tests the JAX-WS Dispatch<Source> with content in various
* forms of a javax.xml.transform.sax.SAXSource.
*/
-public class SAXSourceDispatch extends TestCase{
+public class SAXSourceDispatchTests extends AbstractTestCase{
private static final XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
-
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SAXSourceDispatchTests.class));
+ }
+
public void testSyncPayloadMode() throws Exception {
TestLogger.logger.debug("---------------------------------------");
TestLogger.logger.debug("test: " + getName());
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/SOAPMessageDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,8 +18,9 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.concurrent.Future;
import javax.xml.namespace.QName;
import javax.xml.soap.MessageFactory;
@@ -27,11 +28,14 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.concurrent.Future;
-public class SOAPMessageDispatch extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
+public class SOAPMessageDispatchTests extends AbstractTestCase {
private String url =
"http://localhost:6060/axis2/services/ProxyDocLitWrappedService.DocLitWrappedProxyImplPort";;
private QName serviceName = new QName(
"http://org.apache.axis2.proxy.doclitwrapped";,
"ProxyDocLitWrappedService");
@@ -40,6 +44,10 @@
String messageResource = "test-resources" + File.separator + "xml" +
File.separator +"soapmessage.xml";
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SOAPMessageDispatchTests.class));
+ }
+
public void testSOAPMessageSyncMessageMode() throws Exception {
String basedir = new
File(System.getProperty("basedir",".")).getAbsolutePath();
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StreamSourceDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,9 +18,9 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.concurrent.Future;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -30,19 +30,28 @@
import javax.xml.ws.Response;
import javax.xml.ws.Service;
import javax.xml.ws.Service.Mode;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.concurrent.Future;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.message.util.Reader2Writer;
/**
* This class tests the JAX-WS Dispatch<Source> functionality with various
* forms of a StreamSource object.
*
*/
-public class StreamSourceDispatch extends TestCase {
+public class StreamSourceDispatchTests extends AbstractTestCase {
private static XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(StreamSourceDispatchTests.class));
+ }
+
/**
* Invoke a Dispatch<Source> synchronously with the content in PAYLOAD
mode.
*/
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatchTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatchTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatchTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatch.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/StringDispatchTests.java
Wed Mar 5 12:07:00 2008
@@ -18,21 +18,30 @@
*/
package org.apache.axis2.jaxws.dispatch;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
import javax.xml.ws.Dispatch;
import javax.xml.ws.ProtocolException;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
-import java.net.UnknownHostException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-public class StringDispatch extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
+public class StringDispatchTests extends AbstractTestCase {
- /**
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(StringDispatchTests.class));
+ }
+
+ /**
* Invoke a sync Dispatch<String> in PAYLOAD mode
*/
public void testSyncPayloadMode() throws Exception {
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java?rev=634011&r1=634010&r2=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/injection/ResourceInjectionTests.java
Wed Mar 5 12:07:00 2008
@@ -41,13 +41,6 @@
return getTestSetup(new TestSuite(ResourceInjectionTests.class));
}
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: "
+this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
- }
-
-
public void testInjectionOnField(){
Object serviceInstance = new ResourceInjectionTestImpl1();
TestLogger.logger.debug("------------------------------");
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java?rev=634011&r1=634010&r2=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
Wed Mar 5 12:07:00 2008
@@ -19,20 +19,27 @@
package org.apache.axis2.jaxws.rpclit.enumtype.tests;
-import junit.framework.TestCase;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.Service;
import org.test.rpclit.schema.ElementString;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-
-public class RPCLitEnumTests extends TestCase {
+public class RPCLitEnumTests extends AbstractTestCase {
String axisEndpoint =
"http://localhost:6060/axis2/services/RPCLitEnumService.PortTypeImplPort";;
-
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(RPCLitEnumTests.class));
+ }
+
public void testEnumSimpleType(){
TestLogger.logger.debug("------------------------------");
TestLogger.logger.debug("Test : " + getName());
Modified:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java?rev=634011&r1=634010&r2=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/tests/RPCLitStringArrayTests.java
Wed Mar 5 12:07:00 2008
@@ -18,18 +18,25 @@
*/
package org.apache.axis2.jaxws.rpclit.stringarray.tests;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.rpclit.stringarray.sei.Echo;
-import org.apache.axis2.jaxws.rpclit.stringarray.sei.RPCLitStringArrayService;
-import org.test.rpclit.stringarray.StringArray;
+import java.util.Arrays;
import javax.xml.ws.BindingProvider;
-import java.util.Arrays;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-public class RPCLitStringArrayTests extends TestCase {
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.rpclit.stringarray.sei.Echo;
+import org.apache.axis2.jaxws.rpclit.stringarray.sei.RPCLitStringArrayService;
+import org.test.rpclit.stringarray.StringArray;
+
+public class RPCLitStringArrayTests extends AbstractTestCase {
String axisEndpoint =
"http://localhost:6060/axis2/services/RPCLitStringArrayService.EchoImplPort";;
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(RPCLitStringArrayTests.class));
+ }
public void testStringArrayType() {
System.out.println("------------------------------");
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSource.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/datasource/DispatchXMessageDataSourceTests.java
Wed Mar 5 12:07:00 2008
@@ -18,8 +18,8 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.datasource;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.provider.DataSourceImpl;
+import java.awt.Image;
+import java.io.File;
import javax.activation.DataSource;
import javax.imageio.ImageIO;
@@ -29,10 +29,15 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-import java.awt.*;
-import java.io.File;
-public class DispatchXMessageDataSource extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.provider.DataSourceImpl;
+import
org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.jaxb.DispatchXPayloadJAXBTests;
+
+public class DispatchXMessageDataSourceTests extends AbstractTestCase {
public String HOSTPORT = "http://localhost:6060";;
@@ -40,9 +45,12 @@
private QName SERVICE_NAME = new QName("http://ws.apache.org/axis2";,
"XMessageDataSourceProvider");
private QName PORT_NAME = new QName("http://ws.apache.org/axis2";,
"XMessageDataSourceProviderPort");
-
private DataSource imageDS;
-
+
+ public static Test suite() {
+ return getTestSetup(new
TestSuite(DispatchXMessageDataSourceTests.class));
+ }
+
public void setUp() throws Exception {
String imageResourceDir =
System.getProperty("basedir",".")+"/"+"test-resources"+File.separator+"image";
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXBTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXBTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXBTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXB.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/jaxb/DispatchXPayloadJAXBTests.java
Wed Mar 5 12:07:00 2008
@@ -18,12 +18,6 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.jaxb;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-import test.EchoString;
-import test.EchoStringResponse;
-import test.ObjectFactory;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
@@ -32,7 +26,16 @@
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-public class DispatchXPayloadJAXB extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
+import test.EchoString;
+import test.ObjectFactory;
+
+public class DispatchXPayloadJAXBTests extends AbstractTestCase {
private static XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
@@ -43,6 +46,11 @@
private QName PORT_NAME = new QName("http://ws.apache.org/axis2";,
"XPayloadSourceProviderPort");
String XML_TEXT = "<p:echo xmlns:p=\"http://sample\";>hello world</p:echo>";
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DispatchXPayloadJAXBTests.class));
+ }
+
public Dispatch<Object> getDispatch() throws JAXBException {
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, HTTPBinding.HTTP_BINDING,ENDPOINT_URL);
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSourceTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSourceTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSourceTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSource.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXMessageSourceTests.java
Wed Mar 5 12:07:00 2008
@@ -18,8 +18,8 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.source;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -29,10 +29,15 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-public class DispatchXMessageSource extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import
org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.string.DispatchXPayloadStringTests;
+
+public class DispatchXMessageSourceTests extends AbstractTestCase {
private static XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
@@ -45,6 +50,10 @@
private static String XML_TEXT = "<p:echo xmlns:p=\"http://sample\";>hello
world</p:echo>";
private static String XML_TEXT_NPE = "<p:echo
xmlns:p=\"http://sample\";>NPE</p:echo>";
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DispatchXMessageSourceTests.class));
+ }
+
public Dispatch<Source> getDispatch() {
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, HTTPBinding.HTTP_BINDING,ENDPOINT_URL);
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSourceTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSourceTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSourceTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSource.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/source/DispatchXPayloadSourceTests.java
Wed Mar 5 12:07:00 2008
@@ -18,8 +18,8 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.source;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -29,10 +29,15 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-public class DispatchXPayloadSource extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.message.util.Reader2Writer;
+import
org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.string.DispatchXPayloadStringTests;
+
+public class DispatchXPayloadSourceTests extends AbstractTestCase {
private static XMLInputFactory inputFactory =
XMLInputFactory.newInstance();
@@ -45,6 +50,10 @@
private static String XML_TEXT = "<p:echo xmlns:p=\"http://sample\";>hello
world</p:echo>";
private static String XML_TEXT_NPE = "<p:echo
xmlns:p=\"http://sample\";>NPE</p:echo>";
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DispatchXPayloadSourceTests.class));
+ }
+
public Dispatch<Source> getDispatch() {
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, HTTPBinding.HTTP_BINDING,ENDPOINT_URL);
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageStringTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageStringTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageStringTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageString.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXMessageStringTests.java
Wed Mar 5 12:07:00 2008
@@ -18,15 +18,18 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.string;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-public class DispatchXMessageString extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
+public class DispatchXMessageStringTests extends AbstractTestCase {
public String HOSTPORT = "http://localhost:6060";;
@@ -36,7 +39,11 @@
private static String XML_TEXT = "<p:echo xmlns:p=\"http://sample\";>hello
world</p:echo>";
private static String XML_TEXT_NPE = "<p:echo
xmlns:p=\"http://sample\";>NPE</p:echo>";
-
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DispatchXMessageStringTests.class));
+ }
+
public Dispatch<String> getDispatch() {
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, HTTPBinding.HTTP_BINDING,ENDPOINT_URL);
Copied:
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadStringTests.java
(from r633897,
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadStringTests.java?p2=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadStringTests.java&p1=webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java&r1=633897&r2=634011&rev=634011&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadString.java
(original)
+++
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/xmlhttp/clientTests/dispatch/string/DispatchXPayloadStringTests.java
Wed Mar 5 12:07:00 2008
@@ -18,15 +18,18 @@
*/
package org.apache.axis2.jaxws.xmlhttp.clientTests.dispatch.string;
-import junit.framework.TestCase;
-import org.apache.axis2.jaxws.TestLogger;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
-public class DispatchXPayloadString extends TestCase {
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
+public class DispatchXPayloadStringTests extends AbstractTestCase {
public String HOSTPORT = "http://localhost:6060";;
@@ -37,6 +40,10 @@
private static String XML_TEXT = "<p:echo xmlns:p=\"http://sample\";>hello
world</p:echo>";
private static String XML_TEXT_NPE = "<p:echo
xmlns:p=\"http://sample\";>NPE</p:echo>";
+ public static Test suite() {
+ return getTestSetup(new TestSuite(DispatchXPayloadStringTests.class));
+ }
+
public Dispatch<String> getDispatch() {
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, HTTPBinding.HTTP_BINDING,ENDPOINT_URL);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
