Repository: cxf Updated Branches: refs/heads/master dc5bde7d9 -> 939b54221
xsd:ID is only supposed to be used as Attributes, not as element types as per: http://www.w3.org/TR/xmlschema11-2/#ID so don't test this. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/939b5422 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/939b5422 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/939b5422 Branch: refs/heads/master Commit: 939b54221d6e787acae16b21ec977e3a5cbd00dc Parents: 3b3d0fd Author: Daniel Kulp <[email protected]> Authored: Thu Mar 27 02:25:35 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Thu Mar 27 09:07:49 2014 -0400 ---------------------------------------------------------------------- .../type_test/AbstractTypeTestClient.java | 31 -------------------- .../main/resources/wsdl/type_test/type_test.xsd | 2 +- .../wsdl/type_test/type_test_impl_java.xsl | 9 ------ 3 files changed, 1 insertion(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/939b5422/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java index 7dfa642..baa043a 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java @@ -1119,37 +1119,6 @@ public abstract class AbstractTypeTestClient } @Test - public void testID() throws Exception { - if (!shouldRunTest("ID")) { - return; - } - // n.b. to be valid, elements with an ID in the response message - // must have a unique ID, so this test does not return x as the - // return value (like the other tests). - String valueSets[][] = {{"root.id-testartix.2", "L.-type_test"}, {"_iona.com", "zoo-5_wolf"}, - {"x-_liberty", "_-.-_"}}; - - for (int i = 0; i < valueSets.length; i++) { - String x = valueSets[i][0]; - String yOrig = valueSets[i][1]; - Holder<String> y = new Holder<String>(yOrig); - Holder<String> z = new Holder<String>(); - - 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); - } - if (!perfTestOnly) { - assertEquals("testID(): Incorrect value for inout param", x, y.value); - assertEquals("testID(): Incorrect value for out param", yOrig, z.value); - } - } - } - - @Test public void testDecimal() throws Exception { if (!shouldRunTest("Decimal")) { return; http://git-wip-us.apache.org/repos/asf/cxf/blob/939b5422/testutils/src/main/resources/wsdl/type_test/type_test.xsd ---------------------------------------------------------------------- diff --git a/testutils/src/main/resources/wsdl/type_test/type_test.xsd b/testutils/src/main/resources/wsdl/type_test/type_test.xsd index bd7b555..6fa0bc3 100644 --- a/testutils/src/main/resources/wsdl/type_test/type_test.xsd +++ b/testutils/src/main/resources/wsdl/type_test/type_test.xsd @@ -91,7 +91,7 @@ <itst:builtIn name="NMTOKENS" javaType="java.util.List<java.lang.String>" javaHolder="java.util.List<java.lang.String>"/> <itst:builtIn name="Name" javaType="java.lang.String" javaHolder="java.lang.String"/> <itst:builtIn name="NCName" javaType="java.lang.String" javaHolder="java.lang.String"/> - <itst:builtIn name="ID" javaType="java.lang.String" javaHolder="java.lang.String"/> + <!-- itst:builtIn name="ID" javaType="java.lang.String" javaHolder="java.lang.String"/--> <itst:builtIn name="base64Binary" javaType="byte[]" javaHolder="byte[]"/> <itst:builtIn name="hexBinary" javaType="byte[]" javaHolder="byte[]"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/939b5422/testutils/src/main/resources/wsdl/type_test/type_test_impl_java.xsl ---------------------------------------------------------------------- diff --git a/testutils/src/main/resources/wsdl/type_test/type_test_impl_java.xsl b/testutils/src/main/resources/wsdl/type_test/type_test_impl_java.xsl index 626b88f..c12c399 100644 --- a/testutils/src/main/resources/wsdl/type_test/type_test_impl_java.xsl +++ b/testutils/src/main/resources/wsdl/type_test/type_test_impl_java.xsl @@ -269,15 +269,6 @@ public class TypeTestImpl { return x; } - public java.lang.String testID( - java.lang.String x, - Holder<java.lang.String> y, - Holder<java.lang.String> z) { - z.value = y.value; - y.value = x; - return x + y.value; - } - public IDTypeAttribute testIDTypeAttribute( IDTypeAttribute x, Holder<IDTypeAttribute> y,
