gdaniels 02/02/28 09:58:51
Modified: java/test/wsdl/interop3/compound1 Compound1TestCase.java
java/test/wsdl/interop3/compound2 NStoPkg.properties
java/test/wsdl/interop3/groupE/client
InteropTestDocLitServiceTestCase.java
InteropTestListServiceTestCase.java
InteropTestListServiceTestClient.java
InteropTestRpcEncServiceTestCase.java
java/test/wsdl/interop3/import1 Import1TestCase.java
java/test/wsdl/interop3/import2 Import2TestCase.java
java/test/wsdl/interop3/import3 Import3TestCase.java
Log:
Fix ns mappings for compound2, and add public static URL member
to each test case.
Revision Changes Path
1.4 +1 -1
xml-axis/java/test/wsdl/interop3/compound1/Compound1TestCase.java
Index: Compound1TestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/compound1/Compound1TestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Compound1TestCase.java 28 Feb 2002 14:23:25 -0000 1.3
+++ Compound1TestCase.java 28 Feb 2002 17:58:51 -0000 1.4
@@ -25,7 +25,7 @@
*/
public class Compound1TestCase extends junit.framework.TestCase {
- static URL url;
+ public static URL url;
public Compound1TestCase(String name) {
super(name);
1.2 +1 -0 xml-axis/java/test/wsdl/interop3/compound2/NStoPkg.properties
Index: NStoPkg.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/compound2/NStoPkg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NStoPkg.properties 28 Feb 2002 10:47:25 -0000 1.1
+++ NStoPkg.properties 28 Feb 2002 17:58:51 -0000 1.2
@@ -1,2 +1,3 @@
http\://soapinterop.org/=test.wsdl.interop3.compound2
http\://soapinterop.org/person=test.wsdl.interop3.compound2.xsd
+http\://soapinterop.org/employee=test.wsdl.interop3.compound2.xsd
1.3 +14 -3
xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestDocLitServiceTestCase.java
Index: InteropTestDocLitServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestDocLitServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestDocLitServiceTestCase.java 21 Feb 2002 18:45:27 -0000 1.2
+++ InteropTestDocLitServiceTestCase.java 28 Feb 2002 17:58:51 -0000 1.3
@@ -65,14 +65,20 @@
import junit.framework.AssertionFailedError;
public class InteropTestDocLitServiceTestCase extends junit.framework.TestCase {
+ public static URL url;
+
public InteropTestDocLitServiceTestCase(String name) {
super(name);
}
public void testInteropTestDocLitEchoString() {
InteropTestDocLit binding;
try {
- binding = new InteropTestDocLitServiceLocator().getInteropTestDocLit();
}
- catch (javax.xml.rpc.ServiceException jre) {
+ if (url == null) {
+ binding = new
InteropTestDocLitServiceLocator().getInteropTestDocLit();
+ } else {
+ binding = new
InteropTestDocLitServiceLocator().getInteropTestDocLit(url);
+ }
+ } catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
assertTrue("binding is null", binding != null);
@@ -92,7 +98,12 @@
public void testInteropTestDocLitEchoStringArray() {
InteropTestDocLit binding;
try {
- binding = new InteropTestDocLitServiceLocator().getInteropTestDocLit();
}
+ if (url == null) {
+ binding = new
InteropTestDocLitServiceLocator().getInteropTestDocLit();
+ } else {
+ binding = new
InteropTestDocLitServiceLocator().getInteropTestDocLit(url);
+ }
+ }
catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
1.3 +10 -2
xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestCase.java
Index: InteropTestListServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestListServiceTestCase.java 21 Feb 2002 19:11:26 -0000 1.2
+++ InteropTestListServiceTestCase.java 28 Feb 2002 17:58:51 -0000 1.3
@@ -64,7 +64,11 @@
import junit.framework.AssertionFailedError;
+import java.net.URL;
+
public class InteropTestListServiceTestCase extends junit.framework.TestCase {
+ public static URL url;
+
public InteropTestListServiceTestCase(String name) {
super(name);
}
@@ -72,8 +76,12 @@
public void testInteropTestListEchoLinkedList() {
InteropTestList binding;
try {
- binding = new InteropTestListServiceLocator().getInteropTestList();
}
- catch (javax.xml.rpc.ServiceException jre) {
+ if (url == null) {
+ binding = new InteropTestListServiceLocator().getInteropTestList();
+ } else {
+ binding = new
InteropTestListServiceLocator().getInteropTestList(url);
+ }
+ } catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
assertTrue("binding is null", binding != null);
1.2 +2 -0
xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestClient.java
Index: InteropTestListServiceTestClient.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InteropTestListServiceTestClient.java 25 Feb 2002 16:31:39 -0000 1.1
+++ InteropTestListServiceTestClient.java 28 Feb 2002 17:58:51 -0000 1.2
@@ -87,6 +87,8 @@
* @author Glyn Normington <[EMAIL PROTECTED]>
*/
public abstract class InteropTestListServiceTestClient {
+ public static URL url;
+
private static final String NS =
"http://soapinterop.org/WSDLInteropTestList";;
private static final QName OPQN = new QName(NS, "echoLinkedList");
1.3 +28 -5
xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestRpcEncServiceTestCase.java
Index: InteropTestRpcEncServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestRpcEncServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestRpcEncServiceTestCase.java 21 Feb 2002 18:45:27 -0000 1.2
+++ InteropTestRpcEncServiceTestCase.java 28 Feb 2002 17:58:51 -0000 1.3
@@ -64,15 +64,23 @@
import junit.framework.AssertionFailedError;
+import java.net.URL;
+
public class InteropTestRpcEncServiceTestCase extends junit.framework.TestCase {
+ public static URL url;
+
public InteropTestRpcEncServiceTestCase(String name) {
super(name);
}
public void testInteropTestRpcEncEchoString() {
InteropTestRpcEnc binding;
try {
- binding = new InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
}
- catch (javax.xml.rpc.ServiceException jre) {
+ if (url == null) {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
+ } else {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc(url);
+ }
+ } catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
assertTrue("binding is null", binding != null);
@@ -92,7 +100,12 @@
public void testInteropTestRpcEncEchoStringArray() {
InteropTestRpcEnc binding;
try {
- binding = new InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
}
+ if (url == null) {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
+ } else {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc(url);
+ }
+ }
catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
@@ -124,7 +137,12 @@
public void testInteropTestRpcEncEchoStruct() {
InteropTestRpcEnc binding;
try {
- binding = new InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
}
+ if (url == null) {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
+ } else {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc(url);
+ }
+ }
catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
@@ -150,7 +168,12 @@
public void testInteropTestRpcEncEchoVoid() {
InteropTestRpcEnc binding;
try {
- binding = new InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
}
+ if (url == null) {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc();
+ } else {
+ binding = new
InteropTestRpcEncServiceLocator().getInteropTestRpcEnc(url);
+ }
+ }
catch (javax.xml.rpc.ServiceException jre) {
throw new AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
1.4 +1 -20 xml-axis/java/test/wsdl/interop3/import1/Import1TestCase.java
Index: Import1TestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import1/Import1TestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Import1TestCase.java 28 Feb 2002 16:48:44 -0000 1.3
+++ Import1TestCase.java 28 Feb 2002 17:58:51 -0000 1.4
@@ -24,7 +24,7 @@
*/
public class Import1TestCase extends junit.framework.TestCase {
- static URL url = null;
+ public static URL url = null;
public Import1TestCase(String name) {
super(name);
@@ -48,25 +48,6 @@
String value = "import1 test string";
String result = binding.echoString(value);
assertEquals("Strings didn't match", value, result);
- }
- catch (java.rmi.RemoteException re) {
- throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
- }
- }
-
- public void testStep5() {
- SoapInteropImport1PortType binding;
- try {
- binding = new Import1Locator().getSoapInteropImport1Port(new
java.net.URL("http://localhost:8080/axis/services/SoapInteropImport1Port";));
- }
- catch (Throwable t) {
- throw new junit.framework.AssertionFailedError("Throwable caught: " +
t);
- }
- assertTrue("binding is null", binding != null);
-
- try {
- String value = null;
- value = binding.echoString(new String());
}
catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
1.4 +1 -19 xml-axis/java/test/wsdl/interop3/import2/Import2TestCase.java
Index: Import2TestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import2/Import2TestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Import2TestCase.java 28 Feb 2002 16:48:44 -0000 1.3
+++ Import2TestCase.java 28 Feb 2002 17:58:51 -0000 1.4
@@ -26,7 +26,7 @@
*/
public class Import2TestCase extends junit.framework.TestCase {
- static URL url;
+ public static URL url;
public Import2TestCase(String name) {
super(name);
@@ -61,24 +61,6 @@
}
}
- public void testStep5() {
- SoapInteropImport2PortType binding;
- try {
- binding = new Import2Locator().getSoapInteropImport2Port(new
java.net.URL("http://localhost:8080/axis/services/SoapInteropImport2Port";));
- }
- catch (Throwable t) {
- throw new junit.framework.AssertionFailedError("Throwable caught: " +
t);
- }
- assertTrue("binding is null", binding != null);
-
- try {
- SOAPStruct value = null;
- value = binding.echoStruct(new SOAPStruct());
- }
- catch (java.rmi.RemoteException re) {
- throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
- }
- }
/* doesn't work yet
public void testStep8() {
1.4 +1 -40 xml-axis/java/test/wsdl/interop3/import3/Import3TestCase.java
Index: Import3TestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/import3/Import3TestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Import3TestCase.java 28 Feb 2002 16:48:44 -0000 1.3
+++ Import3TestCase.java 28 Feb 2002 17:58:51 -0000 1.4
@@ -26,7 +26,7 @@
*/
public class Import3TestCase extends junit.framework.TestCase {
- static URL url;
+ public static URL url;
public Import3TestCase(String name) {
super(name);
@@ -78,45 +78,6 @@
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
}
}
-
- public void testStep5EchoStruct() {
- SoapInteropImport3PortType binding;
- try {
- binding = new Import3Locator().getSoapInteropImport3Port(new
java.net.URL("http://localhost:8080/axis/services/SoapInteropImport3Port";));
- }
- catch (Throwable t) {
- throw new junit.framework.AssertionFailedError("Throwable caught: " +
t);
- }
- assertTrue("binding is null", binding != null);
-
- try {
- SOAPStruct value = null;
- value = binding.echoStruct(new SOAPStruct());
- }
- catch (java.rmi.RemoteException re) {
- throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
- }
- }
-
- public void testStep5EchoStructArray() {
- SoapInteropImport3PortType binding;
- try {
- binding = new Import3Locator().getSoapInteropImport3Port(new
java.net.URL("http://localhost:8080/axis/services/SoapInteropImport3Port";));
- }
- catch (Throwable t) {
- throw new junit.framework.AssertionFailedError("Throwable caught: " +
t);
- }
- assertTrue("binding is null", binding != null);
-
- try {
- SOAPStruct[] value = null;
- value = binding.echoStructArray(new SOAPStruct[0]);
- }
- catch (java.rmi.RemoteException re) {
- throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re);
- }
- }
-
public static void main(String[] args) {
if (args.length == 1) {
