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/27 22:49:31 UTC
cvs commit: ws-jaxme/src/test/jaxb recursion.xsd
jochen 2004/08/27 13:49:31
Modified: src/jaxme/org/apache/ws/jaxme/junit RecursionTest.java
src/xs/org/apache/ws/jaxme/xs/junit ParserTest.java
src/test/jaxb recursion.xsd
Log:
Implemented recursion for element references.
PR: JAXME-26
Revision Changes Path
1.3 +3 -0 ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/RecursionTest.java
Index: RecursionTest.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/RecursionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RecursionTest.java 27 Aug 2004 13:19:26 -0000 1.2
+++ RecursionTest.java 27 Aug 2004 20:49:30 -0000 1.3
@@ -96,6 +96,9 @@
" <rec:Attribute name=\"Sonny\" id=\"2\">\n" +
" <rec:AttributeList/>\n" +
" </rec:Attribute>\n" +
+ " <rec:Attribute name=\"Severine\" id=\"3\">\n" +
+ " <rec:AttributeList/>\n" +
+ " </rec:Attribute>\n" +
" </rec:AttributeList>\n" +
"</rec:Attribute>";
unmarshalMarshalUnmarshal(Attribute.class, xml);
1.18 +10 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParserTest.java 27 Aug 2004 01:02:42 -0000 1.17
+++ ParserTest.java 27 Aug 2004 20:49:30 -0000 1.18
@@ -1258,6 +1258,7 @@
" <complexType>\n" +
" <sequence>\n" +
" <element ref='rec:Attribute'/>\n" +
+ " <element ref='rec:Attribute' minOccurs='0' maxOccurs='unbounded'/>\n" +
" </sequence>\n" +
" </complexType>\n" +
" </element>\n" +
@@ -1276,8 +1277,15 @@
XSParticle particle = assertComplexContent(complexType);
XSGroup group = assertGroup(particle);
XSParticle[] particles = group.getParticles();
- assertEquals(1, particles.length);
+ assertEquals(2, particles.length);
+ assertEquals(1, particles[0].getMinOccurs());
+ assertEquals(1, particles[0].getMaxOccurs());
XSElement refElement = assertElement(particles[0]);
+ assertTrue(refElement.isGlobal());
+ assertEquals(refElement.getName(), elements[0].getName());
+ assertEquals(0, particles[1].getMinOccurs());
+ assertEquals(-1, particles[1].getMaxOccurs());
+ refElement = assertElement(particles[1]);
assertTrue(refElement.isGlobal());
assertEquals(refElement.getName(), elements[0].getName());
}
1.3 +2 -2 ws-jaxme/src/test/jaxb/recursion.xsd
Index: recursion.xsd
===================================================================
RCS file: /home/cvs/ws-jaxme/src/test/jaxb/recursion.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- recursion.xsd 27 Aug 2004 13:19:26 -0000 1.2
+++ recursion.xsd 27 Aug 2004 20:49:31 -0000 1.3
@@ -53,10 +53,10 @@
<element name="Attribute">
<complexType>
<sequence>
- <element name="AttributeList" minOccurs="0" maxOccurs="unbounded">
+ <element name="AttributeList">
<complexType>
<sequence>
- <element ref="rec:Attribute"/>
+ <element ref="rec:Attribute" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</complexType>
</element>
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org