You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2004/08/12 01:57:52 UTC
cvs commit: ws-jaxme/src/test/jaxb/jira jaxme-20.xsd
jochen 2004/08/11 16:57:52
Modified: src/xs/org/apache/ws/jaxme/xs/impl Tag: Branch_R0_3
XSUnionTypeRestrictionImpl.java
XSListTypeRestrictionImpl.java
src/xs/org/apache/ws/jaxme/xs/junit Tag: Branch_R0_3
ParserTest.java
Added: src/test/jaxb/jira Tag: Branch_R0_3 jaxme-20.xsd
Log:
Restrictions of simple list types didn't have the isList() property set. Likewise for union types.
PR: JAXME-20
Revision Changes Path
No revision
No revision
1.2.2.1 +6 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSUnionTypeRestrictionImpl.java
Index: XSUnionTypeRestrictionImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSUnionTypeRestrictionImpl.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- XSUnionTypeRestrictionImpl.java 16 Feb 2004 23:39:43 -0000 1.2
+++ XSUnionTypeRestrictionImpl.java 11 Aug 2004 23:57:51 -0000 1.2.2.1
@@ -16,6 +16,7 @@
*/
package org.apache.ws.jaxme.xs.impl;
+import org.apache.ws.jaxme.xs.XSAtomicType;
import org.apache.ws.jaxme.xs.XSType;
import org.apache.ws.jaxme.xs.XSUnionType;
import org.apache.ws.jaxme.xs.xml.XsGSimpleRestrictionModel;
@@ -32,6 +33,11 @@
unionBaseType = pRestrictedType.getSimpleType().getUnionType();
}
+ public boolean isUnion() { return true; }
+
+ public XSUnionType getUnionType() {
+ return this;
+ }
public XSType[] getMemberTypes() {
return unionBaseType.getMemberTypes();
1.2.2.1 +7 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSListTypeRestrictionImpl.java
Index: XSListTypeRestrictionImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSListTypeRestrictionImpl.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- XSListTypeRestrictionImpl.java 16 Feb 2004 23:39:43 -0000 1.2
+++ XSListTypeRestrictionImpl.java 11 Aug 2004 23:57:51 -0000 1.2.2.1
@@ -16,6 +16,7 @@
*/
package org.apache.ws.jaxme.xs.impl;
+import org.apache.ws.jaxme.xs.XSAtomicType;
import org.apache.ws.jaxme.xs.XSListType;
import org.apache.ws.jaxme.xs.XSType;
import org.apache.ws.jaxme.xs.xml.XsELength;
@@ -35,6 +36,12 @@
throws SAXException {
super(pParent, pRestrictedType, pRestriction);
listBaseType = pRestrictedType.getSimpleType().getListType();
+ }
+
+ public boolean isList() { return true; }
+
+ public XSListType getListType() {
+ return this;
}
public XSType getItemType() {
No revision
No revision
1.14.2.1 +42 -1 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java
Index: ParserTest.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- ParserTest.java 9 Jun 2004 11:44:20 -0000 1.14
+++ ParserTest.java 11 Aug 2004 23:57:51 -0000 1.14.2.1
@@ -1055,4 +1055,45 @@
JAXBParser jaxbParser = newJAXBParser();
testDocumentationChilds(jaxbParser);
}
+
+ private void testSimpleTypeRestriction2(XSParser pParser) throws Exception {
+ final String schemaSource =
+ "<schema xmlns='http://www.w3.org/2001/XMLSchema'\n" +
+ " targetNamespace='http://asi.sbc.com/cpsosasos/trouble/data'\n" +
+ " xmlns:s='http://asi.sbc.com/cpsosasos/trouble/data'>\n" +
+ " <element name='foo'>\n" +
+ " <complexType>\n" +
+ " <attribute name='bar' type='s:ServiceIDType'/>\n" +
+ " </complexType>\n" +
+ " </element>\n" +
+ " <simpleType name='ServiceIDType'>\n" +
+ " <restriction base='s:NameTypeType'/>\n" +
+ " </simpleType>\n" +
+ " <simpleType name='NameTypeType'>\n" +
+ " <union memberTypes='integer string'/>\n" +
+ " </simpleType>\n" +
+ "</schema>\n";
+
+ InputSource isource = new InputSource(new StringReader(schemaSource));
+ isource.setSystemId("testSimpleTypeRestriction2.xsd");
+ XSSchema schema = pParser.parse(isource);
+ XSType[] types = schema.getTypes();
+ assertEquals(2, types.length);
+ assertEquals(new XsQName("http://asi.sbc.com/cpsosasos/trouble/data", "NameTypeType"),
+ types[1].getName());
+ XSSimpleType nameTypeType = assertSimpleType(types[1]);
+ assertUnionType(nameTypeType);
+ assertEquals(new XsQName("http://asi.sbc.com/cpsosasos/trouble/data", "ServiceIDType"),
+ types[0].getName());
+ XSSimpleType serviceIDType = assertSimpleType(types[0]);
+ assertUnionType(serviceIDType);
+ assertTrue(serviceIDType.isRestriction());
+ }
+
+ /** <p>Tests restrictions of simple types.</p>
+ */
+ public void testSimpleTypeRestriction2() throws Exception {
+ testSimpleTypeRestriction2(newXSParser());
+ testSimpleTypeRestriction2(newJAXBParser());
+ }
}
No revision
No revision
1.1.2.1 +20 -0 ws-jaxme/src/test/jaxb/jira/Attic/jaxme-20.xsd
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org