Author: mukulg Date: Sat Apr 16 10:10:16 2022 New Revision: 1899906 URL: http://svn.apache.org/viewvc?rev=1899906&view=rev Log: adding few test cases, for jira issue XERCESJ-1744
Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xml xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xsd xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_2.xml Modified: xerces/java/branches/xml-schema-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xml URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xml?rev=1899906&view=auto ============================================================================== --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xml (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xml Sat Apr 16 10:10:16 2022 @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<X>2 2012-08-07</X> \ No newline at end of file Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xsd URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xsd?rev=1899906&view=auto ============================================================================== --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xsd (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_1.xsd Sat Apr 16 10:10:16 2022 @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="X"> + <xs:simpleType> + <xs:list itemType="INT_AND_DATE"/> + </xs:simpleType> + </xs:element> + + <xs:simpleType name="INT_AND_DATE"> + <xs:union memberTypes="INT_TYPE xs:date"/> + </xs:simpleType> + + <xs:simpleType name="INT_TYPE"> + <xs:restriction base="xs:integer"> + <xs:assertion test="$value mod 2 = 0"/> + </xs:restriction> + </xs:simpleType> + +</xs:schema> \ No newline at end of file Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_2.xml URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_2.xml?rev=1899906&view=auto ============================================================================== --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_2.xml (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1744_2.xml Sat Apr 16 10:10:16 2022 @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<X>3 2012-08-07</X> \ No newline at end of file Modified: xerces/java/branches/xml-schema-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java?rev=1899906&r1=1899905&r2=1899906&view=diff ============================================================================== --- xerces/java/branches/xml-schema-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java (original) +++ xerces/java/branches/xml-schema-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java Sat Apr 16 10:10:16 2022 @@ -741,5 +741,44 @@ public class JiraBugsTests extends Xerce assertTrue(false); } } + + public void testJira_1744_1() { + String xmlfile = fDataDir+"/jira_bugs/1744_1.xml"; + String schemapath = fDataDir+"/jira_bugs/1744_1.xsd"; + try { + Schema s = fSchemaFactory.newSchema(new File(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_1744_2() { + String xmlfile = fDataDir+"/jira_bugs/1744_2.xml"; + String schemapath = fDataDir+"/jira_bugs/1744_1.xsd"; + try { + fSchemaFactory.setErrorHandler(this); + Schema s = fSchemaFactory.newSchema(new File(schemapath)); + Validator v = s.newValidator(); + v.setErrorHandler(this); + v.validate(new DOMSource(getDomDocument(xmlfile))); + assertTrue(failureList.size() == 1); + // test expected error messages + List expectedMsgList = new ArrayList(); + FailureMesgFragments mesgFragments = new FailureMesgFragments(); + mesgFragments.setMessageFragment("cvc-datatype-valid.4.1.4: The value '3 2012-08-07' of element 'X' is not valid " + + "with the required simple type. Value '3' is not valid with any member of union type 'INT_AND_DATE'"); + expectedMsgList.add(mesgFragments); + assertTrue(areErrorMessagesConsistent(expectedMsgList)); + } catch(Exception ex) { + ex.printStackTrace(); + assertTrue(false); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org