You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/09/01 19:27:12 UTC
cvs commit: xml-xmlbeans/v2/test/src/xmlcursor/detailed ToBookmarkTest.java
daveremy 2004/09/01 10:27:12
Modified: v2/test/cases/xbean/scomp/namespace ElementWC.xsd
v2/test/src/scomp/attributes/detailed AttrGroupTest.java
LocalAttrForm.java LocalAttrUse.java
v2/test/src/scomp/common BaseCase.java
v2/test/src/scomp/contentType/complex/detailed
ElementOnlyContentTest.java
v2/test/src/scomp/contentType/complex/modelGroup/detailed
NestSequenceChoiceTest.java
v2/test/src/scomp/contentType/simple/detailed UnionType.java
v2/test/src/scomp/derivation/detailed BlockTest.java
v2/test/src/scomp/derivation/restriction/detailed
AttrWCRestriction.java GroupRestrictionTest.java
MixedContentRestriction.java
v2/test/src/scomp/derivation/restriction/facets/detailed
ListRestriction.java
v2/test/src/scomp/elements/detailed GlobalEltDefault.java
GlobalEltNillable.java NillTest.java
v2/test/src/scomp/namespace/detailed ElementWC.java
v2/test/src/scomp/substGroup/restriction/detailed Block.java
v2/test/src/xmlcursor/detailed ToBookmarkTest.java
Added: v2/test/cases/xbean/scomp/redefine AttrRedefineSub.xs
AttrRedefineSuper.xsd BaseAttrGroup.xs
BaseModelGroup.xs BaseSimple.xs ModelGroupSub.xs
ModelGroupSuper.xsd SimpleRedefined.xsd TypeBase.xs
TypeRedefine.xsd
Log:
Contributed by:Yana Kadiyska. Fixing some schema feature tests
Revision Changes Path
1.2 +2 -2 xml-xmlbeans/v2/test/cases/xbean/scomp/namespace/ElementWC.xsd
Index: ElementWC.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/scomp/namespace/ElementWC.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementWC.xsd 16 Aug 2004 17:36:17 -0000 1.1
+++ ElementWC.xsd 1 Sep 2004 17:27:10 -0000 1.2
@@ -55,7 +55,7 @@
<xsd:complexType name="UriListStrictT">
<xsd:sequence>
- <xsd:any namespace="http://apache.org http://w3c.org" processContents="strict" />
+ <xsd:any namespace="http://xbean/scomp/element/GlobalEltDefault http://w3c.org" processContents="strict" />
</xsd:sequence>
</xsd:complexType>
@@ -114,7 +114,7 @@
<xsd:element name="LocalSkip" type="LocalSkipT"/>
<xsd:element name="LocalStrict" type="LocalStrictT"/>
- <xsd:attribute name="LocalAttr" type="xsd:int"/>
+ <xsd:attribute name="LocalElt" type="xsd:int"/>
</xsd:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/AttrRedefineSub.xs
Index: AttrRedefineSub.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/AttrGroupRedefine"
targetNamespace="http://xbean/scomp/redefine/AttrGroupRedefine"
>
<xs:redefine schemaLocation="BaseAttrGroup.xs">
<xs:attributeGroup name="AttrGroup">
<xs:attribute name="attr1" type="xs:string"/>
</xs:attributeGroup>
</xs:redefine>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/AttrRedefineSuper.xsd
Index: AttrRedefineSuper.xsd
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/AttrGroupRedefine"
targetNamespace="http://xbean/scomp/redefine/AttrGroupRedefine"
>
<xs:redefine schemaLocation="BaseAttrGroup.xs">
<xs:attributeGroup name="AttrGroup">
<xs:attribute name="attr1" type="xs:string"/>
<xs:attribute name="attr2a" type="xs:date"/>
<xs:attribute name="attr3" type="xs:int"/>
</xs:attributeGroup>
</xs:redefine>
<xs:element name="AttrGroupElt">
<xs:complexType>
<xs:attributeGroup ref="AttrGroup"/>
</xs:complexType>
</xs:element>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/BaseAttrGroup.xs
Index: BaseAttrGroup.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
>
<xs:attributeGroup name="AttrGroup">
<xs:attribute name="attr1" type="xs:string"/>
<xs:attribute name="attr2" type="xs:int"/>
<xs:attribute name="attr3" type="xs:string"/>
</xs:attributeGroup>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/BaseModelGroup.xs
Index: BaseModelGroup.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/GroupRedefine"
targetNamespace="http://xbean/scomp/redefine/GroupRedefine"
xmlns:color="http://xbean/scomp/redefine/SimpleRedefined"
>
<xs:complexType name="GroupT">
<xs:sequence>
<xs:element name="child1" type="color:ColorT" minOccurs="0"/>
<xs:element name="child2" type="xs:string"/>
<xs:element name="child3" type="xs:int" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/BaseSimple.xs
Index: BaseSimple.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
>
<xs:simpleType name="SizeT">
<xs:restriction base="xs:integer"/>
</xs:simpleType>
<xs:simpleType name="ColorT">
<xs:restriction base="xs:string">
<xs:pattern value="white|green"/>
</xs:restriction>
</xs:simpleType>
<xs:element name="OldSizeElt" type="SizeT"/>
<xs:element name="OldColorElt" type="ColorT"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/ModelGroupSub.xs
Index: ModelGroupSub.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/GroupRedefine"
targetNamespace="http://xbean/scomp/redefine/GroupRedefine"
>
<xs:redefine schemaLocation="BaseModelGroup.xs">
<xs:complexType name="GroupT">
<xs:complexContent>
<xs:restriction base="GroupT">
<xs:sequence>
<xs:element name="child2" type="xs:string"/>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
</xs:redefine>
<xs:element name="GroupSubElt" type="GroupT"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/ModelGroupSuper.xsd
Index: ModelGroupSuper.xsd
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/GroupRedefine"
targetNamespace="http://xbean/scomp/redefine/GroupRedefine"
xmlns:color="http://xbean/scomp/redefine/SimpleRedefined"
>
<!-- <xs:redefine schemaLocation="ModelGroupSub.xs">
<xs:complexType name="GroupT">
<xs:complexContent>
<xs:extension base="GroupT">
<xs:sequence>
<xs:element name="child2" type="xs:string"/>
<xs:element name="child3" type="color:ColorT"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:redefine>
<xs:element name="GroupSuperElt" type="GroupT"/>
-->
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/SimpleRedefined.xsd
Index: SimpleRedefined.xsd
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/SimpleRedefined"
targetNamespace="http://xbean/scomp/redefine/SimpleRedefined"
>
<xs:redefine schemaLocation="BaseSimple.xs">
<xs:simpleType name="SizeT">
<xs:restriction base="SizeT">
<xs:minInclusive value="3"/>
<xs:maxInclusive value="20"/>
</xs:restriction>
</xs:simpleType>
</xs:redefine>
<xs:element name="NewSizeElt" type="SizeT"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/TypeBase.xs
Index: TypeBase.xs
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/TypeBase"
targetNamespace="http://xbean/scomp/redefine/TypeBase"
/>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/redefine/TypeRedefine.xsd
Index: TypeRedefine.xsd
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://xbean/scomp/redefine/TypeRedefine"
targetNamespace="http://xbean/scomp/redefine/TypeRedefine"
/>
1.4 +3 -1 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/AttrGroupTest.java
Index: AttrGroupTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/AttrGroupTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttrGroupTest.java 25 Aug 2004 20:58:56 -0000 1.3
+++ AttrGroupTest.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -48,7 +48,9 @@
cur.toNextToken();
cur.insertAttribute(new QName("http://org.apache.sample", "attr",
"pre"));
- String[] errExpected=new String[]{"cvc-attr"};
+ String[] errExpected=new String[]{
+ XmlErrorCodes
+ .ELEM_COMPLEX_TYPE_LOCALLY_VALID$MISSING_REQUIRED_ATTRIBUTE};
assertTrue( !doc.validate(validateOptions) );
/* assertTrue( compareErrorCodes(new String[]{
1.3 +4 -1 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrForm.java
Index: LocalAttrForm.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalAttrForm.java 25 Aug 2004 20:58:57 -0000 1.2
+++ LocalAttrForm.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -19,6 +19,8 @@
import javax.xml.namespace.QName;
+import org.apache.xmlbeans.XmlErrorCodes;
+
/**
* @owner: ykadiysk
* Date: Jul 14, 2004
@@ -55,7 +57,8 @@
assertTrue( !doc.validate(validateOptions) );
System.out.println(doc.xmlText());
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]
+ {XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$NO_WILDCARD};
assertTrue(compareErrorCodes(errExpected));
1.4 +16 -4 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrUse.java
Index: LocalAttrUse.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrUse.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalAttrUse.java 25 Aug 2004 20:58:58 -0000 1.3
+++ LocalAttrUse.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -17,6 +17,7 @@
import scomp.common.BaseCase;
import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlErrorCodes;
import xbean.scomp.attribute.localAttrUse.LocalAttrUseDocDocument;
import xbean.scomp.attribute.localAttrUse.LocalAttrUseT;
@@ -107,7 +108,11 @@
//assertEquals(1, errorList.size());
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ "cvc-attribute",
+ XmlErrorCodes.
+ ELEM_COMPLEX_TYPE_LOCALLY_VALID$MISSING_REQUIRED_ATTRIBUTE
+ };
assertTrue(compareErrorCodes(errExpected));
@@ -131,7 +136,9 @@
//attr locally valid for fixed val
String[] errExpected = new String[]{
"cvc-attribute",
- "cvc-attribute"};
+ XmlErrorCodes.
+ ELEM_COMPLEX_TYPE_LOCALLY_VALID$MISSING_REQUIRED_ATTRIBUTE
+ };
assertTrue(compareErrorCodes(errExpected));
}
@@ -147,8 +154,12 @@
assertEquals("newval", testDoc.getAttRequiredDefault());
showErrors();
String[] errExpected = new String[]{
- "cvc-attribute",
- "cvc-attribute"};
+ XmlErrorCodes.
+ ELEM_COMPLEX_TYPE_LOCALLY_VALID$MISSING_REQUIRED_ATTRIBUTE
+ ,
+ XmlErrorCodes.
+ ELEM_COMPLEX_TYPE_LOCALLY_VALID$MISSING_REQUIRED_ATTRIBUTE
+ };
assertTrue(compareErrorCodes(errExpected));
}
@@ -171,6 +182,7 @@
elt.setAttOpt("bla");
assertTrue(!elt.validate(validateOptions));
showErrors();
+ //does Kevin have the right code here? doesn't seem so to me?
String[] errExpected = new String[]{"cvc-attribute"};
assertTrue(compareErrorCodes(errExpected));
1.4 +26 -2 xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java
Index: BaseCase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseCase.java 25 Aug 2004 20:58:59 -0000 1.3
+++ BaseCase.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -20,6 +20,7 @@
import org.apache.xmlbeans.XmlErrorCodes;
import java.util.ArrayList;
+import java.util.Collection;
/**
* @owner: ykadiysk
@@ -59,8 +60,12 @@
//TODO: compare regardless of order
public boolean compareErrorCodes(String[] expected) {
- // if ( errorList.size() != expected.length)
- // return false;
+ if ( errorList.size() != expected.length){
+ System.err.println(
+ stringOfCodes(expected,errorList));
+
+ return false;
+ }
StringBuffer errMessage=
new StringBuffer();
for (int i = 0; i < errorList.size(); i++) {
@@ -71,10 +76,29 @@
if (expected[i] != error.getErrorCode()){
if (errMessage.length() >0)
System.err.println(errMessage);
+ ArrayList exp=new ArrayList();
+
+ System.err.println(
+ stringOfCodes(expected,errorList));
return false;
}
}
return true;
}
+
+ public String stringOfCodes(String[] errorCodes
+ ,ArrayList actual_errorCodes){
+ StringBuffer res=new StringBuffer();
+ res.append("\n Expected codes(from LTGfmt file):\n");
+ int i=0;
+ for (;i < errorCodes.length; i++ )
+ res.append( errorCodes[i]+"\t" );
+ res.append("\nBut Got: \n");
+ for ( i=0 ;i < actual_errorCodes.size(); i++ )
+ res.append( actual_errorCodes.get(i)+"\t" );
+
+ return res.toString();
+
+ }
}
1.4 +3 -1 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java
Index: ElementOnlyContentTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElementOnlyContentTest.java 25 Aug 2004 20:58:59 -0000 1.3
+++ ElementOnlyContentTest.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -21,6 +21,7 @@
import org.apache.xmlbeans.XmlInteger;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlErrorCodes;
import xbean.scomp.contentType.complexTypeTest.EltTypeDocument;
import xbean.scomp.contentType.complexTypeTest.ElementT;
@@ -89,7 +90,8 @@
System.out.println(testElt.xmlText());
assertTrue(!testElt.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_ONLY_WITH_TEXT};
assertTrue(compareErrorCodes(errExpected));
}
1.3 +1 -1 xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java
Index: NestSequenceChoiceTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NestSequenceChoiceTest.java 25 Aug 2004 20:58:59 -0000 1.2
+++ NestSequenceChoiceTest.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -61,7 +61,7 @@
throw t;
}
-
+ //can't have both set
elt.setOptchildInt(2);
elt.setOptchildStr("boo");
assertTrue(!doc.validate(validateOptions));
1.3 +6 -2 xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/UnionType.java
Index: UnionType.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/UnionType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnionType.java 25 Aug 2004 20:58:59 -0000 1.2
+++ UnionType.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.ArrayList;
+import org.apache.xmlbeans.XmlErrorCodes;
+
/**
* @owner: ykadiysk
* Date: Aug 3, 2004
@@ -63,7 +65,8 @@
doc.setUnionElt(new Integer(5));
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_VALID$UNION};
assertTrue(compareErrorCodes(errExpected));
}
@@ -105,7 +108,8 @@
UnionEltDocument doc = UnionEltDocument.Factory.parse(input);
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_VALID$UNION};
assertTrue(compareErrorCodes(errExpected));
}
1.3 +43 -19 xml-xmlbeans/v2/test/src/scomp/derivation/detailed/BlockTest.java
Index: BlockTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/detailed/BlockTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockTest.java 25 Aug 2004 20:58:59 -0000 1.2
+++ BlockTest.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -20,6 +20,7 @@
import scomp.common.BaseCase;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -31,7 +32,9 @@
String restrContentInvalid = "<name>Bobby</name><age>40</age>";
String extContent = "<name>Bobby</name><age>40</age><gender>f</gender>";
- public String getInstance(String elt, String type, boolean ext,
+ public String getInstance(String elt,
+ String type,
+ boolean ext,
boolean valid) {
StringBuffer sb = new StringBuffer();
sb.append("<ns:" + elt +
@@ -81,7 +84,8 @@
doc1 = EltAllBaseDocument.Factory.parse(getInstance("EltAllBase", "restAllT", false, true));
assertTrue(!doc.validate(validateOptions));
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_EXTENSION};
assertTrue(compareErrorCodes(errExpected));
@@ -117,12 +121,18 @@
validate(doc);
//subst rest type: should not be possible
EltRBaseDocument doc1 = EltRBaseDocument.Factory.parse(getInstance("EltRBase", "restRT", false, false));
- assertTrue(!doc1.validate());
+ assertTrue(!doc1.validate(validateOptions));
+ String[] errExpected = new String[]{
+ XmlErrorCodes
+ .ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_RESTRICTION};
+ assertTrue(compareErrorCodes(errExpected));
- doc1 = EltRBaseDocument.Factory.parse(getInstance("EltRBase", "restRT", false, true));
+ doc1 = EltRBaseDocument.Factory
+ .parse(getInstance("EltRBase", "restRT", false, true));
- assertTrue(!doc1.validate());
- String[] errExpected = new String[]{"cvc-attribute"};
+ assertTrue(!doc1.validate(validateOptions));
+ errExpected = new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_RESTRICTION};
assertTrue(compareErrorCodes(errExpected));
}
@@ -136,15 +146,20 @@
EltREBaseDocument doc1 =
EltREBaseDocument.Factory.parse(getInstance("EltREBase", "extRET", true, true));
assertTrue(!doc.validate(validateOptions));
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_EXTENSION};
assertTrue(compareErrorCodes(errExpected));
//subst rest type: should not be possible
//ER
- EltERBaseDocument doc2 = EltERBaseDocument.Factory.parse(getInstance("EltERBase", "restERT", false, false));
- assertTrue(!doc.validate(validateOptions));
- errExpected = new String[]{"cvc-attribute"};
+ EltERBaseDocument doc2 = EltERBaseDocument.Factory
+ .parse(getInstance("EltERBase",
+ "restERT", false, false));
+ assertTrue(!doc.validate(validateOptions));
+ errExpected = new String[]{
+ XmlErrorCodes
+ .ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_RESTRICTION};
assertTrue(compareErrorCodes(errExpected));
doc2 = EltERBaseDocument.Factory.parse(getInstance("EltERBase", "restERT", false, true));
@@ -158,7 +173,8 @@
errExpected = new String[]{"cvc-attribute"};
assertTrue(compareErrorCodes(errExpected));
- doc3 = EltREBaseDocument.Factory.parse(getInstance("EltREBase", "restRET", false, true));
+ doc3 = EltREBaseDocument.Factory
+ .parse(getInstance("EltREBase", "restRET", false, true));
assertTrue(!doc.validate(validateOptions));
errExpected = new String[]{"cvc-attribute"};
assertTrue(compareErrorCodes(errExpected));
@@ -171,14 +187,22 @@
* @throws Throwable
*/
public void testBlockDefault() throws Throwable {
- EltDefaultBlockDocument doc = EltDefaultBlockDocument.Factory.parse(getInstanceDefault("EltDefaultBlock", "extNoneT", true, true));
- assertTrue(!doc.validate(validateOptions));
- String[] errExpected = new String[]{"cvc-attribute"};
- assertTrue(compareErrorCodes(errExpected));
-
- doc = EltDefaultBlockDocument.Factory.parse(getInstanceDefault("EltDefaultBlock", "restNoneT", false, false));
- assertTrue(!doc.validate(validateOptions));
- errExpected = new String[]{"cvc-attribute"};
+ EltDefaultBlockDocument doc =
+ EltDefaultBlockDocument.Factory
+ .parse(getInstanceDefault("EltDefaultBlock", "extNoneT", true, true));
+ assertTrue(!doc.validate(validateOptions));
+ String[] errExpected = new String[]{
+ XmlErrorCodes
+ .ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_EXTENSION};
+ assertTrue(compareErrorCodes(errExpected));
+
+ doc = EltDefaultBlockDocument.Factory
+ .parse(getInstanceDefault("EltDefaultBlock", "restNoneT", false, false));
+ assertTrue(!doc.validate(validateOptions));
+ errExpected = new String[]{
+ XmlErrorCodes
+ .ELEM_LOCALLY_VALID$XSI_TYPE_BLOCK_RESTRICTION
+ };
assertTrue(compareErrorCodes(errExpected));
doc = EltDefaultBlockDocument.Factory.parse(getInstanceDefault("EltDefaultBlock", "restNoneT", false, true));
1.3 +7 -3 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/AttrWCRestriction.java
Index: AttrWCRestriction.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/AttrWCRestriction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttrWCRestriction.java 25 Aug 2004 20:59:03 -0000 1.2
+++ AttrWCRestriction.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -17,6 +17,7 @@
import scomp.common.BaseCase;
import xbean.scomp.derivation.attributeWCRestriction.*;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -80,7 +81,8 @@
Any2LocalDocument.Factory.parse(input);
assertTrue (! doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$NOT_WILDCARD_VALID};
assertTrue(compareErrorCodes(errExpected));
}
@@ -99,7 +101,8 @@
List2SubsetDocument.Factory.parse(input);
//this is a non-existing NS...strict should complain
assertTrue ( !doc.validate(validateOptions));
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$NOT_WILDCARD_VALID};
assertTrue(compareErrorCodes(errExpected));
@@ -129,7 +132,8 @@
Other2ListDocument.Factory.parse(input);
assertTrue (! doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$NOT_WILDCARD_VALID};
assertTrue(compareErrorCodes(errExpected));
}
1.4 +5 -4 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java
Index: GroupRestrictionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GroupRestrictionTest.java 25 Aug 2004 20:59:06 -0000 1.3
+++ GroupRestrictionTest.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -31,7 +31,7 @@
.newInstance();
RestrictedSequenceT elt = doc.addNewRestrictedSequenceElt();
elt.setChild1(BigInteger.ONE);
- elt.addChild2("foobar");
+
elt.addChild3(new BigInteger("10"));
elt.addChild3(new BigInteger("10"));
try {
@@ -40,10 +40,11 @@
showErrors();
throw t;
}
- elt.addChild3(BigInteger.ONE);
- assertTrue(!doc.validate());
+ elt.addChild2("foobar");
+ assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ "cvc-attribute"};
assertTrue(compareErrorCodes(errExpected));
1.4 +3 -1 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java
Index: MixedContentRestriction.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MixedContentRestriction.java 25 Aug 2004 20:59:06 -0000 1.3
+++ MixedContentRestriction.java 1 Sep 2004 17:27:11 -0000 1.4
@@ -20,6 +20,7 @@
import java.math.BigInteger;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -64,7 +65,8 @@
cur.insertChars("My chars");
assertTrue( !doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_ONLY_WITH_TEXT};
assertTrue(compareErrorCodes(errExpected));
//should be valid w/o the Text there
1.3 +6 -2 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed/ListRestriction.java
Index: ListRestriction.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed/ListRestriction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListRestriction.java 25 Aug 2004 20:59:09 -0000 1.2
+++ ListRestriction.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.ArrayList;
+import org.apache.xmlbeans.XmlErrorCodes;
+
/**
* @owner: ykadiysk
* Date: Aug 4, 2004
@@ -35,7 +37,8 @@
//this should be too short
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_LENGTH_VALID$LIST_LENGTH};
assertTrue(compareErrorCodes(errExpected));
vals.add("lstsmall");
@@ -100,7 +103,8 @@
MaxLengthEltDocument doc = MaxLengthEltDocument.Factory.parse(input);
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_LENGTH_VALID$LIST_LENGTH};
assertTrue(compareErrorCodes(errExpected));
MaxLengthFacet elt = MaxLengthFacet.Factory.newInstance();
1.3 +15 -4 xml-xmlbeans/v2/test/src/scomp/elements/detailed/GlobalEltDefault.java
Index: GlobalEltDefault.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/elements/detailed/GlobalEltDefault.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GlobalEltDefault.java 25 Aug 2004 20:59:09 -0000 1.2
+++ GlobalEltDefault.java 1 Sep 2004 17:27:11 -0000 1.3
@@ -30,14 +30,25 @@
GlobalEltDefaultStrDocument testDoc=GlobalEltDefaultStrDocument
.Factory.newInstance();
assertEquals(null,testDoc.getGlobalEltDefaultStr());
- assertTrue(testDoc.validate());
+try{
+ assertTrue(testDoc.validate(validateOptions));
+}catch(Throwable t){
+ showErrors();
+ throw t;
+}
}
//default value is used
- public void testIntType(){
+ public void testIntType()throws Throwable{
GlobalEltDefaultIntDocument testDoc
- =GlobalEltDefaultIntDocument.Factory.newInstance();
+ =GlobalEltDefaultIntDocument.Factory
+ .newInstance();
assertEquals(0,testDoc.getGlobalEltDefaultInt());
- assertTrue(testDoc.validate());
+ try{
+ assertTrue(testDoc.validate(validateOptions));
+}catch(Throwable t){
+ showErrors();
+ throw t;
+}
}
}
1.4 +8 -3 xml-xmlbeans/v2/test/src/scomp/elements/detailed/GlobalEltNillable.java
Index: GlobalEltNillable.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/elements/detailed/GlobalEltNillable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GlobalEltNillable.java 25 Aug 2004 20:59:09 -0000 1.3
+++ GlobalEltNillable.java 1 Sep 2004 17:27:12 -0000 1.4
@@ -18,6 +18,7 @@
import scomp.common.BaseCase;
import xbean.scomp.element.globalEltNillable.*;
import org.apache.xmlbeans.impl.values.XmlValueNotNillableException;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -36,7 +37,8 @@
" xsi:nil=\"false\"/>");
assertTrue(!testElt.validate(validateOptions));
assertEquals(1, errorList.size());
- String[] errExpected = new String[]{"cvc-elt3.3.4"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$NOT_NILLABLE};
assertTrue(compareErrorCodes(errExpected));
@@ -68,7 +70,9 @@
assertTrue(!testElt.validate(validateOptions));
assertEquals(1, errorList.size());
showErrors();
- String[] errExpected = new String[]{"cvc-elt3.3.4"};
+ String[] errExpected =
+ new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$NOT_NILLABLE};
assertTrue(compareErrorCodes(errExpected));
fail("Why is the last setter not throwing an exception?");
@@ -138,7 +142,8 @@
assertEquals(1, errorList.size());
showErrors();
- String[] errExpected = new String[]{"cvc-elt3.3.4"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ELEM_LOCALLY_VALID$NIL_WITH_CONTENT};
assertTrue(compareErrorCodes(errExpected));
testElt = GlobalEltComplexDocument
1.3 +15 -12 xml-xmlbeans/v2/test/src/scomp/elements/detailed/NillTest.java
Index: NillTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/elements/detailed/NillTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NillTest.java 16 Aug 2004 22:57:34 -0000 1.2
+++ NillTest.java 1 Sep 2004 17:27:12 -0000 1.3
@@ -26,17 +26,26 @@
* Date: Jul 28, 2004
* Time: 9:08:41 AM
*/
+
+/** this test illustrates somewhat inconsistent behavior
+ * of nillable:
+ *
+ */
public class NillTest extends BaseCase {
/**
- * Tests exceptions when setting values to null for non-nillable elems
+ * Tests exceptions when setting values to
+ * null for non-nillable elems
*/
public void testNillable() {
Contact contact = Contact.Factory.newInstance();
-// if the first name is null, xmlbeans doest not thrown any exceptions...
- //eric says this should fail: elt is not nillable
+ // if the first name is null, xmlbeans doest not thrown any exceptions...
+ //eric says this should fail:
+ // elt is not nillable--at least xsi:nil should never be there
contact.setFirstName(null);
-
+ assertEquals("<firstName " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>",
+ contact.xmlText());
GlobalEltNotNillableDocument testElt = GlobalEltNotNillableDocument
.Factory.newInstance();
testElt.setGlobalEltNotNillable(null);
@@ -48,14 +57,8 @@
}
catch (XmlValueNotNillableException e) {
}
- // try {
- // doc.setCityName(null);
- testElt.setGlobalEltNotNillable(null);
- // fail("Expected XmlValueNotNillableException");
- //}
- //catch (XmlValueNotNillableException e) {}
-
- AddressInfo address = AddressInfo.Factory.newInstance();
+ testElt.setGlobalEltNotNillable(null);
+ AddressInfo address = AddressInfo.Factory.newInstance();
//this can be null
address.setGlobalEltNotNillable(null);
// ...whereas this optional field cannot be null
1.5 +21 -4 xml-xmlbeans/v2/test/src/scomp/namespace/detailed/ElementWC.java
Index: ElementWC.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/namespace/detailed/ElementWC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElementWC.java 25 Aug 2004 20:59:09 -0000 1.4
+++ ElementWC.java 1 Sep 2004 17:27:12 -0000 1.5
@@ -18,6 +18,11 @@
import scomp.common.BaseCase;
import xbean.scomp.namespace.elementWC.*;
+import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlString;
+
/**
* @owner: ykadiysk
* Date: Aug 5, 2004
@@ -78,6 +83,11 @@
if (!doc.validate(validateOptions))
showErrors();
assertTrue(doc.validate(validateOptions));
+ XmlObject[] arr=doc.getAnyStrict()
+ .selectChildren(new QName(
+ "http://xbean/scomp/element/GlobalEltDefault",
+ "GlobalEltDefaultStr","elt"));
+ assertEquals(arr[0].schemaType(),XmlString.type);
}
public void testAnyStrictIllegal() throws Throwable {
@@ -206,10 +216,10 @@
public void testListStrictLegal() throws Throwable {
ListStrictDocument doc = ListStrictDocument.Factory
.parse("<foo:ListStrict " +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
- "xmlns:foo=\"http://xbean/scomp/namespace/ElementWC\"" +
+ "xmlns:foo=\"http://xbean/scomp/namespace/ElementWC\"" +
" xmlns:elt=\"http://xbean/scomp/element/GlobalEltDefault\">" +
- " <elt:child/></foo:ListStrict>");
+ " <elt:GlobalEltDefaultInt/>" +
+ "</foo:ListStrict>");
if (!doc.validate(validateOptions)) {
showErrors();
fail("testFailed");
@@ -239,6 +249,8 @@
if (!doc.validate(validateOptions))
showErrors();
assertTrue(doc.validate(validateOptions));
+ XmlObject[] arr=doc.getTargetLax().selectChildren("","child");
+ assertEquals(arr[0].schemaType(),XmlObject.type);
}
public void testTargetLaxIllegal() throws Throwable {
@@ -281,8 +293,13 @@
TargetStrictDocument doc = TargetStrictDocument.Factory
.parse("<foo:TargetStrict " +
" xmlns:foo=\"http://xbean/scomp/namespace/ElementWC\">" +
- " <foo:child/></foo:TargetStrict>");
+ " <foo:LocalElt/></foo:TargetStrict>");
+ try{
assertTrue(doc.validate(validateOptions));
+ }catch(Throwable t){
+ showErrors();
+ throw t;
+ }
}
public void testTargetStrictIllegal() throws Throwable {
1.4 +2 -1 xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/substGroup/restriction/detailed/Block.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Block.java 25 Aug 2004 20:59:12 -0000 1.3
+++ Block.java 1 Sep 2004 17:27:12 -0000 1.4
@@ -26,7 +26,8 @@
*/
public class Block extends BaseCase {
/**
- * TODO: verify that w/ respect to substitution groups block all
+ * TODO: verify that w/ respect to substitution
+ * groups block all
* and block substitution are the same thing;
*
* @throws Throwable
1.4 +4 -2 xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToBookmarkTest.java
Index: ToBookmarkTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/xmlcursor/detailed/ToBookmarkTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ToBookmarkTest.java 1 Jul 2004 00:01:29 -0000 1.3
+++ ToBookmarkTest.java 1 Sep 2004 17:27:12 -0000 1.4
@@ -229,8 +229,10 @@
toNextTokenOfType(m_xc, TokenType.TEXT);
xc1.toCursor(m_xc);
xc1.toNextChar(1);
- xc1.setBookmark(_theBookmark); // set an Bookmark at the '1'
- xc1.toNextChar(2); // move xc1 to the '3'
+ // set a Bookmark at the '1'
+ xc1.setBookmark(_theBookmark);
+ // move xc1 to the '3'
+ xc1.toNextChar(2);
try {
assertEquals("34", xc1.getTextValue());
assertEquals(2, m_xc.copyChars(2, xc1));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org