You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by tl...@apache.org on 2006/10/11 07:36:25 UTC
svn commit: r462701 [1/2] - in /incubator/cxf/trunk: ./
systests/src/test/java/org/apache/cxf/systest/type_test/ testutils/
testutils/src/main/resources/wsdl/type_test/
Author: tli
Date: Tue Oct 10 22:36:24 2006
New Revision: 462701
URL: http://svn.apache.org/viewvc?view=rev&rev=462701
Log:
add xml type_test
Modified:
incubator/cxf/trunk/checkstyle.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java
incubator/cxf/trunk/testutils/pom.xml
incubator/cxf/trunk/testutils/src/main/resources/wsdl/type_test/type_test_wsdl.xsl
incubator/cxf/trunk/testutils/src/main/resources/wsdl/type_test/type_test_xml_wsdl.xsl
Modified: incubator/cxf/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/checkstyle.xml?view=diff&rev=462701&r1=462700&r2=462701
==============================================================================
--- incubator/cxf/trunk/checkstyle.xml (original)
+++ incubator/cxf/trunk/checkstyle.xml Tue Oct 10 22:36:24 2006
@@ -106,7 +106,9 @@
<module name="ExecutableStatementCount">
<property name="max" value="50"/>
</module>
- <module name="FileLength"/>
+ <module name="FileLength">
+ <property name="max" value="3000"/>
+ </module>
<module name="LineLength">
<property name="max" value="110"/>
</module>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?view=diff&rev=462701&r1=462700&r2=462701
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java Tue Oct 10 22:36:24 2006
@@ -43,6 +43,7 @@
public abstract class AbstractTypeTestClient extends ClientServerTestBase implements TypeTestTester {
protected static TypeTestPortType docClient;
+ protected static org.apache.type_test.xml.TypeTestPortType xmlClient;
protected static org.apache.type_test.rpc.TypeTestPortType rpcClient;
protected static boolean testDocLiteral;
protected static boolean testXMLBinding;
@@ -72,12 +73,11 @@
assertNotNull("Could not load wsdl " + wsdlPath, wsdlLocation);
testDocLiteral = wsdlPath.contains("doclit");
testXMLBinding = wsdlPath.contains("_xml");
- if (testXMLBinding) {
- testDocLiteral = true;
- org.apache.type_test.doc.XMLService docService =
- new org.apache.type_test.doc.XMLService(wsdlLocation, serviceName);
- docClient = docService.getPort(portName, org.apache.type_test.doc.TypeTestPortType.class);
- assertNotNull("Could not create docClient", docClient);
+ if (testXMLBinding) {
+ org.apache.type_test.xml.XMLService xmlService =
+ new org.apache.type_test.xml.XMLService(wsdlLocation, serviceName);
+ xmlClient = xmlService.getPort(portName, org.apache.type_test.xml.TypeTestPortType.class);
+ assertNotNull("Could not create xmlClient", xmlClient);
} else {
if (testDocLiteral) {
org.apache.type_test.doc.SOAPService docService =
@@ -139,9 +139,11 @@
public void testVoid() throws Exception {
if (testDocLiteral) {
docClient.testVoid();
+ } else if (testXMLBinding) {
+ xmlClient.testVoid();
} else {
rpcClient.testVoid();
- }
+ }
}
public void testOneway() throws Exception {
@@ -149,6 +151,8 @@
String y = "oneway";
if (testDocLiteral) {
docClient.testOneway(x, y);
+ } else if (testXMLBinding) {
+ xmlClient.testOneway(x, y);
} else {
rpcClient.testOneway(x, y);
}
@@ -170,6 +174,8 @@
byte ret;
if (testDocLiteral) {
ret = docClient.testByte(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testByte(x, y, z);
} else {
ret = rpcClient.testByte(x, y, z);
}
@@ -199,6 +205,8 @@
short ret;
if (testDocLiteral) {
ret = docClient.testShort(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testShort(x, y, z);
} else {
ret = rpcClient.testShort(x, y, z);
}
@@ -222,6 +230,8 @@
int ret;
if (testDocLiteral) {
ret = docClient.testUnsignedShort(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnsignedShort(x, y, z);
} else {
ret = rpcClient.testUnsignedShort(x, y, z);
}
@@ -248,6 +258,8 @@
int ret;
if (testDocLiteral) {
ret = docClient.testInt(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testInt(x, y, z);
} else {
ret = rpcClient.testInt(x, y, z);
}
@@ -272,6 +284,8 @@
long ret;
if (testDocLiteral) {
ret = docClient.testUnsignedInt(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnsignedInt(x, y, z);
} else {
ret = rpcClient.testUnsignedInt(x, y, z);
}
@@ -298,6 +312,8 @@
long ret;
if (testDocLiteral) {
ret = docClient.testLong(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testLong(x, y, z);
} else {
ret = rpcClient.testLong(x, y, z);
}
@@ -324,6 +340,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testUnsignedLong(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnsignedLong(x, y, z);
} else {
ret = rpcClient.testUnsignedLong(x, y, z);
}
@@ -353,6 +371,8 @@
float ret;
if (testDocLiteral) {
ret = docClient.testFloat(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testFloat(x, y, z);
} else {
ret = rpcClient.testFloat(x, y, z);
}
@@ -370,6 +390,8 @@
float ret;
if (testDocLiteral) {
ret = docClient.testFloat(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testFloat(x, y, z);
} else {
ret = rpcClient.testFloat(x, y, z);
}
@@ -399,6 +421,8 @@
double ret;
if (testDocLiteral) {
ret = docClient.testDouble(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDouble(x, y, z);
} else {
ret = rpcClient.testDouble(x, y, z);
}
@@ -416,6 +440,8 @@
double ret;
if (testDocLiteral) {
ret = docClient.testDouble(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDouble(x, y, z);
} else {
ret = rpcClient.testDouble(x, y, z);
}
@@ -439,6 +465,8 @@
short ret;
if (testDocLiteral) {
ret = docClient.testUnsignedByte(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnsignedByte(x, y, z);
} else {
ret = rpcClient.testUnsignedByte(x, y, z);
}
@@ -465,6 +493,8 @@
boolean ret;
if (testDocLiteral) {
ret = docClient.testBoolean(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testBoolean(x, y, z);
} else {
ret = rpcClient.testBoolean(x, y, z);
}
@@ -498,6 +528,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testString(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testString(x, y, z);
} else {
ret = rpcClient.testString(x, y, z);
}
@@ -524,6 +556,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testString(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testString(x, y, z);
} else {
ret = rpcClient.testString(x, y, z);
}
@@ -551,6 +585,8 @@
QName ret;
if (testDocLiteral) {
ret = docClient.testQName(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testQName(x, y, z);
} else {
ret = rpcClient.testQName(x, y, z);
}
@@ -640,6 +676,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testDateTime(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDateTime(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -672,6 +710,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testTime(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testTime(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests.
@@ -697,6 +737,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testGYear(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGYear(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -720,6 +762,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testGYearMonth(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGYearMonth(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -743,6 +787,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testGMonth(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGMonth(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -766,6 +812,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testGMonthDay(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGMonthDay(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -789,6 +837,8 @@
XMLGregorianCalendar ret;
if (testDocLiteral) {
ret = docClient.testGDay(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGDay(x, y, z);
} else {
// XXX - TODO getting a marshalling exception with rpc-lit for the
// xsd:date tests (ClassCastException in jaxb).
@@ -812,6 +862,8 @@
Duration ret;
if (testDocLiteral) {
ret = docClient.testDuration(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDuration(x, y, z);
} else {
// XXX - TODO getting a MarshalException with rpc-lit for the
// xsd:duration test [DurationImpl is not known to this context].
@@ -833,6 +885,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testNormalizedString(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNormalizedString(x, y, z);
} else {
ret = rpcClient.testNormalizedString(x, y, z);
}
@@ -851,6 +905,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testToken(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testToken(x, y, z);
} else {
ret = rpcClient.testToken(x, y, z);
}
@@ -869,6 +925,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testLanguage(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testLanguage(x, y, z);
} else {
ret = rpcClient.testLanguage(x, y, z);
}
@@ -887,6 +945,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testNMTOKEN(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNMTOKEN(x, y, z);
} else {
ret = rpcClient.testNMTOKEN(x, y, z);
}
@@ -904,14 +964,21 @@
if (testDocLiteral) {
List<String> x = Arrays.asList("123:abc");
List<String> yOrig = Arrays.asList("abc.-_:", "a");
-
Holder<List<String>> y = new Holder<List<String>>(yOrig);
Holder<List<String>> z = new Holder<List<String>>();
-
List<String> ret = docClient.testNMTOKENS(x, y, z);
assertTrue("testNMTOKENS(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testNMTOKENS(): Incorrect value for out param", yOrig.equals(z.value));
assertTrue("testNMTOKENS(): Incorrect return value", x.equals(ret));
+ } else if (testXMLBinding) {
+ List<String> x = Arrays.asList("123:abc");
+ List<String> yOrig = Arrays.asList("abc.-_:", "a");
+ Holder<List<String>> y = new Holder<List<String>>(yOrig);
+ Holder<List<String>> z = new Holder<List<String>>();
+ List<String> ret = xmlClient.testNMTOKENS(x, y, z);
+ assertTrue("testNMTOKENS(): Incorrect value for inout param", x.equals(y.value));
+ assertTrue("testNMTOKENS(): Incorrect value for out param", yOrig.equals(z.value));
+ assertTrue("testNMTOKENS(): Incorrect return value", x.equals(ret));
} else {
String[] x = new String[1];
x[0] = "123:abc";
@@ -939,6 +1006,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testName(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testName(x, y, z);
} else {
ret = rpcClient.testName(x, y, z);
}
@@ -957,6 +1026,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testNCName(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNCName(x, y, z);
} else {
ret = rpcClient.testNCName(x, y, z);
}
@@ -983,6 +1054,8 @@
if (testDocLiteral) {
/*String ret =*/ docClient.testID(x, y, z);
+ } else if (testXMLBinding) {
+ /*String ret =*/ xmlClient.testID(x, y, z);
} else {
/*String ret =*/ rpcClient.testID(x, y, z);
}
@@ -1009,6 +1082,8 @@
BigDecimal ret;
if (testDocLiteral) {
ret = docClient.testDecimal(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDecimal(x, y, z);
} else {
ret = rpcClient.testDecimal(x, y, z);
}
@@ -1036,6 +1111,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testInteger(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testInteger(x, y, z);
} else {
ret = rpcClient.testInteger(x, y, z);
}
@@ -1063,6 +1140,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testPositiveInteger(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testPositiveInteger(x, y, z);
} else {
ret = rpcClient.testPositiveInteger(x, y, z);
}
@@ -1090,6 +1169,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testNonPositiveInteger(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNonPositiveInteger(x, y, z);
} else {
ret = rpcClient.testNonPositiveInteger(x, y, z);
}
@@ -1117,6 +1198,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testNegativeInteger(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNegativeInteger(x, y, z);
} else {
ret = rpcClient.testNegativeInteger(x, y, z);
}
@@ -1144,6 +1227,8 @@
BigInteger ret;
if (testDocLiteral) {
ret = docClient.testNonNegativeInteger(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNonNegativeInteger(x, y, z);
} else {
ret = rpcClient.testNonNegativeInteger(x, y, z);
}
@@ -1163,6 +1248,8 @@
byte[] ret;
if (testDocLiteral) {
ret = docClient.testHexBinary(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testHexBinary(x, y, z);
} else {
ret = rpcClient.testHexBinary(x, y, z);
}
@@ -1184,6 +1271,8 @@
byte[] ret;
if (testDocLiteral) {
ret = docClient.testBase64Binary(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testBase64Binary(x, y, z);
} else {
ret = rpcClient.testBase64Binary(x, y, z);
}
@@ -1202,6 +1291,8 @@
z = new Holder<byte[]>();
if (testDocLiteral) {
docClient.testBase64Binary(x, y, z);
+ } else if (testXMLBinding) {
+ xmlClient.testBase64Binary(x, y, z);
} else {
rpcClient.testBase64Binary(x, y, z);
}
@@ -1227,6 +1318,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testAnyURI(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testAnyURI(x, y, z);
} else {
ret = rpcClient.testAnyURI(x, y, z);
}
@@ -1286,6 +1379,8 @@
NumberEnum ret;
if (testDocLiteral) {
ret = docClient.testNumberEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNumberEnum(x, y, z);
} else {
ret = rpcClient.testNumberEnum(x, y, z);
}
@@ -1313,6 +1408,8 @@
StringEnum ret;
if (testDocLiteral) {
ret = docClient.testStringEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStringEnum(x, y, z);
} else {
ret = rpcClient.testStringEnum(x, y, z);
}
@@ -1345,6 +1442,8 @@
DecimalEnum ret;
if (testDocLiteral) {
ret = docClient.testDecimalEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDecimalEnum(x, y, z);
} else {
ret = rpcClient.testDecimalEnum(x, y, z);
}
@@ -1373,6 +1472,8 @@
NMTokenEnum ret;
if (testDocLiteral) {
ret = docClient.testNMTokenEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNMTokenEnum(x, y, z);
} else {
ret = rpcClient.testNMTokenEnum(x, y, z);
}
@@ -1400,6 +1501,8 @@
AnyURIEnum ret;
if (testDocLiteral) {
ret = docClient.testAnyURIEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testAnyURIEnum(x, y, z);
} else {
ret = rpcClient.testAnyURIEnum(x, y, z);
}
@@ -1422,6 +1525,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction(x, y, z);
}
@@ -1432,7 +1537,7 @@
}
// Enabled schema validation for doc literal tests
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "string_xxxxx";
y = new Holder<String>(yOrig);
@@ -1450,7 +1555,8 @@
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction(x, y, z)
+ : xmlClient.testSimpleRestriction(x, y, z);
//fail("y parameter maxLength=10 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1468,6 +1574,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction2(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction2(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction2(x, y, z);
}
@@ -1478,13 +1586,14 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "str";
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction2(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction2(x, y, z)
+ : xmlClient.testSimpleRestriction2(x, y, z);
//fail("minLength=5 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1502,6 +1611,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction3(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction3(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction3(x, y, z);
}
@@ -1512,7 +1623,7 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "str";
y = new Holder<String>(yOrig);
@@ -1530,7 +1641,8 @@
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction3(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction3(x, y, z)
+ : xmlClient.testSimpleRestriction3(x, y, z);
//fail("y parameter maxLength=10 && minLength=5 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1548,6 +1660,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction4(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction4(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction4(x, y, z);
}
@@ -1558,13 +1672,14 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "str";
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction4(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction4(x, y, z)
+ : xmlClient.testSimpleRestriction4(x, y, z);
//fail("x parameter minLength=5 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1583,6 +1698,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction5(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction5(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction5(x, y, z);
}
@@ -1593,7 +1710,7 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "str";
y = new Holder<String>(yOrig);
@@ -1611,7 +1728,8 @@
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction5(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction5(x, y, z)
+ : xmlClient.testSimpleRestriction5(x, y, z);
//fail("maxLength=10 && minLength=5 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1628,6 +1746,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testSimpleRestriction6(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleRestriction6(x, y, z);
} else {
ret = rpcClient.testSimpleRestriction6(x, y, z);
}
@@ -1638,14 +1758,15 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "string_x";
yOrig = "string_y";
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testSimpleRestriction6(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleRestriction6(x, y, z)
+ : xmlClient.testSimpleRestriction6(x, y, z);
//fail("maxLength=10 && minLength=5 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1663,6 +1784,8 @@
byte[] ret;
if (testDocLiteral) {
ret = docClient.testHexBinaryRestriction(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testHexBinaryRestriction(x, y, z);
} else {
ret = rpcClient.testHexBinaryRestriction(x, y, z);
}
@@ -1675,7 +1798,7 @@
}
// Schema validation is enabled for doc-literal
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "".getBytes();
y = new Holder<byte[]>(yOrig);
@@ -1693,7 +1816,8 @@
y = new Holder<byte[]>(yOrig);
z = new Holder<byte[]>();
try {
- ret = docClient.testHexBinaryRestriction(x, y, z);
+ ret = testDocLiteral ? docClient.testHexBinaryRestriction(x, y, z)
+ : xmlClient.testHexBinaryRestriction(x, y, z);
//fail("maxLength=10 && minLength=1 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1716,6 +1840,8 @@
byte[] ret;
if (testDocLiteral) {
ret = docClient.testBase64BinaryRestriction(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testBase64BinaryRestriction(x, y, z);
} else {
ret = rpcClient.testBase64BinaryRestriction(x, y, z);
}
@@ -1743,12 +1869,13 @@
}
public void testSimpleListRestriction2() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("I", "am", "SimpleList");
List<String> yOrig = Arrays.asList("Does", "SimpleList", "Work");
Holder<List<String>> y = new Holder<List<String>>(yOrig);
Holder<List<String>> z = new Holder<List<String>>();
- List<String> ret = docClient.testSimpleListRestriction2(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testSimpleListRestriction2(x, y, z)
+ : xmlClient.testSimpleListRestriction2(x, y, z);
if (!perfTestOnly) {
assertTrue("testStringList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testStringList(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1758,7 +1885,8 @@
y = new Holder< List<String> >(yOrig);
z = new Holder< List<String> >();
try {
- ret = docClient.testSimpleListRestriction2(x, y, z);
+ ret = testDocLiteral ? docClient.testSimpleListRestriction2(x, y, z)
+ : xmlClient.testSimpleListRestriction2(x, y, z);
//fail("length=10 restriction is violated.");
} catch (Exception ex) {
ex.printStackTrace();
@@ -1786,13 +1914,14 @@
}
public void testStringList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("I", "am", "SimpleList");
List<String> yOrig = Arrays.asList("Does", "SimpleList", "Work");
Holder< List<String> > y = new Holder< List<String> >(yOrig);
Holder< List<String> > z = new Holder< List<String> >();
- List<String> ret = docClient.testStringList(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testStringList(x, y, z)
+ : xmlClient.testStringList(x, y, z);
if (!perfTestOnly) {
assertTrue("testStringList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testStringList(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1820,18 +1949,19 @@
}
public void testNumberList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<Integer> x = Arrays.asList(1, 2, 3);
List<Integer> yOrig = Arrays.asList(10, 100, 1000);
Holder< List<Integer> > y = new Holder< List<Integer> >(yOrig);
Holder< List<Integer> > z = new Holder< List<Integer> >();
- List<Integer> ret = docClient.testNumberList(x, y, z);
+ List<Integer> ret = testDocLiteral ? docClient.testNumberList(x, y, z)
+ : xmlClient.testNumberList(x, y, z);
if (!perfTestOnly) {
assertTrue("testNumberList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testNumberList(): Incorrect value for out param", yOrig.equals(z.value));
assertTrue("testNumberList(): Incorrect return value", x.equals(ret));
- }
+ }
} else {
Integer[] x = {1, 2, 3};
Integer[] yOrig = {10, 100, 1000};
@@ -1854,7 +1984,7 @@
}
public void testQNameList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<QName> x = Arrays.asList(
new QName("http://schemas.iona.com/type_test", "testqname1"),
new QName("http://schemas.iona.com/type_test", "testqname2"),
@@ -1868,7 +1998,8 @@
Holder< List<QName> > y = new Holder< List<QName> >(yOrig);
Holder< List<QName> > z = new Holder< List<QName> >();
- List<QName> ret = docClient.testQNameList(x, y, z);
+ List<QName> ret = testDocLiteral ? docClient.testQNameList(x, y, z)
+ : xmlClient.testQNameList(x, y, z);
if (!perfTestOnly) {
assertTrue("testQNameList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testQNameList(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1904,14 +2035,15 @@
}
public void testSimpleUnionList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("5", "-7");
List<String> yOrig = Arrays.asList("-9", "7");
Holder< List<String> > y = new Holder< List<String> >(yOrig);
Holder< List<String> > z = new Holder< List<String> >();
- List<String> ret = docClient.testSimpleUnionList(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testSimpleUnionList(x, y, z)
+ : xmlClient.testSimpleUnionList(x, y, z);
if (!perfTestOnly) {
assertTrue("testSimpleUnionList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testSimpleUnionList(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1942,14 +2074,15 @@
}
}
public void testAnonEnumList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<Short> x = Arrays.asList((short)10, (short)100);
List<Short> yOrig = Arrays.asList((short)1000, (short)10);
Holder< List<Short> > y = new Holder< List<Short> >(yOrig);
Holder< List<Short> > z = new Holder< List<Short> >();
- List<Short> ret = docClient.testAnonEnumList(x, y, z);
+ List<Short> ret = testDocLiteral ? docClient.testAnonEnumList(x, y, z)
+ : xmlClient.testAnonEnumList(x, y, z);
if (!perfTestOnly) {
assertTrue("testAnonEnumList(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testAnonEnumList(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1988,6 +2121,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testUnionWithAnonEnum(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnionWithAnonEnum(x, y, z);
} else {
ret = rpcClient.testUnionWithAnonEnum(x, y, z);
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java?view=diff&rev=462701&r1=462700&r2=462701
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java Tue Oct 10 22:36:24 2006
@@ -111,6 +111,8 @@
EmptyStruct ret;
if (testDocLiteral) {
ret = docClient.testEmptyStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testEmptyStruct(x, y, z);
} else {
ret = rpcClient.testEmptyStruct(x, y, z);
}
@@ -136,6 +138,8 @@
z = new Holder<EmptyStruct>();
if (testDocLiteral) {
ret = docClient.testEmptyStruct(derivedX, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testEmptyStruct(derivedX, y, z);
} else {
ret = rpcClient.testEmptyStruct(derivedX, y, z);
}
@@ -173,6 +177,8 @@
SimpleStruct ret;
if (testDocLiteral) {
ret = docClient.testSimpleStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleStruct(x, y, z);
} else {
ret = rpcClient.testSimpleStruct(x, y, z);
}
@@ -206,6 +212,8 @@
StructWithNillables ret;
if (testDocLiteral) {
ret = docClient.testStructWithNillables(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillables(x, y, z);
} else {
ret = rpcClient.testStructWithNillables(x, y, z);
}
@@ -242,6 +250,8 @@
AnonymousStruct ret;
if (testDocLiteral) {
ret = docClient.testAnonymousStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testAnonymousStruct(x, y, z);
} else {
ret = rpcClient.testAnonymousStruct(x, y, z);
}
@@ -310,6 +320,8 @@
NestedStruct ret;
if (testDocLiteral) {
ret = docClient.testNestedStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNestedStruct(x, y, z);
} else {
ret = rpcClient.testNestedStruct(x, y, z);
}
@@ -336,6 +348,8 @@
FixedArray ret;
if (testDocLiteral) {
ret = docClient.testFixedArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testFixedArray(x, y, z);
} else {
ret = rpcClient.testFixedArray(x, y, z);
}
@@ -364,6 +378,8 @@
BoundedArray ret;
if (testDocLiteral) {
ret = docClient.testBoundedArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testBoundedArray(x, y, z);
} else {
ret = rpcClient.testBoundedArray(x, y, z);
}
@@ -414,6 +430,8 @@
UnboundedArray ret;
if (testDocLiteral) {
ret = docClient.testUnboundedArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnboundedArray(x, y, z);
} else {
ret = rpcClient.testUnboundedArray(x, y, z);
}
@@ -447,6 +465,8 @@
CompoundArray ret;
if (testDocLiteral) {
ret = docClient.testCompoundArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testCompoundArray(x, y, z);
} else {
ret = rpcClient.testCompoundArray(x, y, z);
}
@@ -485,6 +505,8 @@
NestedArray ret;
if (testDocLiteral) {
ret = docClient.testNestedArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNestedArray(x, y, z);
} else {
ret = rpcClient.testNestedArray(x, y, z);
}
@@ -545,6 +567,8 @@
StructWithList ret;
if (testDocLiteral) {
ret = docClient.testStructWithList(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithList(x, y, z);
} else {
ret = rpcClient.testStructWithList(x, y, z);
}
@@ -560,6 +584,8 @@
y.value = yOrig;
if (testDocLiteral) {
ret = docClient.testStructWithList(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithList(x, y, z);
} else {
ret = rpcClient.testStructWithList(x, y, z);
}
@@ -575,6 +601,8 @@
y.value = yOrig;
if (testDocLiteral) {
ret = docClient.testStructWithList(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithList(x, y, z);
} else {
ret = rpcClient.testStructWithList(x, y, z);
}
@@ -605,6 +633,8 @@
StructWithUnion ret;
if (testDocLiteral) {
ret = docClient.testStructWithUnion(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithUnion(x, y, z);
} else {
ret = rpcClient.testStructWithUnion(x, y, z);
}
@@ -618,6 +648,8 @@
y.value = yOrig;
if (testDocLiteral) {
ret = docClient.testStructWithUnion(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithUnion(x, y, z);
} else {
ret = rpcClient.testStructWithUnion(x, y, z);
}
@@ -631,6 +663,8 @@
y.value = yOrig;
if (testDocLiteral) {
ret = docClient.testStructWithUnion(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithUnion(x, y, z);
} else {
ret = rpcClient.testStructWithUnion(x, y, z);
}
@@ -651,6 +685,8 @@
EmptyChoice ret;
if (testDocLiteral) {
ret = docClient.testEmptyChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testEmptyChoice(x, y, z);
} else {
ret = rpcClient.testEmptyChoice(x, y, z);
}
@@ -689,6 +725,8 @@
SimpleChoice ret;
if (testDocLiteral) {
ret = docClient.testSimpleChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleChoice(x, y, z);
} else {
ret = rpcClient.testSimpleChoice(x, y, z);
}
@@ -711,6 +749,8 @@
EmptyAll ret;
if (testDocLiteral) {
ret = docClient.testEmptyAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testEmptyAll(x, y, z);
} else {
ret = rpcClient.testEmptyAll(x, y, z);
}
@@ -751,6 +791,8 @@
SimpleAll ret;
if (testDocLiteral) {
ret = docClient.testSimpleAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleAll(x, y, z);
} else {
ret = rpcClient.testSimpleAll(x, y, z);
}
@@ -785,6 +827,8 @@
StructWithOptionals ret;
if (testDocLiteral) {
ret = docClient.testStructWithOptionals(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOptionals(x, y, z);
} else {
ret = rpcClient.testStructWithOptionals(x, y, z);
}
@@ -840,6 +884,8 @@
RecursiveStruct ret;
if (testDocLiteral) {
ret = docClient.testRecursiveStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecursiveStruct(x, y, z);
} else {
ret = rpcClient.testRecursiveStruct(x, y, z);
}
@@ -896,6 +942,8 @@
RecursiveStructArray ret;
if (testDocLiteral) {
ret = docClient.testRecursiveStructArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecursiveStructArray(x, y, z);
} else {
ret = rpcClient.testRecursiveStructArray(x, y, z);
}
@@ -951,6 +999,8 @@
RecursiveUnion ret;
if (testDocLiteral) {
ret = docClient.testRecursiveUnion(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecursiveUnion(x, y, z);
} else {
ret = rpcClient.testRecursiveUnion(x, y, z);
}
@@ -995,6 +1045,8 @@
RecursiveUnionData ret;
if (testDocLiteral) {
ret = docClient.testRecursiveUnionData(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecursiveUnionData(x, y, z);
} else {
ret = rpcClient.testRecursiveUnionData(x, y, z);
}
@@ -1044,6 +1096,8 @@
ChoiceArray ret;
if (testDocLiteral) {
ret = docClient.testChoiceArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceArray(x, y, z);
} else {
ret = rpcClient.testChoiceArray(x, y, z);
}
@@ -1069,6 +1123,8 @@
ExtendsSimpleType ret;
if (testDocLiteral) {
ret = docClient.testExtendsSimpleType(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testExtendsSimpleType(x, y, z);
} else {
ret = rpcClient.testExtendsSimpleType(x, y, z);
}
@@ -1092,6 +1148,8 @@
ExtendsSimpleContent ret;
if (testDocLiteral) {
ret = docClient.testExtendsSimpleContent(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testExtendsSimpleContent(x, y, z);
} else {
ret = rpcClient.testExtendsSimpleContent(x, y, z);
}
@@ -1123,6 +1181,8 @@
Document ret;
if (testDocLiteral) {
ret = docClient.testDocument(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDocument(x, y, z);
} else {
ret = rpcClient.testDocument(x, y, z);
}
@@ -1143,6 +1203,8 @@
if (testDocLiteral) {
ret = docClient.testDocument(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDocument(x, y, z);
} else {
ret = rpcClient.testDocument(x, y, z);
}
@@ -1211,6 +1273,8 @@
ExtBase64Binary ret;
if (testDocLiteral) {
ret = docClient.testExtBase64Binary(x1, y1Holder, z1);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testExtBase64Binary(x1, y1Holder, z1);
} else {
ret = rpcClient.testExtBase64Binary(x1, y1Holder, z1);
}
@@ -1258,6 +1322,8 @@
StructWithSubstitutionGroup ret;
if (testDocLiteral) {
ret = docClient.testStructWithSubstitutionGroup(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithSubstitutionGroup(x, y, z);
} else {
ret = rpcClient.testStructWithSubstitutionGroup(x, y, z);
}
@@ -1307,6 +1373,8 @@
StructWithSubstitutionGroupAbstract ret;
if (testDocLiteral) {
ret = docClient.testStructWithSubstitutionGroupAbstract(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithSubstitutionGroupAbstract(x, y, z);
} else {
ret = rpcClient.testStructWithSubstitutionGroupAbstract(x, y, z);
}
@@ -1347,6 +1415,8 @@
StructWithSubstitutionGroupNil ret;
if (testDocLiteral) {
ret = docClient.testStructWithSubstitutionGroupNil(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithSubstitutionGroupNil(x, y, z);
} else {
ret = rpcClient.testStructWithSubstitutionGroupNil(x, y, z);
}
@@ -1436,6 +1506,8 @@
StructWithMultipleSubstitutionGroups ret;
if (testDocLiteral) {
ret = docClient.testStructWithMultipleSubstitutionGroups(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithMultipleSubstitutionGroups(x, y, z);
} else {
ret = rpcClient.testStructWithMultipleSubstitutionGroups(x, y, z);
}
@@ -1489,6 +1561,8 @@
ChoiceWithSubstitutionGroupAbstract ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithSubstitutionGroupAbstract(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithSubstitutionGroupAbstract(x, y, z);
} else {
ret = rpcClient.testChoiceWithSubstitutionGroupAbstract(x, y, z);
}
@@ -1555,6 +1629,8 @@
ChoiceWithSubstitutionGroupNil ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithSubstitutionGroupNil(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithSubstitutionGroupNil(x, y, z);
} else {
ret = rpcClient.testChoiceWithSubstitutionGroupNil(x, y, z);
}
@@ -1645,6 +1721,8 @@
ChoiceWithSubstitutionGroup ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithSubstitutionGroup(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithSubstitutionGroup(x, y, z);
} else {
ret = rpcClient.testChoiceWithSubstitutionGroup(x, y, z);
}
@@ -1698,6 +1776,8 @@
RecElType ret;
if (testDocLiteral) {
ret = docClient.testRecElType(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecElType(x, yh, zh);
} else {
ret = rpcClient.testRecElType(x, yh, zh);
}
@@ -1849,6 +1929,8 @@
RecOuterType ret;
if (testDocLiteral) {
ret = docClient.testRecOuterType(otx, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecOuterType(otx, yh, zh);
} else {
ret = rpcClient.testRecOuterType(otx, yh, zh);
}
@@ -1884,6 +1966,8 @@
SimpleContent1 ret;
if (testDocLiteral) {
ret = docClient.testSimpleContent1(x1, y1Holder, z1);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleContent1(x1, y1Holder, z1);
} else {
ret = rpcClient.testSimpleContent1(x1, y1Holder, z1);
}
@@ -1920,6 +2004,8 @@
SimpleContent2 ret;
if (testDocLiteral) {
ret = docClient.testSimpleContent2(x2, y2Holder, z2);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleContent2(x2, y2Holder, z2);
} else {
ret = rpcClient.testSimpleContent2(x2, y2Holder, z2);
}
@@ -1960,6 +2046,8 @@
SimpleContent3 ret;
if (testDocLiteral) {
ret = docClient.testSimpleContent3(x3, y3Holder, z3);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleContent3(x3, y3Holder, z3);
} else {
ret = rpcClient.testSimpleContent3(x3, y3Holder, z3);
}
@@ -1987,6 +2075,8 @@
UnionSimpleContent ret;
if (testDocLiteral) {
ret = docClient.testUnionSimpleContent(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testUnionSimpleContent(x, y, z);
} else {
ret = rpcClient.testUnionSimpleContent(x, y, z);
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java?view=diff&rev=462701&r1=462700&r2=462701
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java Tue Oct 10 22:36:24 2006
@@ -110,6 +110,8 @@
ChoiceOfChoice ret;
if (testDocLiteral) {
ret = docClient.testChoiceOfChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceOfChoice(x, y, z);
} else {
ret = rpcClient.testChoiceOfChoice(x, y, z);
}
@@ -151,6 +153,8 @@
ChoiceOfSeq ret;
if (testDocLiteral) {
ret = docClient.testChoiceOfSeq(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceOfSeq(x, y, z);
} else {
ret = rpcClient.testChoiceOfSeq(x, y, z);
}
@@ -201,6 +205,8 @@
DerivedStructBaseStruct ret;
if (testDocLiteral) {
ret = docClient.testDerivedStructBaseStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedStructBaseStruct(x, y, z);
} else {
ret = rpcClient.testDerivedStructBaseStruct(x, y, z);
}
@@ -242,6 +248,8 @@
DerivedStructBaseChoice ret;
if (testDocLiteral) {
ret = docClient.testDerivedStructBaseChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedStructBaseChoice(x, y, z);
} else {
ret = rpcClient.testDerivedStructBaseChoice(x, y, z);
}
@@ -291,6 +299,8 @@
DerivedChoiceBaseStruct ret;
if (testDocLiteral) {
ret = docClient.testDerivedChoiceBaseStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedChoiceBaseStruct(x, y, z);
} else {
ret = rpcClient.testDerivedChoiceBaseStruct(x, y, z);
}
@@ -336,6 +346,8 @@
DerivedChoiceBaseArray ret;
if (testDocLiteral) {
ret = docClient.testDerivedChoiceBaseArray(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedChoiceBaseArray(x, y, z);
} else {
ret = rpcClient.testDerivedChoiceBaseArray(x, y, z);
}
@@ -382,6 +394,8 @@
DerivedChoiceBaseChoice ret;
if (testDocLiteral) {
ret = docClient.testDerivedChoiceBaseChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedChoiceBaseChoice(x, y, z);
} else {
ret = rpcClient.testDerivedChoiceBaseChoice(x, y, z);
}
@@ -419,6 +433,8 @@
DerivedNoContent ret;
if (testDocLiteral) {
ret = docClient.testDerivedNoContent(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedNoContent(x, y, z);
} else {
ret = rpcClient.testDerivedNoContent(x, y, z);
}
@@ -457,6 +473,8 @@
DerivedStructBaseEmpty ret;
if (testDocLiteral) {
ret = docClient.testDerivedStructBaseEmpty(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedStructBaseEmpty(x, y, z);
} else {
ret = rpcClient.testDerivedStructBaseEmpty(x, y, z);
}
@@ -479,6 +497,8 @@
DerivedEmptyBaseEmptyAll ret;
if (testDocLiteral) {
ret = docClient.testDerivedEmptyBaseEmptyAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedEmptyBaseEmptyAll(x, y, z);
} else {
ret = rpcClient.testDerivedEmptyBaseEmptyAll(x, y, z);
}
@@ -498,6 +518,8 @@
DerivedEmptyBaseEmptyChoice ret;
if (testDocLiteral) {
ret = docClient.testDerivedEmptyBaseEmptyChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testDerivedEmptyBaseEmptyChoice(x, y, z);
} else {
ret = rpcClient.testDerivedEmptyBaseEmptyChoice(x, y, z);
}
@@ -531,6 +553,8 @@
RestrictedChoiceBaseChoice ret;
if (testDocLiteral) {
ret = docClient.testRestrictedChoiceBaseChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRestrictedChoiceBaseChoice(x, y, z);
} else {
ret = rpcClient.testRestrictedChoiceBaseChoice(x, y, z);
}
@@ -565,6 +589,8 @@
ComplexTypeWithAttributeGroup ret;
if (testDocLiteral) {
ret = docClient.testComplexTypeWithAttributeGroup(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testComplexTypeWithAttributeGroup(x, y, z);
} else {
ret = rpcClient.testComplexTypeWithAttributeGroup(x, y, z);
}
@@ -601,6 +627,8 @@
ComplexTypeWithAttributeGroup1 ret;
if (testDocLiteral) {
ret = docClient.testComplexTypeWithAttributeGroup1(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testComplexTypeWithAttributeGroup1(x, y, z);
} else {
ret = rpcClient.testComplexTypeWithAttributeGroup1(x, y, z);
}
@@ -645,6 +673,8 @@
SequenceWithGroupSeq ret;
if (testDocLiteral) {
ret = docClient.testSequenceWithGroupSeq(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSequenceWithGroupSeq(x, y, z);
} else {
ret = rpcClient.testSequenceWithGroupSeq(x, y, z);
}
@@ -705,6 +735,8 @@
SequenceWithGroupChoice ret;
if (testDocLiteral) {
ret = docClient.testSequenceWithGroupChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSequenceWithGroupChoice(x, y, z);
} else {
ret = rpcClient.testSequenceWithGroupChoice(x, y, z);
}
@@ -759,6 +791,8 @@
SequenceWithGroups ret;
if (testDocLiteral) {
ret = docClient.testSequenceWithGroups(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSequenceWithGroups(x, y, z);
} else {
ret = rpcClient.testSequenceWithGroups(x, y, z);
}
@@ -794,6 +828,8 @@
SequenceWithOccuringGroup ret;
if (testDocLiteral) {
ret = docClient.testSequenceWithOccuringGroup(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSequenceWithOccuringGroup(x, y, z);
} else {
ret = rpcClient.testSequenceWithOccuringGroup(x, y, z);
}
@@ -833,6 +869,8 @@
GroupDirectlyInComplexType ret;
if (testDocLiteral) {
ret = docClient.testGroupDirectlyInComplexType(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testGroupDirectlyInComplexType(x, y, z);
} else {
ret = rpcClient.testGroupDirectlyInComplexType(x, y, z);
}
@@ -865,6 +903,8 @@
ComplexTypeWithAttributes ret;
if (testDocLiteral) {
ret = docClient.testComplexTypeWithAttributes(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testComplexTypeWithAttributes(x, y, z);
} else {
ret = rpcClient.testComplexTypeWithAttributes(x, y, z);
}
@@ -941,6 +981,8 @@
StructWithAny ret;
if (testDocLiteral) {
ret = docClient.testStructWithAny(swa, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithAny(swa, y, z);
} else {
ret = rpcClient.testStructWithAny(swa, y, z);
}
@@ -984,6 +1026,8 @@
StructWithAny ret;
if (testDocLiteral) {
ret = docClient.testStructWithAny(swa, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithAny(swa, y, z);
} else {
ret = rpcClient.testStructWithAny(swa, y, z);
}
@@ -1021,6 +1065,8 @@
try {
if (testDocLiteral) {
docClient.testStructWithAny(swa, y, z);
+ } else if (testXMLBinding) {
+ xmlClient.testStructWithAny(swa, y, z);
} else {
rpcClient.testStructWithAny(swa, y, z);
}
@@ -1072,6 +1118,8 @@
StructWithAnyArray ret;
if (testDocLiteral) {
ret = docClient.testStructWithAnyArray(swa, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithAnyArray(swa, y, z);
} else {
ret = rpcClient.testStructWithAnyArray(swa, y, z);
}
@@ -1109,6 +1157,8 @@
try {
if (testDocLiteral) {
docClient.testStructWithAnyArray(swa, y, z);
+ } else if (testXMLBinding) {
+ xmlClient.testStructWithAnyArray(swa, y, z);
} else {
rpcClient.testStructWithAnyArray(swa, y, z);
}
@@ -1147,6 +1197,8 @@
//IDTypeAttribute ret;
if (testDocLiteral) {
/*ret =*/ docClient.testIDTypeAttribute(x, y, z);
+ } else if (testXMLBinding) {
+ /*ret =*/ xmlClient.testIDTypeAttribute(x, y, z);
} else {
/*ret =*/ rpcClient.testIDTypeAttribute(x, y, z);
}
@@ -1187,6 +1239,8 @@
MultipleOccursSequenceInSequence ret;
if (testDocLiteral) {
ret = docClient.testMultipleOccursSequenceInSequence(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testMultipleOccursSequenceInSequence(x, y, z);
} else {
ret = rpcClient.testMultipleOccursSequenceInSequence(x, y, z);
}
@@ -1222,6 +1276,8 @@
StructWithBinary ret;
if (testDocLiteral) {
ret = docClient.testStructWithBinary(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithBinary(x, y, z);
} else {
ret = rpcClient.testStructWithBinary(x, y, z);
}
@@ -1259,6 +1315,8 @@
ChoiceWithBinary ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithBinary(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithBinary(x, y, z);
} else {
ret = rpcClient.testChoiceWithBinary(x, y, z);
}
@@ -1309,6 +1367,8 @@
ChoiceWithGroupChoice ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithGroupChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithGroupChoice(x, y, z);
} else {
ret = rpcClient.testChoiceWithGroupChoice(x, y, z);
}
@@ -1365,6 +1425,8 @@
ChoiceWithGroupSeq ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithGroupSeq(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithGroupSeq(x, y, z);
} else {
ret = rpcClient.testChoiceWithGroupSeq(x, y, z);
}
@@ -1418,6 +1480,8 @@
ChoiceWithGroups ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithGroups(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithGroups(x, y, z);
} else {
ret = rpcClient.testChoiceWithGroups(x, y, z);
}
@@ -1451,6 +1515,8 @@
ExtBase64Binary ret;
if (testDocLiteral) {
ret = docClient.testExtBase64Binary(x1, y1Holder, z1);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testExtBase64Binary(x1, y1Holder, z1);
} else {
ret = rpcClient.testExtBase64Binary(x1, y1Holder, z1);
}
@@ -1537,6 +1603,8 @@
StructWithAnyAttribute ret;
if (testDocLiteral) {
ret = docClient.testStructWithAnyAttribute(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithAnyAttribute(x, yh, zh);
} else {
ret = rpcClient.testStructWithAnyAttribute(x, yh, zh);
}
@@ -1611,6 +1679,8 @@
ChoiceWithAnyAttribute ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithAnyAttribute(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testChoiceWithAnyAttribute(x, yh, zh);
} else {
ret = rpcClient.testChoiceWithAnyAttribute(x, yh, zh);
}
@@ -1691,6 +1761,8 @@
OccuringStruct ret;
if (testDocLiteral) {
ret = docClient.testOccuringStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringStruct(x, y, z);
} else {
ret = rpcClient.testOccuringStruct(x, y, z);
}
@@ -1730,6 +1802,8 @@
OccuringStruct1 ret;
if (testDocLiteral) {
ret = docClient.testOccuringStruct1(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringStruct1(x, y, z);
} else {
ret = rpcClient.testOccuringStruct1(x, y, z);
}
@@ -1800,6 +1874,8 @@
OccuringStruct2 ret;
if (testDocLiteral) {
ret = docClient.testOccuringStruct2(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringStruct2(x, y, z);
} else {
ret = rpcClient.testOccuringStruct2(x, y, z);
}
@@ -1846,6 +1922,8 @@
OccuringChoice ret;
if (testDocLiteral) {
ret = docClient.testOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoice(x, y, z);
} else {
ret = rpcClient.testOccuringChoice(x, y, z);
}
@@ -1866,6 +1944,8 @@
if (testDocLiteral) {
ret = docClient.testOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoice(x, y, z);
} else {
ret = rpcClient.testOccuringChoice(x, y, z);
}
@@ -1923,6 +2003,8 @@
OccuringChoice1 ret;
if (testDocLiteral) {
ret = docClient.testOccuringChoice1(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoice1(x, y, z);
} else {
ret = rpcClient.testOccuringChoice1(x, y, z);
}
@@ -1958,6 +2040,8 @@
OccuringChoice2 ret;
if (testDocLiteral) {
ret = docClient.testOccuringChoice2(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoice2(x, y, z);
} else {
ret = rpcClient.testOccuringChoice2(x, y, z);
}
@@ -1978,6 +2062,8 @@
z = new Holder<OccuringChoice2>();
if (testDocLiteral) {
ret = docClient.testOccuringChoice2(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoice2(x, y, z);
} else {
ret = rpcClient.testOccuringChoice2(x, y, z);
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java?view=diff&rev=462701&r1=462700&r2=462701
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java Tue Oct 10 22:36:24 2006
@@ -113,6 +113,8 @@
SimpleContentExtWithAnyAttribute ret;
if (testDocLiteral) {
ret = docClient.testSimpleContentExtWithAnyAttribute(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testSimpleContentExtWithAnyAttribute(x, yh, zh);
} else {
ret = rpcClient.testSimpleContentExtWithAnyAttribute(x, yh, zh);
}
@@ -148,6 +150,8 @@
OccuringAll ret;
if (testDocLiteral) {
ret = docClient.testOccuringAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringAll(x, y, z);
} else {
ret = rpcClient.testOccuringAll(x, y, z);
}
@@ -232,6 +236,8 @@
OccuringStructWithAnyAttribute ret;
if (testDocLiteral) {
ret = docClient.testOccuringStructWithAnyAttribute(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringStructWithAnyAttribute(x, yh, zh);
} else {
ret = rpcClient.testOccuringStructWithAnyAttribute(x, yh, zh);
}
@@ -295,6 +301,8 @@
OccuringChoiceWithAnyAttribute ret;
if (testDocLiteral) {
ret = docClient.testOccuringChoiceWithAnyAttribute(x, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testOccuringChoiceWithAnyAttribute(x, yh, zh);
} else {
ret = rpcClient.testOccuringChoiceWithAnyAttribute(x, yh, zh);
}
@@ -351,6 +359,8 @@
MRecSeqA ret;
if (testDocLiteral) {
ret = docClient.testMRecSeqA(xA, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testMRecSeqA(xA, yh, zh);
} else {
ret = rpcClient.testMRecSeqA(xA, yh, zh);
}
@@ -417,6 +427,8 @@
MRecSeqC ret;
if (testDocLiteral) {
ret = docClient.testMRecSeqC(xC, yh, zh);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testMRecSeqC(xC, yh, zh);
} else {
ret = rpcClient.testMRecSeqC(xC, yh, zh);
}
@@ -467,6 +479,8 @@
StructWithNillableChoice ret;
if (testDocLiteral) {
ret = docClient.testStructWithNillableChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillableChoice(x, y, z);
} else {
ret = rpcClient.testStructWithNillableChoice(x, y, z);
}
@@ -493,6 +507,8 @@
z = new Holder<StructWithNillableChoice>();
if (testDocLiteral) {
ret = docClient.testStructWithNillableChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillableChoice(x, y, z);
} else {
ret = rpcClient.testStructWithNillableChoice(x, y, z);
}
@@ -569,6 +585,8 @@
StructWithOccuringChoice ret;
if (testDocLiteral) {
ret = docClient.testStructWithOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringChoice(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringChoice(x, y, z);
}
@@ -595,6 +613,8 @@
z = new Holder<StructWithOccuringChoice>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringChoice(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringChoice(x, y, z);
}
@@ -618,6 +638,8 @@
z = new Holder<StructWithOccuringChoice>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringChoice(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringChoice(x, y, z);
}
@@ -642,6 +664,8 @@
z = new Holder<StructWithOccuringChoice>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringChoice(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringChoice(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringChoice(x, y, z);
}
@@ -706,6 +730,8 @@
StructWithNillableStruct ret;
if (testDocLiteral) {
ret = docClient.testStructWithNillableStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillableStruct(x, y, z);
} else {
ret = rpcClient.testStructWithNillableStruct(x, y, z);
}
@@ -733,6 +759,8 @@
z = new Holder<StructWithNillableStruct>();
if (testDocLiteral) {
ret = docClient.testStructWithNillableStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillableStruct(x, y, z);
} else {
ret = rpcClient.testStructWithNillableStruct(x, y, z);
}
@@ -758,6 +786,8 @@
z = new Holder<StructWithNillableStruct>();
if (testDocLiteral) {
ret = docClient.testStructWithNillableStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithNillableStruct(x, y, z);
} else {
ret = rpcClient.testStructWithNillableStruct(x, y, z);
}
@@ -811,6 +841,7 @@
return x.getVarIntAndVarFloat() != null;
}
+
public void testStructWithOccuringStruct() throws Exception {
// Test 1
//
@@ -832,6 +863,8 @@
StructWithOccuringStruct ret;
if (testDocLiteral) {
ret = docClient.testStructWithOccuringStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringStruct(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringStruct(x, y, z);
}
@@ -859,6 +892,8 @@
z = new Holder<StructWithOccuringStruct>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringStruct(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringStruct(x, y, z);
}
@@ -871,6 +906,23 @@
equals(x, ret));
}
+ }
+
+ public void testStructWithOccuringStruct2() throws Exception {
+ StructWithOccuringStruct x = new StructWithOccuringStruct();
+ x.setVarInteger(100);
+ x.getVarIntAndVarFloat().add(101);
+ x.getVarIntAndVarFloat().add(101.5f);
+ x.getVarIntAndVarFloat().add(102);
+ x.getVarIntAndVarFloat().add(102.5f);
+
+ StructWithOccuringStruct yOriginal = new StructWithOccuringStruct();
+ yOriginal.setVarInteger(200);
+
+ Holder<StructWithOccuringStruct> y = new Holder<StructWithOccuringStruct>(yOriginal);
+ Holder<StructWithOccuringStruct> z = new Holder<StructWithOccuringStruct>();
+ StructWithOccuringStruct ret;
+
// Test 3
//
// x: sequence occurs once
@@ -882,6 +934,8 @@
z = new Holder<StructWithOccuringStruct>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringStruct(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringStruct(x, y, z);
}
@@ -906,6 +960,8 @@
z = new Holder<StructWithOccuringStruct>();
if (testDocLiteral) {
ret = docClient.testStructWithOccuringStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testStructWithOccuringStruct(x, y, z);
} else {
ret = rpcClient.testStructWithOccuringStruct(x, y, z);
}
@@ -922,8 +978,8 @@
assertTrue("testStructWithOccuringStruct(): Incorrect return form",
isNormalized(ret));
}
- }
+ }
//org.apache.type_test.types1.AnonymousType;
protected boolean equals(AnonymousType x, AnonymousType y) {
@@ -950,6 +1006,8 @@
AnonymousType ret;
if (testDocLiteral) {
ret = docClient.testAnonymousType(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testAnonymousType(x, y, z);
} else {
ret = rpcClient.testAnonymousType(x, y, z);
}
@@ -1009,6 +1067,8 @@
RecSeqB6918 ret;
if (testDocLiteral) {
ret = docClient.testRecSeqB6918(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRecSeqB6918(x, y, z);
} else {
ret = rpcClient.testRecSeqB6918(x, y, z);
}
@@ -1578,6 +1638,8 @@
RestrictedStructBaseStruct ret;
if (testDocLiteral) {
ret = docClient.testRestrictedStructBaseStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRestrictedStructBaseStruct(x, y, z);
} else {
ret = rpcClient.testRestrictedStructBaseStruct(x, y, z);
}
@@ -1614,6 +1676,8 @@
RestrictedAllBaseAll ret;
if (testDocLiteral) {
ret = docClient.testRestrictedAllBaseAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testRestrictedAllBaseAll(x, y, z);
} else {
ret = rpcClient.testRestrictedAllBaseAll(x, y, z);
}
@@ -1629,14 +1693,15 @@
//org.apache.type_test.types1.UnionWithStringList;
public void testUnionWithStringList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("5");
List<String> yOrig = Arrays.asList("I", "am", "SimpleList");
// Invoke testUnionWithStringList
Holder<List<String>> y = new Holder<List<String>>(yOrig);
Holder<List<String>> z = new Holder<List<String>>();
- List<String> ret = docClient.testUnionWithStringList(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testUnionWithStringList(x, y, z)
+ : xmlClient.testUnionWithStringList(x, y, z);
if (!perfTestOnly) {
assertEquals("testUnionWithStringList(): Incorrect value for inout param",
x, y.value);
@@ -1666,14 +1731,15 @@
//org.apache.type_test.types1.UnionWithStringListRestriction;
public void testUnionWithStringListRestriction() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("5");
List<String> yOrig = Arrays.asList("I", "am", "SimpleList");
// Invoke testUnionWithStringListRestriction
Holder<List<String>> y = new Holder<List<String>>(yOrig);
Holder<List<String>> z = new Holder<List<String>>();
- List<String> ret = docClient.testUnionWithStringListRestriction(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testUnionWithStringListRestriction(x, y, z)
+ : xmlClient.testUnionWithStringListRestriction(x, y, z);
if (!perfTestOnly) {
assertEquals("testUnionWithStringListRestriction(): Incorrect value for inout param",
x, y.value);
@@ -1703,14 +1769,15 @@
//org.apache.type_test.types1.UnionWithAnonList;
public void testUnionWithAnonList() throws Exception {
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("5");
List<String> yOrig = Arrays.asList("0.5f", "1.5f", "2.5f");
// Invoke testUnionWithAnonList
Holder<List<String>> y = new Holder<List<String>>(yOrig);
Holder<List<String>> z = new Holder<List<String>>();
- List<String> ret = docClient.testUnionWithAnonList(x, y, z);
+ List<String> ret = testDocLiteral ? docClient.testUnionWithAnonList(x, y, z)
+ : xmlClient.testUnionWithAnonList(x, y, z);
if (!perfTestOnly) {
assertEquals("testUnionWithAnonList(): Incorrect value for inout param", x, y.value);
assertEquals("testUnionWithAnonList(): Incorrect value for out param", yOrig, z.value);
@@ -1745,6 +1812,8 @@
String ret;
if (testDocLiteral) {
ret = docClient.testAnyURIRestriction(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testAnyURIRestriction(x, y, z);
} else {
ret = rpcClient.testAnyURIRestriction(x, y, z);
}
@@ -1754,13 +1823,14 @@
assertEquals("testString(): Incorrect return value", x, ret);
}
- if (testDocLiteral) {
+ if (testDocLiteral || testXMLBinding) {
// abnormal case
yOrig = new String("http://www.iona.com/info/services/oss/info_services_oss_train.html");
y = new Holder<String>(yOrig);
z = new Holder<String>();
try {
- ret = docClient.testAnyURIRestriction(x, y, z);
+ ret = testDocLiteral ? docClient.testAnyURIRestriction(x, y, z)
+ : xmlClient.testAnyURIRestriction(x, y, z);
//fail("maxLength=50 restriction is violated.");
} catch (Exception ex) {
//ex.printStackTrace();
@@ -1815,6 +1885,8 @@
NestedStruct ret;
if (testDocLiteral) {
ret = docClient.testNestedStruct(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testNestedStruct(x, y, z);
} else {
ret = rpcClient.testNestedStruct(x, y, z);
}
@@ -1857,8 +1929,9 @@
Holder<SimpleStruct> z = new Holder<SimpleStruct>();
SimpleStruct ret;
- if (testDocLiteral) {
- ret = docClient.testSimpleStruct(x, y, z);
+ if (testDocLiteral || testXMLBinding) {
+ ret = testDocLiteral ? docClient.testSimpleStruct(x, y, z)
+ : xmlClient.testSimpleStruct(x, y, z);
// XXX - rpc-literal returns an object of type SimpleStruct,
// doc-literal returns an object of type
// DerivedStructBaseStruct
@@ -1909,8 +1982,9 @@
Holder<SimpleChoice> z = new Holder<SimpleChoice>();
SimpleChoice ret;
- if (testDocLiteral) {
- ret = docClient.testSimpleChoice(x, y, z);
+ if (testDocLiteral || testXMLBinding) {
+ ret = testDocLiteral ? docClient.testSimpleChoice(x, y, z)
+ : xmlClient.testSimpleChoice(x, y, z);
// XXX - rpc-literal returns an object of type SimpleChoice,
// doc-literal returns an object of type
// DerivedStructBaseChoice
@@ -1954,8 +2028,9 @@
Holder<UnboundedArray> y = new Holder<UnboundedArray>(yOrig);
Holder<UnboundedArray> z = new Holder<UnboundedArray>();
UnboundedArray ret;
- if (testDocLiteral) {
- ret = docClient.testUnboundedArray(x, y, z);
+ if (testDocLiteral || testXMLBinding) {
+ ret = testDocLiteral ? docClient.testUnboundedArray(x, y, z)
+ : xmlClient.testUnboundedArray(x, y, z);
if (!perfTestOnly) {
assertTrue("testInheritanceUnboundedArrayDerivedChoice(): Incorrect value for inout param",
equals(x, (DerivedChoiceBaseArray)y.value));
@@ -1986,6 +2061,8 @@
EmptyAll ret;
if (testDocLiteral) {
ret = docClient.testEmptyAll(x, y, z);
+ } else if (testXMLBinding) {
+ ret = xmlClient.testEmptyAll(x, y, z);
} else {
ret = rpcClient.testEmptyAll(x, y, z);
}