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/09/20 05:32:44 UTC
svn commit: r1867202 - in /xerces/java/branches/xs-1.1-tests:
data/redefine/main_3.xsd data/redefine/redefined_2.xsd
src/org/apache/xerces/tests/RedefineTests.java
Author: mukulg
Date: Fri Sep 20 05:32:44 2019
New Revision: 1867202
URL: http://svn.apache.org/viewvc?rev=1867202&view=rev
Log:
adding an xsd 1.1 test case, containing <xs:assert> within <xs:redefine>
Added:
xerces/java/branches/xs-1.1-tests/data/redefine/main_3.xsd
xerces/java/branches/xs-1.1-tests/data/redefine/redefined_2.xsd
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/RedefineTests.java
Added: xerces/java/branches/xs-1.1-tests/data/redefine/main_3.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/redefine/main_3.xsd?rev=1867202&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/redefine/main_3.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/redefine/main_3.xsd Fri Sep 20 05:32:44 2019
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://test1/" elementFormDefault="qualified" targetNamespace="http://test1/">
+
+ <xs:redefine schemaLocation="redefined_2.xsd">
+ <xs:complexType name="T1">
+ <xs:complexContent>
+ <xs:restriction base="ns1:T1">
+ <xs:sequence>
+ <xs:element name="y" type="xs:integer"/>
+ </xs:sequence>
+ <xs:assert test="ns0:y mod 2 = 0"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:redefine>
+
+ <xs:element name="x" type="ns1:T1"/>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/redefine/redefined_2.xsd
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/redefine/redefined_2.xsd?rev=1867202&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/redefine/redefined_2.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/redefine/redefined_2.xsd Fri Sep 20 05:32:44 2019
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://test1/"
+ elementFormDefault="qualified" targetNamespace="http://test1/">
+
+ <xs:complexType name="T1">
+ <xs:sequence>
+ <xs:element name="y" type="xs:integer"/>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/RedefineTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/RedefineTests.java?rev=1867202&r1=1867201&r2=1867202&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/RedefineTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/RedefineTests.java Fri Sep 20 05:32:44 2019
@@ -149,5 +149,26 @@ public class RedefineTests extends Xerce
assertTrue(false);
}
}
+
+ public void testXSRedefine7() {
+ String xmlfile = fDataDir+"/redefine/main_1.xml";
+ String schemapath = fDataDir+"/redefine/main_3.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
+ Validator v = s.newValidator();
+ v.setErrorHandler(this);
+ v.validate(new StreamSource(xmlfile));
+ assertTrue(failureList.size() == 1);
+ // test expected error messages
+ List expectedMsgList = new ArrayList();
+ FailureMesgFragments mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-assertion: Assertion evaluation ('ns0:y mod 2 = 0') for element 'x' on schema type 'T1' did not succeed. XPST0081 : Unknown prefix: ns0");
+ 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