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 he...@apache.org on 2004/12/10 08:56:03 UTC
svn commit: r111483 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/impl/providers test/org/apache/axis/engine test/org/apache/axis/misc
Author: hemapani
Date: Thu Dec 9 23:56:01 2004
New Revision: 111483
URL: http://svn.apache.org/viewcvs?view=rev&rev=111483
Log:
refactor engine tests
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SyncProvider.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SyncProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SyncProvider.java?view=auto&rev=111482
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java Thu Dec 9 23:56:01 2004
@@ -16,7 +16,6 @@
package org.apache.axis.engine;
//todo
-import java.net.ServerSocket;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -30,7 +29,6 @@
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
import org.apache.axis.impl.description.SimpleAxisServiceImpl;
-
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.om.OMElement;
@@ -52,8 +50,6 @@
private MessageContext mc;
private Thread thisThread = null;
private SimpleHTTPReceiver sas;
- private int testingPort = 7777;
- private int testCount = 0;
public CallUnregisterdServiceTest(){
super(CallUnregisterdServiceTest.class.getName());
@@ -73,33 +69,10 @@
AxisOperation operation = new SimpleAxisOperationImpl(operationName);
service.addOperation(operation);
-
- ExecutionChain inchain = new ExecutionChain();
- inchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getInFlow(),inchain,Constants.PHASE_SERVICE);
- service.setExecutableInChain(inchain);
-
- ExecutionChain outchain = new ExecutionChain();
- outchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getOutFlow(),outchain,Constants.PHASE_SERVICE);
- service.setExecutableOutChain(outchain);
-
- ExecutionChain faultchain = new ExecutionChain();
-
- faultchain.addPhase(new Phase(Constants.PHASE_SERVICE));
-
- EngineUtils.addHandlers(service.getFaultFlow(),faultchain,Constants.PHASE_SERVICE);
- service.setExecutableFaultChain(outchain);
-
+ EngineUtils.createExecutionChains(service);
engineRegistry.addService(service);
- AxisEngine engine = new AxisEngine(engineRegistry);
- ServerSocket serverSoc = new ServerSocket(testingPort);
- sas = new SimpleHTTPReceiver(engine);
- sas.setServerSocket(serverSoc);
- thisThread = new Thread(sas);
- thisThread.setDaemon(true);
- thisThread.start();
+ sas = EngineUtils.startServer(engineRegistry);
}
protected void tearDown() throws Exception {
@@ -119,7 +92,7 @@
method.addChild(value);
Call call = new Call();
- URL url = new URL("http","127.0.0.1",testingPort,"/axis/services/EchoBadXMLService");
+ URL url = new URL("http","127.0.0.1",EngineUtils.TESTING_PORT,"/axis/services/EchoBadXMLService");
OMElement omele = call.syncCall(method,url);
assertNotNull(omele);
}catch(AxisFault e){
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java Thu Dec 9 23:56:01 2004
@@ -16,7 +16,6 @@
package org.apache.axis.engine;
//todo
-import java.net.ServerSocket;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -52,8 +51,6 @@
private MessageContext mc;
private Thread thisThread = null;
private SimpleHTTPReceiver sas;
- private int testingPort = 7777;
- private int testCount = 0;
public EchoRawXMLTest(){
super(EchoRawXMLTest.class.getName());
@@ -65,6 +62,7 @@
protected void setUp() throws Exception {
engineRegistry = Utils.createMockRegistry(serviceName,operationName,transportName);
+
AxisService service = new SimpleAxisServiceImpl(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className",EchoXML.class.getName());
@@ -74,32 +72,10 @@
service.addOperation(operation);
- ExecutionChain inchain = new ExecutionChain();
- inchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getInFlow(),inchain,Constants.PHASE_SERVICE);
- service.setExecutableInChain(inchain);
-
- ExecutionChain outchain = new ExecutionChain();
- outchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getOutFlow(),outchain,Constants.PHASE_SERVICE);
- service.setExecutableOutChain(outchain);
-
- ExecutionChain faultchain = new ExecutionChain();
-
- faultchain.addPhase(new Phase(Constants.PHASE_SERVICE));
-
- EngineUtils.addHandlers(service.getFaultFlow(),faultchain,Constants.PHASE_SERVICE);
- service.setExecutableFaultChain(faultchain);
-
+ EngineUtils.createExecutionChains(service);
engineRegistry.addService(service);
- AxisEngine engine = new AxisEngine(engineRegistry);
- ServerSocket serverSoc = new ServerSocket(testingPort);
- sas = new SimpleHTTPReceiver(engine);
- sas.setServerSocket(serverSoc);
- thisThread = new Thread(sas);
- thisThread.setDaemon(true);
- thisThread.start();
+ sas = EngineUtils.startServer(engineRegistry);
}
protected void tearDown() throws Exception {
@@ -119,7 +95,7 @@
method.addChild(value);
Call call = new Call();
- URL url = new URL("http","127.0.0.1",testingPort,"/axis/services/EchoXMLService");
+ URL url = new URL("http","127.0.0.1",EngineUtils.TESTING_PORT,"/axis/services/EchoXMLService");
OMElement omele = call.syncCall(method,url);
assertNotNull(omele);
}catch(Exception e){
@@ -139,7 +115,7 @@
method.addChild(value);
Call call = new Call();
- URL url = new URL("http","127.0.0.1",testingPort,"/axis/services/EchoXMLService");
+ URL url = new URL("http","127.0.0.1",EngineUtils.TESTING_PORT,"/axis/services/EchoXMLService");
CallBack callback = new CallBack() {
public void doWork(OMElement ele) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java Thu Dec 9 23:56:01 2004
@@ -22,7 +22,6 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
-import java.net.ServerSocket;
import java.net.Socket;
import javax.xml.namespace.QName;
@@ -46,7 +45,6 @@
private MessageContext mc;
private Thread thisThread = null;
private SimpleHTTPReceiver sas;
- private int testingPort = 1234;
public EchoTest(String testName) {
super(testName);
@@ -54,11 +52,7 @@
protected void setUp() throws Exception {
engineRegistry = Utils.createMockRegistry(serviceName,operationName,transportName);
- AxisEngine engine = new AxisEngine(engineRegistry);
- sas = new SimpleHTTPReceiver(engine);
- sas.setServerSocket(new ServerSocket(testingPort));
- thisThread = new Thread(sas);
- thisThread.start();
+ sas = EngineUtils.startServer(engineRegistry);
}
protected void tearDown() throws Exception {
@@ -71,7 +65,7 @@
File file = getTestResourceFile("soap/soapmessage.txt");
FileInputStream in = new FileInputStream(file);
- Socket socket = new Socket("127.0.0.1",testingPort);
+ Socket socket = new Socket("127.0.0.1",EngineUtils.TESTING_PORT);
OutputStream out = socket.getOutputStream();
byte[] buf = new byte[1024];
int index = -1;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java Thu Dec 9 23:56:01 2004
@@ -20,6 +20,7 @@
import javax.xml.namespace.QName;
+import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
@@ -58,6 +59,25 @@
index++;
hmd.setHandler(handler);
flow.addHandler(hmd);
+ }
+
+ public static void createExecutionChains(AxisService service) throws AxisFault{
+ ExecutionChain inchain = new ExecutionChain();
+ inchain.addPhase(new Phase(Constants.PHASE_SERVICE));
+ EngineUtils.addHandlers(service.getInFlow(),inchain,Constants.PHASE_SERVICE);
+ service.setExecutableInChain(inchain);
+
+ ExecutionChain outchain = new ExecutionChain();
+ outchain.addPhase(new Phase(Constants.PHASE_SERVICE));
+ EngineUtils.addHandlers(service.getOutFlow(),outchain,Constants.PHASE_SERVICE);
+ service.setExecutableOutChain(outchain);
+
+ ExecutionChain faultchain = new ExecutionChain();
+
+ faultchain.addPhase(new Phase(Constants.PHASE_SERVICE));
+
+ EngineUtils.addHandlers(service.getFaultFlow(),faultchain,Constants.PHASE_SERVICE);
+ service.setExecutableFaultChain(faultchain);
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java Thu Dec 9 23:56:01 2004
@@ -90,22 +90,8 @@
service.addOperation(operation);
- ExecutionChain inchain = new ExecutionChain();
- inchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getInFlow(),inchain,Constants.PHASE_SERVICE);
- service.setExecutableInChain(inchain);
+ EngineUtils.createExecutionChains(service);
- ExecutionChain outchain = new ExecutionChain();
- outchain.addPhase(new Phase(Constants.PHASE_SERVICE));
- EngineUtils.addHandlers(service.getOutFlow(),outchain,Constants.PHASE_SERVICE);
- service.setExecutableOutChain(outchain);
-
- ExecutionChain faultchain = new ExecutionChain();
-
- faultchain.addPhase(new Phase(Constants.PHASE_SERVICE));
-
- EngineUtils.addHandlers(service.getFaultFlow(),faultchain,Constants.PHASE_SERVICE);
- service.setExecutableFaultChain(outchain);
engineRegistry.addService(service);
sas = EngineUtils.startServer(engineRegistry);
callTheService();
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/Utils.java Thu Dec 9 23:56:01 2004
@@ -17,7 +17,6 @@
import javax.xml.namespace.QName;
-
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisOperation;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java?view=diff&rev=111483&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java&r1=111482&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java&r2=111483
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/misc/MiscTest.java Thu Dec 9 23:56:01 2004
@@ -18,6 +18,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.axis.AbstractTestCase;
+import org.apache.axis.context.GlobalContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.impl.context.SimpleSessionContext;
@@ -42,9 +43,17 @@
assertEquals(sc.get(key),val);
}
+ public void testGlobalContext(){
+ GlobalContext gc = new GlobalContext(null);
+ String key = "Hello";
+ Object val = new Object();
+ gc.put(key,val);
+ assertEquals(gc.get(key),val);
+ }
+
+
public void testAxisFault(){
Exception e = new InvocationTargetException(new Exception());
assertNotSame(AxisFault.makeFault(e),e);
}
-
}