svn commit: r374435 - in /webservices/commons/modules/XmlSchema: src/org/apache/ws/commons/schema/XmlSchemaType.java test/tests/TestLocalUnnamedSimpleType.java

[di...@apache.org]

Author: dims
Date: Thu Feb  2 08:52:46 2006
New Revision: 374435

URL: http://svn.apache.org/viewcvs?rev=374435&view=rev
Log:
Fix and test case for WSCOMMONS-2 - IllegalArgumentException because null is passed as the localPart arg to QName ctor

Added:
    webservices/commons/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java
Modified:
    webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaType.java

Modified: webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaType.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaType.java?rev=374435&r1=374434&r2=374435&view=diff
==============================================================================
--- webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaType.java (original)
+++ webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaType.java Thu Feb  2 08:52:46 2006
@@ -88,6 +88,9 @@
     }
 
     public QName getQName() {
+        if(name == null) {
+            return null;
+        }
         return new QName(schema.targetNamespace, name);
     }
 }

Added: webservices/commons/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java?rev=374435&view=auto
==============================================================================
--- webservices/commons/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java (added)
+++ webservices/commons/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java Thu Feb  2 08:52:46 2006
@@ -0,0 +1,38 @@
+package tests;
+
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+
+import javax.xml.transform.stream.StreamSource;
+import java.io.ByteArrayInputStream;
+
+/**
+ * TestElementForm
+ */
+public class TestLocalUnnamedSimpleType extends TestCase {
+    String schemaXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+             "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\"\n" +
+             "targetNamespace=\"http://finance.example.com/CreditCardFaults/xsd\"\n" +
+             "xmlns:tns=\"http://finance.example.com/CreditCardFaults/xsd\"\n" +
+             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+             "xsi:schemaLocation=\"http://www.w3.org/2001/XMLSchema\n" +
+             "              http://www.w3.org/2001/XMLSchema.xsd\">\n" +
+             "\n" +
+             "<element name=\"tns:CreditCardNumber\" type=\"string\"></element>\n" +
+             "\n" +
+             "<element name=\"tns:CreditCardType\">\n" +
+             "<simpleType>\n" +
+             "<restriction base=\"string\">\n" +
+             "<enumeration value=\"AMEX\" />\n" +
+             "<enumeration value=\"MASTERCARD\" />\n" +
+             "<enumeration value=\"VISA\" />\n" +
+             "</restriction>\n" +
+             "</simpleType>\n" +
+             "</element>\n" +
+             "</schema> ";
+
+    public void testLocalUnnamedSimpleType() throws Exception {
+        XmlSchemaCollection schema = new XmlSchemaCollection();
+        schema.read(new StreamSource(new ByteArrayInputStream(schemaXML.getBytes())), null);
+    }
+}