Author: mukulg
Date: Sun Dec 19 12:19:57 2021
New Revision: 1896156
URL: http://svn.apache.org/viewvc?rev=1896156&view=rev
Log:
xercesj commit: minor improvements to XML Schema 1.1 xpath 2.0 regex
compliance. within xpath 2.0 regex's, characters 0, a, e, f and v cannot be
escape characters.
Added:
xerces/java/branches/xs-1.1-tests/data/assertions/regex_3.xsd
xerces/java/branches/xs-1.1-tests/data/assertions/regex_invalid_2.xml
Modified:
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.1.jar?rev=1896156&r1=1896155&r2=1896156&view=diff
==============================================================================
Binary files - no diff available.
Added: xerces/java/branches/xs-1.1-tests/data/assertions/regex_3.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/assertions/regex_3.xsd?rev=1896156&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/assertions/regex_3.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/assertions/regex_3.xsd Sun Dec 19
12:19:57 2021
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:element name="X">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="a" type="xs:string"/>
+ </xs:sequence>
+ <xs:assert test="matches(a, '\05')"/>
+ <xs:assert test="matches(a, '\a')"/>
+ <xs:assert test="matches(a, '\e')"/>
+ <xs:assert test="matches(a, '\f')"/>
+ <xs:assert test="matches(a, '\v')"/>
+ <xs:assert test="matches(a, '7')"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/assertions/regex_invalid_2.xml
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/assertions/regex_invalid_2.xml?rev=1896156&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/assertions/regex_invalid_2.xml
(added)
+++ xerces/java/branches/xs-1.1-tests/data/assertions/regex_invalid_2.xml Sun
Dec 19 12:19:57 2021
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<X>
+ <a>7</a>
+</X>
\ No newline at end of file
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java?rev=1896156&r1=1896155&r2=1896156&view=diff
==============================================================================
---
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java
(original)
+++
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java
Sun Dec 19 12:19:57 2021
@@ -2872,4 +2872,19 @@ public class AssertionTests extends Xerc
}
}
+ public void testAssert162() {
+ String xmlfile = fDataDir+"/assertions/regex_invalid_2.xml";
+ String schemapath = fDataDir+"/assertions/regex_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() == 5);
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
