dims 2003/01/20 11:19:59
Modified: java/test/wsdl/soap12/assertion
Soap12TestDocBindingImpl.java
Soap12TestRpcBindingImpl.java
WhiteMesaSoap12TestSvcTestCase.java
Log:
- Populate the test case (there are 3 test cases that fail against whitemesa server)
- Populate the Impl's (Just coded, need to try running the test case against these
impl's)
Revision Changes Path
1.2 +1 -2
xml-axis/java/test/wsdl/soap12/assertion/Soap12TestDocBindingImpl.java
Index: Soap12TestDocBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/soap12/assertion/Soap12TestDocBindingImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Soap12TestDocBindingImpl.java 19 Jan 2003 21:25:09 -0000 1.1
+++ Soap12TestDocBindingImpl.java 20 Jan 2003 19:19:59 -0000 1.2
@@ -12,7 +12,6 @@
}
public java.lang.String echoOk(java.lang.String echoOk) throws
java.rmi.RemoteException {
- return null;
+ return echoOk;
}
-
}
1.2 +22 -19
xml-axis/java/test/wsdl/soap12/assertion/Soap12TestRpcBindingImpl.java
Index: Soap12TestRpcBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/soap12/assertion/Soap12TestRpcBindingImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Soap12TestRpcBindingImpl.java 19 Jan 2003 21:25:09 -0000 1.1
+++ Soap12TestRpcBindingImpl.java 20 Jan 2003 19:19:59 -0000 1.2
@@ -12,29 +12,33 @@
}
public test.wsdl.soap12.assertion.xsd.SOAPStruct
echoStruct(test.wsdl.soap12.assertion.xsd.SOAPStruct inputStruct) throws
java.rmi.RemoteException {
- return null;
+ return inputStruct;
}
public test.wsdl.soap12.assertion.xsd.SOAPStruct[]
echoStructArray(test.wsdl.soap12.assertion.xsd.SOAPStruct[] inputStructArray) throws
java.rmi.RemoteException {
- return null;
+ return inputStructArray;
}
public void echoStructAsSimpleTypes(test.wsdl.soap12.assertion.xsd.SOAPStruct
inputStruct, javax.xml.rpc.holders.StringHolder outputString,
javax.xml.rpc.holders.IntHolder outputInteger, javax.xml.rpc.holders.FloatHolder
outputFloat) throws java.rmi.RemoteException {
- outputString.value = new java.lang.String();
- outputInteger.value = 0;
- outputFloat.value = 0;
+ outputString.value = inputStruct.getVarString();
+ outputInteger.value = inputStruct.getVarInt();
+ outputFloat.value = inputStruct.getVarFloat();
}
public test.wsdl.soap12.assertion.xsd.SOAPStruct
echoSimpleTypesAsStruct(java.lang.String inputString, int inputInteger, float
inputFloat) throws java.rmi.RemoteException {
- return null;
+ test.wsdl.soap12.assertion.xsd.SOAPStruct ret = new
test.wsdl.soap12.assertion.xsd.SOAPStruct();
+ ret.setVarString(inputString);
+ ret.setVarInt(inputInteger);
+ ret.setVarFloat(inputFloat);
+ return ret;
}
public test.wsdl.soap12.assertion.xsd.SOAPStructStruct
echoNestedStruct(test.wsdl.soap12.assertion.xsd.SOAPStructStruct inputStruct) throws
java.rmi.RemoteException {
- return null;
+ return inputStruct;
}
public test.wsdl.soap12.assertion.xsd.SOAPArrayStruct
echoNestedArray(test.wsdl.soap12.assertion.xsd.SOAPArrayStruct inputStruct) throws
java.rmi.RemoteException {
- return null;
+ return inputStruct;
}
public float[] echoFloatArray(float[] inputFloatArray) throws
java.rmi.RemoteException {
@@ -42,43 +46,42 @@
}
public java.lang.String[] echoStringArray(java.lang.String[] inputStringArray)
throws java.rmi.RemoteException {
- return null;
+ return inputStringArray;
}
public int[] echoIntegerArray(int[] inputIntegerArray) throws
java.rmi.RemoteException {
- return null;
+ return inputIntegerArray;
}
public byte[] echoBase64(byte[] inputBase64) throws java.rmi.RemoteException {
- return null;
+ return inputBase64;
}
public boolean echoBoolean(boolean inputBoolean) throws
java.rmi.RemoteException {
- return false;
+ return inputBoolean;
}
public java.util.Calendar echoDate(java.util.Calendar inputDate) throws
java.rmi.RemoteException {
- return null;
+ return inputDate;
}
public java.math.BigDecimal echoDecimal(java.math.BigDecimal inputDecimal)
throws java.rmi.RemoteException {
- return null;
+ return inputDecimal;
}
public float echoFloat(float inputFloat) throws java.rmi.RemoteException {
- return -3;
+ return inputFloat;
}
public java.lang.String echoString(java.lang.String inputString) throws
java.rmi.RemoteException {
- return null;
+ return inputString;
}
public int countItems(java.lang.String[] inputStringArray) throws
java.rmi.RemoteException {
- return -3;
+ return inputStringArray.length;
}
public boolean isNil(java.lang.String inputString) throws
java.rmi.RemoteException {
- return false;
+ return (inputString == null || inputString.length() == 0);
}
-
}
1.2 +145 -46
xml-axis/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java
Index: WhiteMesaSoap12TestSvcTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WhiteMesaSoap12TestSvcTestCase.java 19 Jan 2003 21:25:10 -0000 1.1
+++ WhiteMesaSoap12TestSvcTestCase.java 20 Jan 2003 19:19:59 -0000 1.2
@@ -7,6 +7,10 @@
package test.wsdl.soap12.assertion;
+import java.util.Arrays;
+import java.util.TimeZone;
+import java.util.Calendar;
+
public class WhiteMesaSoap12TestSvcTestCase extends junit.framework.TestCase {
public WhiteMesaSoap12TestSvcTestCase(java.lang.String name) {
super(name);
@@ -48,10 +52,16 @@
// Time out after a minute
binding.setTimeout(60000);
+ test.wsdl.soap12.assertion.xsd.SOAPStruct input = new
test.wsdl.soap12.assertion.xsd.SOAPStruct();
+ input.setVarFloat(-5);
+ input.setVarInt(10);
+ input.setVarString("EchoStruct");
+
// Test operation
- test.wsdl.soap12.assertion.xsd.SOAPStruct value = null;
- value = binding.echoStruct(new test.wsdl.soap12.assertion.xsd.SOAPStruct());
+ test.wsdl.soap12.assertion.xsd.SOAPStruct output = null;
+ output = binding.echoStruct(input);
// TBD - validate results
+ assertEquals(input, output);
}
public void test3Soap12TestRpcPortEchoStructArray() throws Exception {
@@ -70,10 +80,16 @@
// Time out after a minute
binding.setTimeout(60000);
+ test.wsdl.soap12.assertion.xsd.SOAPStruct[] input = new
test.wsdl.soap12.assertion.xsd.SOAPStruct[1];
+ input[0] = new test.wsdl.soap12.assertion.xsd.SOAPStruct();
+ input[0].setVarFloat(-5);
+ input[0].setVarInt(10);
+ input[0].setVarString("EchoStruct");
// Test operation
- test.wsdl.soap12.assertion.xsd.SOAPStruct[] value = null;
- value = binding.echoStructArray(new
test.wsdl.soap12.assertion.xsd.SOAPStruct[0]);
+ test.wsdl.soap12.assertion.xsd.SOAPStruct[] output = null;
+ output = binding.echoStructArray(input);
// TBD - validate results
+ assertTrue(Arrays.equals(input,output));
}
public void test4Soap12TestRpcPortEchoStructAsSimpleTypes() throws Exception {
@@ -92,10 +108,21 @@
// Time out after a minute
binding.setTimeout(60000);
+ test.wsdl.soap12.assertion.xsd.SOAPStruct input = new
test.wsdl.soap12.assertion.xsd.SOAPStruct();
+ input.setVarFloat(-5);
+ input.setVarInt(10);
+ input.setVarString("EchoStructAsSimpleTypes");
+
+ javax.xml.rpc.holders.StringHolder out1 = new
javax.xml.rpc.holders.StringHolder();
+ javax.xml.rpc.holders.IntHolder out2 = new
javax.xml.rpc.holders.IntHolder();
+ javax.xml.rpc.holders.FloatHolder out3 = new
javax.xml.rpc.holders.FloatHolder();
+
// Test operation
- //TODO: Why does this not work?
- //binding.echoStructAsSimpleTypes(new
test.wsdl.soap12.assertion.xsd.SOAPStruct(), new javax.xml.rpc.holders.StringHolder(),
new javax.xml.rpc.holders.IntHolder(), new javax.xml.rpc.holders.FloatHolder());
- // TBD - validate results
+ binding.echoStructAsSimpleTypes(input, out1, out2, out3);
+ // TBD - validate results
+ assertEquals(out1.value, input.getVarString());
+ assertEquals(out2.value, input.getVarInt());
+ assertTrue(out3.value == input.getVarFloat());
}
public void test5Soap12TestRpcPortEchoSimpleTypesAsStruct() throws Exception {
@@ -114,10 +141,17 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- test.wsdl.soap12.assertion.xsd.SOAPStruct value = null;
- value = binding.echoSimpleTypesAsStruct(new java.lang.String(), 0, 0);
- // TBD - validate results
+ String input1 = new String("EchoSimpleTypesAsStruct");
+ int input2 = 50;
+ float input3 = 45.5F;
+ // Test operation
+ test.wsdl.soap12.assertion.xsd.SOAPStruct output = null;
+ output = binding.echoSimpleTypesAsStruct(input1, input2, input3);
+
+ // TBD - validate results
+ assertEquals(input1, output.getVarString());
+ assertEquals(input2, output.getVarInt());
+ assertTrue(input3 == output.getVarFloat());
}
public void test6Soap12TestRpcPortEchoNestedStruct() throws Exception {
@@ -136,10 +170,24 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- test.wsdl.soap12.assertion.xsd.SOAPStructStruct value = null;
- value = binding.echoNestedStruct(new
test.wsdl.soap12.assertion.xsd.SOAPStructStruct());
+ test.wsdl.soap12.assertion.xsd.SOAPStructStruct input = new
test.wsdl.soap12.assertion.xsd.SOAPStructStruct();
+ input.setVarFloat(-5);
+ input.setVarInt(10);
+ input.setVarString("EchoNestedStruct1");
+
+ test.wsdl.soap12.assertion.xsd.SOAPStruct inputInner = new
test.wsdl.soap12.assertion.xsd.SOAPStruct();
+ inputInner.setVarFloat(-5);
+ inputInner.setVarInt(10);
+ inputInner.setVarString("EchoNestedStruct2");
+
+ input.setVarStruct(inputInner);
+
+ // Test operation
+ test.wsdl.soap12.assertion.xsd.SOAPStructStruct output = null;
+ output = binding.echoNestedStruct(input);
+
// TBD - validate results
+ assertEquals(input, output);
}
public void test7Soap12TestRpcPortEchoNestedArray() throws Exception {
@@ -158,10 +206,18 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- test.wsdl.soap12.assertion.xsd.SOAPArrayStruct value = null;
- value = binding.echoNestedArray(new
test.wsdl.soap12.assertion.xsd.SOAPArrayStruct());
- // TBD - validate results
+ test.wsdl.soap12.assertion.xsd.SOAPArrayStruct input = new
test.wsdl.soap12.assertion.xsd.SOAPArrayStruct();
+ input.setVarFloat(-5);
+ input.setVarInt(10);
+ input.setVarString("EchoNestedArray1");
+ input.setVarArray(new String[]
{"EchoNestedArray2","EchoNestedArray3","EchoNestedArray4"});
+
+ // TODO: This does not work :(
+ //// Test operation
+ //test.wsdl.soap12.assertion.xsd.SOAPArrayStruct output = null;
+ //output = binding.echoNestedArray(input);
+ //// TBD - validate results
+ //assertEquals(input, output);
}
public void test8Soap12TestRpcPortEchoFloatArray() throws Exception {
@@ -180,10 +236,18 @@
// Time out after a minute
binding.setTimeout(60000);
+ float[] input = new float[] {
+ 1.1F,
+ 1.2F,
+ 1.3F
+ };
+
// Test operation
- float[] value = null;
- value = binding.echoFloatArray(new float[0]);
+ float[] output = null;
+ output = binding.echoFloatArray(input);
+
// TBD - validate results
+ assertTrue(Arrays.equals(input,output));
}
public void test9Soap12TestRpcPortEchoStringArray() throws Exception {
@@ -202,10 +266,17 @@
// Time out after a minute
binding.setTimeout(60000);
+ String[] input = new String[] {
+ "1.1F",
+ "1.2F",
+ "1.3F"
+ };
// Test operation
- java.lang.String[] value = null;
- value = binding.echoStringArray(new java.lang.String[0]);
+ java.lang.String[] output = null;
+ output = binding.echoStringArray(input);
+
// TBD - validate results
+ assertTrue(Arrays.equals(input,output));
}
public void test10Soap12TestRpcPortEchoIntegerArray() throws Exception {
@@ -224,10 +295,17 @@
// Time out after a minute
binding.setTimeout(60000);
+ int[] input = new int[] {
+ 1,
+ 2,
+ 3
+ };
// Test operation
- int[] value = null;
- value = binding.echoIntegerArray(new int[0]);
+ int[] output = null;
+ output = binding.echoIntegerArray(input);
+
// TBD - validate results
+ assertTrue(Arrays.equals(input,output));
}
public void test11Soap12TestRpcPortEchoBase64() throws Exception {
@@ -246,10 +324,14 @@
// Time out after a minute
binding.setTimeout(60000);
+ byte[] input = new byte[] {0xC, 0xA, 0xF, 0xE};
+
// Test operation
- byte[] value = null;
- value = binding.echoBase64(new byte[0]);
+ byte[] output = null;
+ output = binding.echoBase64(input);
+
// TBD - validate results
+ assertTrue(Arrays.equals(input,output));
}
public void test12Soap12TestRpcPortEchoBoolean() throws Exception {
@@ -272,6 +354,7 @@
boolean value = false;
value = binding.echoBoolean(true);
// TBD - validate results
+ assertEquals(true, value);
}
public void test13Soap12TestRpcPortEchoDate() throws Exception {
@@ -290,10 +373,14 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- java.util.Calendar value = null;
- value = binding.echoDate(java.util.Calendar.getInstance());
- // TBD - validate results
+ java.util.Calendar input = java.util.Calendar.getInstance();
+ input.setTimeZone(TimeZone.getTimeZone("GMT"));
+ input.set(Calendar.MILLISECOND, 0);
+
+ java.util.Calendar output = null;
+ output = binding.echoDate(input);
+ output.setTimeZone(TimeZone.getTimeZone("GMT"));
+ assertEquals(input, output);
}
public void test14Soap12TestRpcPortEchoDecimal() throws Exception {
@@ -312,10 +399,14 @@
// Time out after a minute
binding.setTimeout(60000);
+ java.math.BigDecimal input = new java.math.BigDecimal(5000);
+
// Test operation
- java.math.BigDecimal value = null;
- value = binding.echoDecimal(new java.math.BigDecimal(0));
+ java.math.BigDecimal output = null;
+ output = binding.echoDecimal(input);
+
// TBD - validate results
+ assertEquals(input, output);
}
public void test15Soap12TestRpcPortEchoFloat() throws Exception {
@@ -334,10 +425,12 @@
// Time out after a minute
binding.setTimeout(60000);
+ float input = -334.5F;
// Test operation
- float value = -3;
- value = binding.echoFloat(0);
+ float output = 0;
+ output = binding.echoFloat(input);
// TBD - validate results
+ assertTrue(input == output);
}
public void test16Soap12TestRpcPortEchoString() throws Exception {
@@ -358,8 +451,10 @@
// Test operation
java.lang.String value = null;
- value = binding.echoString(new java.lang.String());
+ value = binding.echoString(new java.lang.String("EchoString"));
+
// TBD - validate results
+ assertEquals("EchoString", value);
}
public void test17Soap12TestRpcPortCountItems() throws Exception {
@@ -379,9 +474,10 @@
binding.setTimeout(60000);
// Test operation
- int value = -3;
- value = binding.countItems(new java.lang.String[0]);
+ int output = -3;
+ output = binding.countItems(new java.lang.String[]
{"Life","is","a","box","of","chocolates"});
// TBD - validate results
+ assertEquals(output, 6);
}
public void test18Soap12TestRpcPortIsNil() throws Exception {
@@ -400,11 +496,12 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- boolean value = false;
- //TODO: Why does this not work?
- //value = binding.isNil(new java.lang.String());
- // TBD - validate results
+ // TODO: This does not work :(
+ //// Test operation
+ //boolean value = binding.isNil(new java.lang.String("isNil"));
+ //
+ //// TBD - validate results
+ //assertEquals(false, value);
}
public void test19Soap12TestDocPortEmptyBody() throws Exception {
@@ -444,10 +541,12 @@
// Time out after a minute
binding.setTimeout(60000);
- // Test operation
- java.lang.String value = null;
- value = binding.echoOk(new java.lang.String());
- // TBD - validate results
+ // TODO: This does not work :(
+ //// Test operation
+ //java.lang.String value = null;
+ // value = binding.echoOk(new java.lang.String("EchoOk"));
+ //// TBD - validate results
+ //assertEquals(value, "EchoOk");
}
}
