You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2019/10/21 10:39:29 UTC
svn commit: r1868691 - in /xerces/java/branches/xs-1.1-tests:
data/override/ov_1.xsd data/override/ov_1_invalid.xml
data/override/ov_1_valid.xml data/override/overridden_1.xsd
data/override/overridden_2.xsd src/org/apache/xerces/tests/OverrideTests.java
Author: mukulg
Date: Mon Oct 21 10:39:29 2019
New Revision: 1868691
URL: http://svn.apache.org/viewvc?rev=1868691&view=rev
Log:
committing few xsd 1.1 xs:override test cases
Added:
xerces/java/branches/xs-1.1-tests/data/override/ov_1.xsd
xerces/java/branches/xs-1.1-tests/data/override/ov_1_invalid.xml
xerces/java/branches/xs-1.1-tests/data/override/ov_1_valid.xml
xerces/java/branches/xs-1.1-tests/data/override/overridden_1.xsd
xerces/java/branches/xs-1.1-tests/data/override/overridden_2.xsd
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java
Added: xerces/java/branches/xs-1.1-tests/data/override/ov_1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/override/ov_1.xsd?rev=1868691&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/override/ov_1.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/override/ov_1.xsd Mon Oct 21 10:39:29 2019
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:override schemaLocation="overridden_1.xsd">
+ <xs:complexType name="CT1">
+ <xs:sequence>
+ <xs:element name="y" type="xs:integer"/>
+ </xs:sequence>
+ <xs:assert test="y mod 2 = 0"/>
+ </xs:complexType>
+ </xs:override>
+
+ <xs:override schemaLocation="overridden_2.xsd">
+ <xs:complexType name="CT2">
+ <xs:sequence>
+ <xs:element name="y" type="xs:integer"/>
+ </xs:sequence>
+ <xs:assert test="y mod 2 != 0"/>
+ </xs:complexType>
+ </xs:override>
+
+ <xs:element name="X">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="x1" type="CT1"/>
+ <xs:element name="x2" type="CT2"/>
+ </xs:sequence>
+ <xs:attribute ref="idx1" use="required"/>
+ <xs:attribute ref="idx2" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/override/ov_1_invalid.xml
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/override/ov_1_invalid.xml?rev=1868691&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/override/ov_1_invalid.xml (added)
+++ xerces/java/branches/xs-1.1-tests/data/override/ov_1_invalid.xml Mon Oct 21 10:39:29 2019
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<X idx1="sl1" idx2="sl2">
+ <x1>
+ <y>11</y>
+ </x1>
+ <x2>
+ <y>8</y>
+ </x2>
+</X>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/override/ov_1_valid.xml
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/override/ov_1_valid.xml?rev=1868691&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/override/ov_1_valid.xml (added)
+++ xerces/java/branches/xs-1.1-tests/data/override/ov_1_valid.xml Mon Oct 21 10:39:29 2019
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<X idx1="sl1" idx2="sl2">
+ <x1>
+ <y>8</y>
+ </x1>
+ <x2>
+ <y>11</y>
+ </x2>
+</X>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/override/overridden_1.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/override/overridden_1.xsd?rev=1868691&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/override/overridden_1.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/override/overridden_1.xsd Mon Oct 21 10:39:29 2019
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:complexType name="CT1">
+ <xs:sequence>
+ <xs:element name="y" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:attribute name="idx1" type="xs:string"/>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/override/overridden_2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/override/overridden_2.xsd?rev=1868691&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/override/overridden_2.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/override/overridden_2.xsd Mon Oct 21 10:39:29 2019
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:complexType name="CT2">
+ <xs:sequence>
+ <xs:element name="y" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:attribute name="idx2" type="xs:string"/>
+
+</xs:schema>
\ No newline at end of file
Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java?rev=1868691&r1=1868690&r2=1868691&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java Mon Oct 21 10:39:29 2019
@@ -204,5 +204,45 @@ public class OverrideTests extends Xerce
assertTrue(false);
}
}
+
+ public void testXSOverride8() {
+ String xmlfile = fDataDir+"/override/ov_1_valid.xml";
+ String schemapath = fDataDir+"/override/ov_1.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
+ Validator v = s.newValidator();
+ v.setErrorHandler(this);
+ v.validate(new StreamSource(xmlfile));
+ assertNull(fErrSysId);
+ assertNull(fFatErrSysId);
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
+
+ public void testXSOverride9() {
+ String xmlfile = fDataDir+"/override/ov_1_invalid.xml";
+ String schemapath = fDataDir+"/override/ov_1.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
+ Validator v = s.newValidator();
+ v.setErrorHandler(this);
+ v.validate(new StreamSource(xmlfile));
+ assertTrue(failureList.size() == 2);
+ // test expected error messages
+ List expectedMsgList = new ArrayList();
+ FailureMesgFragments mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-assertion: Assertion evaluation ('y mod 2 = 0') for element 'x1' on schema type 'CT1' did not succeed");
+ expectedMsgList.add(mesgFragments);
+ mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-assertion: Assertion evaluation ('y mod 2 != 0') for element 'x2' on schema type 'CT2' did not succeed");
+ expectedMsgList.add(mesgFragments);
+ assertTrue(areErrorMessagesConsistent(expectedMsgList));
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org