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 2006/04/14 15:57:14 UTC
svn commit: r394100 - in
/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2:
async/ engine/ integration/ mail/ rpc/
Author: dims
Date: Fri Apr 14 06:57:07 2006
New Revision: 394100
URL: http://svn.apache.org/viewcvs?rev=394100&view=rev
Log:
speed up tests by ensuring start/stop is called for UtilServer only once per TestCase class
Added:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java Fri Apr 14 06:57:07 2006
@@ -35,10 +35,6 @@
public void invokeBusinessLogic(MessageContext msgContext,
MessageContext newmsgContext) throws AxisFault {
try {
- //TODO : I know this is wrong , but I have to spend time here
- System.out.println(" ****************** Request received *****************");
- Thread.sleep(40000);
- System.out.println(" **********Started to process the requset**************");
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(msgContext);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java Fri Apr 14 06:57:07 2006
@@ -1,6 +1,8 @@
package org.apache.axis2.async;
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -21,6 +23,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,7 +47,7 @@
*
*/
-public class AsyncServiceTest extends TestCase implements TestConstants {
+public class AsyncServiceTest extends UtilServerBasedTestCase implements TestConstants {
protected Log log = LogFactory.getLog(getClass());
protected QName transportName = new QName("http://localhost/my",
@@ -60,8 +63,11 @@
protected AxisService service;
private boolean finish = false;
+ public static Test suite() {
+ return getTestSetup(new TestSuite(AsyncServiceTest.class));
+ }
+
protected void setUp() throws Exception {
- UtilServer.start();
service = Utils.createSimpleService(serviceName,
new AsyncMessageReceiver(),
Echo.class.getName(),
@@ -71,7 +77,6 @@
protected void tearDown() throws Exception {
UtilServer.unDeployService(serviceName);
- UtilServer.stop();
UtilServer.unDeployClientService();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java Fri Apr 14 06:57:07 2006
@@ -19,6 +19,8 @@
//todo
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
@@ -31,8 +33,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
-public class CallUnregisteredServiceTest extends TestCase {
+public class CallUnregisteredServiceTest extends UtilServerBasedTestCase {
public CallUnregisteredServiceTest() {
super(CallUnregisteredServiceTest.class.getName());
@@ -42,12 +45,8 @@
super(testName);
}
- protected void setUp() throws Exception {
- UtilServer.start();
- }
-
- protected void tearDown() throws Exception {
- UtilServer.stop();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(CallUnregisteredServiceTest.class));
}
public void testEchoXMLSync() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java Fri Apr 14 06:57:07 2006
@@ -17,6 +17,8 @@
package org.apache.axis2.engine;
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -31,6 +33,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +41,7 @@
/**
* Testing character encoding support
*/
-public class CharactersetEncodingTest extends TestCase implements TestConstants {
+public class CharactersetEncodingTest extends UtilServerBasedTestCase implements TestConstants {
private Log log = LogFactory.getLog(getClass());
@@ -48,9 +51,12 @@
super(arg0);
}
- protected void setUp() throws Exception {
- UtilServer.start(Constants.TESTING_PATH + "chunking-enabledRepository");
+ public static Test suite() {
+ return getTestSetup2(new TestSuite(CharactersetEncodingTest.class),
+ Constants.TESTING_PATH + "chunking-enabledRepository");
+ }
+ protected void setUp() throws Exception {
service =
Utils.createSimpleService(serviceName,
Echo.class.getName(),
@@ -60,7 +66,6 @@
protected void tearDown() throws Exception {
UtilServer.unDeployService(serviceName);
- UtilServer.stop();
UtilServer.unDeployClientService();
}
@@ -75,15 +80,11 @@
text.addChild(fac.createOMText(text, value));
payload.addChild(text);
-// Call call = new Call(
-// Constants.TESTING_PATH + "chunking-enabledRepository");
Options options = new Options();
-// call.setClientOptions(options);
options.setProperty(MessageContext.CHARACTER_SET_ENCODING, "utf-16");
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-// OMElement resultElem = call.invokeBlocking(operationName.getLocalPart(), payload);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "chunking-enabledRepository", null);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java Fri Apr 14 06:57:07 2006
@@ -59,45 +59,6 @@
UtilServer.stop();
}
-// public void testEchoXMLASync() throws Exception {
-// OMElement payload = createEnvelope();
-//
-// org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(Constants.TESTING_PATH + "chunking-enabledRepository");
-//
-// call.setTo(targetEPR);
-// call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
-//
-// Callback callback = new Callback() {
-// public void onComplete(AsyncResult result) {
-// try {
-// result.getResponseEnvelope().serializeAndConsume(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
-// } catch (XMLStreamException e) {
-// reportError(e);
-// } finally {
-// finish = true;
-// }
-// }
-//
-// public void reportError(Exception e) {
-// finish = true;
-// }
-// };
-//
-// call.invokeNonBlocking(operationName.getLocalPart(), payload, callback);
-// int index = 0;
-// while (!finish) {
-// Thread.sleep(1000);
-// index++;
-// if(index > 10 ){
-// throw new AxisFault("Server was shutdown as the async response take too long to complete");
-// }
-// }
-// call.close();
-//
-//
-// log.info("send the reqest");
-// }
-
public void testEchoXMLSync() throws Exception {
OMElement payload = TestingUtils.createDummyOMElement();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java Fri Apr 14 06:57:07 2006
@@ -55,44 +55,6 @@
UtilServer.stop();
}
-// public void testEchoXMLASync() throws Exception {
-// OMElement payload = createEnvelope();
-//
-// org.apache.axis2.client.Call call = new org.apache.axis2.client.Call();
-//
-// call.setTo(targetEPR);
-// call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
-//
-// Callback callback = new Callback() {
-// public void onComplete(AsyncResult result) {
-// try {
-// result.getResponseEnvelope().serializeAndConsume(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
-// } catch (XMLStreamException e) {
-// reportError(e);
-// } finally {
-// finish = true;
-// }
-// }
-//
-// public void reportError(Exception e) {
-// finish = true;
-// }
-// };
-//
-// call.invokeNonBlocking(operationName.getLocalPart(), payload, callback);
-// int index = 0;
-// while (!finish) {
-// Thread.sleep(1000);
-// index++;
-// if(index > 10 ){
-// throw new AxisFault("Server was shutdown as the async response take too long to complete");
-// }
-// }
-//
-//
-// log.info("send the reqest");
-// }
-
public void testEchoXMLSync() throws Exception {
OMElement payload = TestingUtils.createDummyOMElement();
Options options = new Options();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Fri Apr 14 06:57:07 2006
@@ -85,7 +85,7 @@
sender.fireAndForget(payload);
int index = 0;
while (envelope == null) {
- Thread.sleep(4000);
+ Thread.sleep(1000);
index++;
if (index == 5) {
throw new AxisFault("error Occured");
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java?rev=394100&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServerBasedTestCase.java Fri Apr 14 06:57:07 2006
@@ -0,0 +1,56 @@
+/*
+* Copyright 2004-2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.axis2.integration;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+public class UtilServerBasedTestCase extends TestCase {
+
+ public UtilServerBasedTestCase() {
+ super(UtilServerBasedTestCase.class.getName());
+ }
+
+ public UtilServerBasedTestCase(java.lang.String string) {
+ super(string);
+ }
+
+ protected static Test getTestSetup(Test test) {
+ return new TestSetup(test) {
+ public void setUp() throws Exception {
+ UtilServer.start();
+ }
+
+ public void tearDown() throws Exception {
+ UtilServer.stop();
+ }
+ };
+ }
+
+ protected static Test getTestSetup2(Test test, final String param) {
+ return new TestSetup(test) {
+ public void setUp() throws Exception {
+ UtilServer.start(param);
+ }
+
+ public void tearDown() throws Exception {
+ UtilServer.stop();
+ }
+ };
+ }
+}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Fri Apr 14 06:57:07 2006
@@ -70,7 +70,7 @@
.getAbsolutePath(), file
.getAbsolutePath() + "/conf/axis2.xml");
try {
- Thread.sleep(2000);
+ Thread.sleep(1000);
} catch (InterruptedException e1) {
throw new AxisFault("Thread interuptted", e1);
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Fri Apr 14 06:57:07 2006
@@ -122,25 +122,7 @@
servicClient.sendRobust(operationName, payload);
while (envelope == null) {
-// if(index < 10){
Thread.sleep(4000);
-// index++;
-// }else{
-// fail("The messsge was not delivered even after 40 seconds");
-// }
}
}
-
-// public ConfigurationContext createNewConfigurationContext() throws Exception {
-// File file = new File(MAIL_TRANSPORT_ENABLED_REPO_PATH);
-// assertTrue(
-// "Mail repository directory " + file.getAbsolutePath() +
-// " does not exsist",
-// file.exists());
-// ConfigurationContextFactory builder = new ConfigurationContextFactory();
-// ConfigurationContext configContext =
-// builder.createConfigurationContext(file.getAbsolutePath());
-// return configContext;
-// }
-//
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Fri Apr 14 06:57:07 2006
@@ -160,91 +160,4 @@
}
}
-
- // public ConfigurationContext createServerConfigurationContext() throws
- // Exception {
- // ConfigurationContextFactory builder = new ConfigurationContextFactory();
- // ConfigurationContext configContext =
- // builder.createConfigurationContext(
- // org.apache.axis2.Constants.TESTING_REPOSITORY);
- //
- // TransportInDescription transportIn =
- // new TransportInDescription(new QName(Constants.TRANSPORT_MAIL));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.user", "foo@127.0.0.1"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.password", "axis2"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.port", "1134"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.replyToAddress",
- // "foo@127.0.0.1"));
- // transportIn.setReceiver(new SimpleMailListener());
- // transportIn.getReceiver().init(configContext, transportIn);
- //
- // TransportOutDescription transportOut =
- // new TransportOutDescription(
- // new QName(Constants.TRANSPORT_MAIL));
- //
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.user", "foo"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.password", "axis2"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.port", "1049"));
- // transportOut.setSender(new MailTransportSender());
- // transportOut.getSender().init(configContext, transportOut);
- //
- // configContext.getAxisConfiguration().addTransportIn(transportIn);
- // configContext.getAxisConfiguration().addTransportOut(transportOut);
- // return configContext;
- // }
- //
- // public ConfigurationContext createClientConfigurationContext() throws
- // Exception {
- // ConfigurationContextFactory builder = new ConfigurationContextFactory();
- // ConfigurationContext configContext =
- // builder.createConfigurationContext(
- // org.apache.axis2.Constants.TESTING_REPOSITORY);
- //
- // TransportInDescription transportIn =
- // new TransportInDescription(new QName(Constants.TRANSPORT_MAIL));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.user", "bar@127.0.0.1"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.password", "axis2"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.pop3.port", "1134"));
- // transportIn.addParameter(
- // new ParameterImpl("transport.mail.replyToAddress",
- // "bar@127.0.0.1"));
- // transportIn.setReceiver(new SimpleMailListener());
- // transportIn.getReceiver().init(configContext, transportIn);
- //
- // TransportOutDescription transportOut =
- // new TransportOutDescription(
- // new QName(Constants.TRANSPORT_MAIL));
- //
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.user", "bar"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.password", "axis2"));
- // transportOut.addParameter(
- // new ParameterImpl("transport.mail.smtp.port", "1049"));
- // transportOut.setSender(new MailTransportSender());
- // transportOut.getSender().init(configContext, transportOut);
- //
- // configContext.getAxisConfiguration().addTransportIn(transportIn);
- // configContext.getAxisConfiguration().addTransportOut(transportOut);
- // return configContext;
- // }
-
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Fri Apr 14 06:57:07 2006
@@ -17,6 +17,8 @@
package org.apache.axis2.rpc;
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -42,6 +44,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.rpc.client.RPCServiceClient;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
@@ -56,7 +59,7 @@
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
-public class MultirefTest extends TestCase {
+public class MultirefTest extends UtilServerBasedTestCase {
protected EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
@@ -75,13 +78,15 @@
protected boolean finish = false;
+ public static Test suite() {
+ return getTestSetup(new TestSuite(MultirefTest.class));
+ }
+
protected void setUp() throws Exception {
- UtilServer.start();
}
protected void tearDown() throws Exception {
UtilServer.unDeployService(serviceName);
- UtilServer.stop();
UtilServer.unDeployClientService();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=394100&r1=394099&r2=394100&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Fri Apr 14 06:57:07 2006
@@ -17,6 +17,8 @@
package org.apache.axis2.rpc;
import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -37,6 +39,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.rpc.client.RPCServiceClient;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
@@ -55,7 +58,7 @@
import java.util.Date;
import java.util.TimeZone;
-public class RPCCallTest extends TestCase {
+public class RPCCallTest extends UtilServerBasedTestCase {
private SimpleDateFormat zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
// 0123456789 0 123456789
@@ -83,13 +86,16 @@
super(testName);
}
+ public static Test suite() {
+ return getTestSetup(new TestSuite(RPCCallTest.class));
+ }
+
+
protected void setUp() throws Exception {
- UtilServer.start();
}
protected void tearDown() throws Exception {
UtilServer.unDeployService(serviceName);
- UtilServer.stop();
UtilServer.unDeployClientService();
}