You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/09/11 00:06:10 UTC
svn commit: r574385 - in
/incubator/tuscany/java/sca/itest/interop-soap-client/src:
main/java/org/apache/tuscany/test/interop/client/ main/resources/META-INF/
test/java/org/apache/tuscany/test/interop/client/ test/resources/META-INF/
Author: lresende
Date: Mon Sep 10 15:06:10 2007
New Revision: 574385
URL: http://svn.apache.org/viewvc?rev=574385&view=rev
Log:
More changes and clean-up to bring-up the interop-soap-client iTest
Removed:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/resources/META-INF/
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/resources/META-INF/
Modified:
incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
Modified: incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java?rev=574385&r1=574384&r2=574385&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java Mon Sep 10 15:06:10 2007
@@ -32,15 +32,15 @@
@Service(DocTestPortType.class)
public class LoopbackInteropDocServiceComponentImpl implements DocTestPortType {
- public ComplexDocument ComplexDocument(ComplexDocument param0) throws RemoteException {
+ public ComplexDocument ComplexDocument(ComplexDocument param0){
return param0;
}
- public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) throws RemoteException {
+ public SimpleDocument1 SimpleDocument(SimpleDocument1 param4) {
return param4;
}
- public SingleTag SingleTag(SingleTag param2) throws RemoteException {
+ public SingleTag SingleTag(SingleTag param2) {
return param2;
}
}
Modified: incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java?rev=574385&r1=574384&r2=574385&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java Mon Sep 10 15:06:10 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.test.interop.client;
-import java.awt.CompositeContext;
import java.rmi.RemoteException;
import junit.framework.TestCase;
@@ -32,8 +31,6 @@
import org.soapinterop.SimpleDocument1;
import org.soapinterop.SingleTag;
-import calculator.CalculatorService;
-
import commonj.sdo.helper.DataFactory;
public class InteropDocClientTestCase extends TestCase {
@@ -50,7 +47,7 @@
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("default.composite");
- interopDoc = scaDomain.getService(LoopbackInteropDocServiceComponentImpl.class, "CalculatorServiceComponent");
+ interopDoc = locateInteropDocService();
//Get the SDO DataFactory
dataFactory = DataFactory.INSTANCE;
@@ -59,6 +56,8 @@
public void testSingleTag() throws RemoteException {
+ assertNotNull(interopDoc);
+
// Create the input
SingleTag input = (SingleTag) dataFactory.create(SingleTag.class);
@@ -72,6 +71,8 @@
public void testSimpleDocument() throws RemoteException {
+ assertNotNull(interopDoc);
+
// Create the input
SimpleDocument1 input = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
input.setValue("123");
@@ -87,18 +88,20 @@
public void testComplexDocument() throws RemoteException {
+ assertNotNull(interopDoc);
+
// Create the input
ComplexDocument input = (ComplexDocument) dataFactory.create(ComplexDocument.class);
input.setAnAttribute("789");
ChildDocument childDocument = (ChildDocument) dataFactory.create(ChildDocument.class);
SimpleDocument simpleDocument = (SimpleDocument) dataFactory.create(SimpleDocument.class);
- ;
+
SimpleDocument1 simpleDocument1 = (SimpleDocument1) dataFactory.create(SimpleDocument1.class);
- ;
+
simpleDocument.setSimpleDocument(simpleDocument1);
simpleDocument1.setValue("456");
ArrayOfSimpleDocument arrayOfSimpleDocument = (ArrayOfSimpleDocument) dataFactory.create(ArrayOfSimpleDocument.class);
- ;
+
arrayOfSimpleDocument.getSimpleDocument().add(simpleDocument1);
childDocument.setChildSimpleDoc(arrayOfSimpleDocument);
input.setChild(childDocument);
@@ -135,9 +138,7 @@
if (interopLocation == null)
interopLocation = "Remote";
- CompositeContext compositeContext = CurrentCompositeContext.getContext();
-
- return (DocTestPortType) compositeContext.locateService(DocTestPortType.class, interopLocation + "InteropDocService");
+ return scaDomain.getService(DocTestPortType.class, interopLocation + "InteropDocService");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org