Author: mukulg
Date: Thu Sep 19 08:25:23 2019
New Revision: 1867160
URL: http://svn.apache.org/viewvc?rev=1867160&view=rev
Log:
adding few more test cases for jira issue XERCESJ-1674
Added:
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2.xsd
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2_overridden.xsd
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_3.xml
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_4.xml
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2.xsd?rev=1867160&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2.xsd Thu Sep 19
08:25:23 2019
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:ns0="http://test1/"; targetNamespace="http://test1/";
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+ <xs:override schemaLocation="1674_2_overridden.xsd">
+ <xs:complexType name="Y2">
+ <xs:sequence>
+ <xs:element name="y" type="ns0:y_INT"/>
+ </xs:sequence>
+ <xs:assert test="y mod 2 = 0"
xpathDefaultNamespace="##targetNamespace"/>
+ </xs:complexType>
+ </xs:override>
+
+ <xs:element name="X" type="ns0:Y2"/>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2_overridden.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2_overridden.xsd?rev=1867160&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2_overridden.xsd
(added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_2_overridden.xsd Thu
Sep 19 08:25:23 2019
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://test1/";
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+ <xs:complexType name="Y2">
+ <xs:sequence>
+ <xs:element name="y" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="y_INT">
+ <xs:restriction base="xs:integer">
+ <xs:maxInclusive value="1000"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_3.xml
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_3.xml?rev=1867160&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_3.xml (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_3.xml Thu Sep 19
08:25:23 2019
@@ -0,0 +1,3 @@
+<X xmlns="http://test1/";>
+ <y>1000</y>
+</X>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_4.xml
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_4.xml?rev=1867160&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_4.xml (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1674_4.xml Thu Sep 19
08:25:23 2019
@@ -0,0 +1,3 @@
+<X xmlns="http://test1/";>
+ <y>1003</y>
+</X>
\ No newline at end of file
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java?rev=1867160&r1=1867159&r2=1867160&view=diff
==============================================================================
---
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
(original)
+++
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
Thu Sep 19 08:25:23 2019
@@ -438,5 +438,48 @@ public class JiraBugsTests extends Xerce
assertTrue(false);
}
}
+
+ public void testJira_1674_3() {
+ String xmlfile = fDataDir+"/jira_bugs/1674_3.xml";
+ String schemapath = fDataDir+"/jira_bugs/1674_2.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 testJira_1674_4() {
+ String xmlfile = fDataDir+"/jira_bugs/1674_4.xml";
+ String schemapath = fDataDir+"/jira_bugs/1674_2.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new
StreamSource(schemapath));
+ Validator v = s.newValidator();
+ v.setErrorHandler(this);
+ v.validate(new StreamSource(xmlfile));
+ assertTrue(failureList.size() == 3);
+ // test expected error messages
+ List expectedMsgList = new ArrayList();
+ FailureMesgFragments mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-maxInclusive-valid: Value
'1003' is not facet-valid with respect to maxInclusive '1000' for type
'y_INT'");
+ expectedMsgList.add(mesgFragments);
+ mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-type.3.1.3: The value '1003'
of element 'y' is not valid");
+ expectedMsgList.add(mesgFragments);
+ mesgFragments = new FailureMesgFragments();
+ mesgFragments.setMessageFragment("cvc-assertion: Assertion
evaluation ('y mod 2 = 0') for element 'X' on schema type 'Y2' did not
succeed");
+ expectedMsgList.add(mesgFragments);
+ assertTrue(areErrorMessagesConsistent(expectedMsgList));
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
