svn commit: r1899780 - in /xerces/java/branches/xml-schema-1.1-tests: data/jira_bugs/1743_3.xsd src/org/apache/xerces/tests/JiraBugsTests.java
Author: mukulg Date: Tue Apr 12 12:52:22 2022 New Revision: 1899780 URL: http://svn.apache.org/viewvc?rev=1899780&view=rev Log: adding a test case, for jira issue XERCESJ-1743 Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_3.xsd 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/1743_3.xsd URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_3.xsd?rev=1899780&view=auto == --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_3.xsd (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_3.xsd Tue Apr 12 12:52:22 2022 @@ -0,0 +1,24 @@ + +http://www.w3.org/2001/XMLSchema";> + + + + + + + + + + + + + + + + + + + + + + \ 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=1899780&r1=1899779&r2=1899780&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 Tue Apr 12 12:52:22 2022 @@ -668,5 +668,25 @@ public class JiraBugsTests extends Xerce assertTrue(false); } } + + public void testJira_1743_3() { + String schemapath = fDataDir+"/jira_bugs/1743_3.xsd"; + try { + fSchemaFactory.setErrorHandler(this); + Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath)); + assertTrue(failureList.size() == 1); + // test expected error messages +List expectedMsgList = new ArrayList(); +FailureMesgFragments mesgFragments = new FailureMesgFragments(); +mesgFragments.setMessageFragment("enumeration-valid-restriction: Enumeration value '2 7 4' " + + "is not in the value space of the base type, ListType1"); +expectedMsgList.add(mesgFragments); +assertTrue(areErrorMessagesConsistent(expectedMsgList)); +fErrSysId.endsWith("1743_3.xsd"); + } 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
svn commit: r1899779 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl: dv/xs/XSSimpleTypeDecl.java xs/XMLAssertXPath2EngineImpl.java
Author: mukulg Date: Tue Apr 12 12:51:12 2022 New Revision: 1899779 URL: http://svn.apache.org/viewvc?rev=1899779&view=rev Log: improvements to, fixes for jira issue XERCESJ-1743 Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertXPath2EngineImpl.java Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java?rev=1899779&r1=1899778&r2=1899779&view=diff == --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java Tue Apr 12 12:51:12 2022 @@ -41,6 +41,7 @@ import org.apache.xerces.impl.xs.util.Ob import org.apache.xerces.impl.xs.util.ShortListImpl; import org.apache.xerces.impl.xs.util.StringListImpl; import org.apache.xerces.impl.xs.util.XSObjectListImpl; +import org.apache.xerces.util.NamespaceSupport; import org.apache.xerces.util.XML11Char; import org.apache.xerces.util.XMLChar; import org.apache.xerces.xni.NamespaceContext; @@ -825,6 +826,8 @@ public class XSSimpleTypeDecl implements void applyFacets(XSFacets facets, int presentFacet, int fixedFacet, short patternType, ValidationContext context) throws InvalidDatatypeFacetException { +boolean isXsd11 = context.getTypeValidatorHelper().isXMLSchema11(); + // if the object is immutable, should not apply facets... if(fIsImmutable) return; ValidatedInfo tempInfo = new ValidatedInfo(); @@ -949,39 +952,50 @@ public class XSSimpleTypeDecl implements } } -if (fAssertion != null && fAssertion.size() > 0) { +if (isXsd11) { // added for XML Schema 1.1 String enumVal = null; try { -Map assertProcessorParams = new HashMap(); - assertProcessorParams.put(Constants.XPATH2_NAMESPACE_CONTEXT, ((XSAssertImpl)fAssertion.get(0)). - getXPath2NamespaceContext()); +boolean isTypeDerivedFromList = ((XSSimpleType) this.getBaseType()). + getVariety() == XSSimpleType.VARIETY_LIST; +boolean isTypeDerivedFromUnion = ((XSSimpleType) this.getBaseType()). + getVariety() == XSSimpleType.VARIETY_UNION; +Map assertProcessorParams = new HashMap(); + assertProcessorParams.put(Constants.XPATH2_NAMESPACE_CONTEXT, new NamespaceSupport()); XMLAssertXPath2EngineImpl fAssertionProcessor = new XMLAssertXPath2EngineImpl(assertProcessorParams); fAssertionProcessor.initXPathProcessor(); + QName elemQname = new QName(null, "enumeration", "enumeration", Constants.NS_XMLSCHEMA); QName attrQname = new QName(null, "value", "value", null); -boolean isTypeDerivedFromList = ((XSSimpleType) this.getBaseType().getBaseType()). - getVariety() == XSSimpleType.VARIETY_LIST; -boolean isTypeDerivedFromUnion = ((XSSimpleType) this.getBaseType().getBaseType()). - getVariety() == XSSimpleType.VARIETY_UNION; -for (int idx = 0; idx < fAssertion.size(); idx++) { - XSAssertImpl assertImpl = (XSAssertImpl)fAssertion.get(idx); - for (int i = 0; i < size; i++) { - enumVal = (String)enumVals.elementAt(i); - Boolean isAssertSucceeded = fAssertionProcessor.evaluateOneAssertionFromSimpleType(elemQname, enumVal, null, - (XSSimpleTypeDefinition)this.getBaseType(), isTypeDerivedFromList, - isTypeDerivedFromUnion, assertImpl, true, attrQname, true); - if (isAssertSucceeded.booleanValue() == false) {
svn commit: r1899771 - in /xerces/java/branches/xml-schema-1.1-tests: data/jira_bugs/1743_2.xml data/jira_bugs/1743_2.xsd src/org/apache/xerces/tests/JiraBugsTests.java
Author: mukulg Date: Tue Apr 12 09:08:03 2022 New Revision: 1899771 URL: http://svn.apache.org/viewvc?rev=1899771&view=rev Log: xercesj commit: fixes to xsd 1.1 test cases Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xml xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xsd 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/1743_2.xml URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xml?rev=1899771&view=auto == --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xml (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xml Tue Apr 12 09:08:03 2022 @@ -0,0 +1,2 @@ + +1 2 3 \ No newline at end of file Added: xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xsd URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xsd?rev=1899771&view=auto == --- xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xsd (added) +++ xerces/java/branches/xml-schema-1.1-tests/data/jira_bugs/1743_2.xsd Tue Apr 12 09:08:03 2022 @@ -0,0 +1,24 @@ + +http://www.w3.org/2001/XMLSchema";> + + + + + + + + + + + + + + + + + + + + + + \ 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=1899771&r1=1899770&r2=1899771&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 Tue Apr 12 09:08:03 2022 @@ -628,11 +628,44 @@ public class JiraBugsTests extends Xerce public void testJira_1743_1() { String schemapath = fDataDir+"/jira_bugs/1743_1.xsd"; try { - Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath)); + fSchemaFactory.setErrorHandler(this); + Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath)); assertTrue(failureList.size() == 1); + // test expected error messages +List expectedMsgList = new ArrayList(); +FailureMesgFragments mesgFragments = new FailureMesgFragments(); +mesgFragments.setMessageFragment("enumeration-valid-restriction: Enumeration value 'a' is not in " + + "the value space of the base type, Color"); +expectedMsgList.add(mesgFragments); +assertTrue(areErrorMessagesConsistent(expectedMsgList)); +fErrSysId.endsWith("1743_1.xsd"); } catch(Exception ex) { - assertEquals(ex.getMessage(), "enumeration-valid-restriction: Enumeration value" - + " 'a' is not in the value space of the base type, Color."); + ex.printStackTrace(); + assertTrue(false); + } + } + + public void testJira_1743_2() { + String xmlfile = fDataDir+"/jira_bugs/1743_2.xml"; + String schemapath = fDataDir+"/jira_bugs/1743_2.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("enumeration-valid-restriction: Enumeration value '2 3' is not " ++ "in the value space of the base type, ST1"); +expectedMsgList.add(mesgFragments); +assertTrue(areErrorMessagesConsistent(expectedMsgList)); +fErrSysId.endsWith("1743_2.xsd"); + } catch(Exception ex) { + ex.printStackTrace(); + assertTrue(false);
svn commit: r1899767 - in /xerces/java/trunk/src/org/apache/xerces: impl/ impl/dtd/ impl/xs/ impl/xs/models/ impl/xs/traversers/ parsers/ xinclude/
Author: mukulg Date: Tue Apr 12 07:55:58 2022 New Revision: 1899767 URL: http://svn.apache.org/viewvc?rev=1899767&view=rev Log: xercesj commit: cleaning unused imports. this shall help us maintain the codebase. Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java xerces/java/trunk/src/org/apache/xerces/impl/XMLErrorReporter.java xerces/java/trunk/src/org/apache/xerces/impl/XMLNamespaceBinder.java xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java xerces/java/trunk/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java xerces/java/trunk/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java xerces/java/trunk/src/org/apache/xerces/parsers/DOMParserImpl.java xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeHandler.java Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java?rev=1899767&r1=1899766&r2=1899767&view=diff == --- xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java Tue Apr 12 07:55:58 2022 @@ -40,6 +40,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLDocumentScanner; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * This class is responsible for scanning the structure and content Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java?rev=1899767&r1=1899766&r2=1899767&view=diff == --- xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java Tue Apr 12 07:55:58 2022 @@ -37,6 +37,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLDTDScanner; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * This class is responsible for scanning XML document structure Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java?rev=1899767&r1=1899766&r2=1899767&view=diff == --- xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/XMLEntityManager.java Tue Apr 12 07:55:58 2022 @@ -61,6 +61,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * The entity manager handles the registration of general and parameter Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLErrorReporter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLErrorReporter.java?rev=1899767&r1=1899766&r2=1899767&view=diff == --- xerces/java/trunk/src/org/apache/xerces/impl/XMLErrorReporter.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/XMLErrorReporter.java Tue Apr 12 07:55:58 2022 @@ -31,6 +31,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLErrorHandler; import org.apache.xerces.xni.parser.XMLParseException; import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * Th
svn commit: r1899766 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces: impl/ impl/dtd/ impl/scd/ impl/validation/ impl/xs/ impl/xs/models/ impl/xs/traversers/ parsers/ xinclude/
Author: mukulg Date: Tue Apr 12 07:53:53 2022 New Revision: 1899766 URL: http://svn.apache.org/viewvc?rev=1899766&view=rev Log: xercesj commit: cleaning unused imports. this shall help us maintain the codebase. Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityManager.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLErrorReporter.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLNamespaceBinder.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLScanner.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDProcessor.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/scd/SCDParser.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidatorBase.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParserImpl.java xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java?rev=1899766&r1=1899765&r2=1899766&view=diff == --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java Tue Apr 12 07:53:53 2022 @@ -40,6 +40,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLDocumentScanner; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * This class is responsible for scanning the structure and content Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java?rev=1899766&r1=1899765&r2=1899766&view=diff == --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java Tue Apr 12 07:53:53 2022 @@ -37,6 +37,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLDTDScanner; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * This class is responsible for scanning XML document structure Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityManager.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityManager.java?rev=1899766&r1=1899765&r2=1899766&view=diff == --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityManager.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityManager.java Tue Apr 12 07:53:53 2022 @@ -61,6 +61,9 @@ import org.apache.xerces.xni.parser.XMLC import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.S