Author: mukulg
Date: Tue Dec 21 13:23:55 2021
New Revision: 1896245
URL: http://svn.apache.org/viewvc?rev=1896245&view=rev
Log:
xercesj commit: minor improvements to xpath 2.0 regex unicode support.
committing related test case as well.
Added:
xerces/java/branches/xs-1.1-tests/data/assertions/unicode/
xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_test_1.xsd
xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_valid_1.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=1896245&r1=1896244&r2=1896245&view=diff
==============================================================================
Binary files - no diff available.
Added:
xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_test_1.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_test_1.xsd?rev=1896245&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_test_1.xsd
(added)
+++ xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_test_1.xsd
Tue Dec 21 13:23:55 2021
@@ -0,0 +1,19 @@
+<?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" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:assert test="matches(a[1], '[\p{Ll}]+')"/>
+ <xs:assert test="matches(a[1], '[\p{IsBasicLatin}]+')"/>
+ <xs:assert test="matches(a[1], '[\P{IsLatin-1Supplement}]+')"/>
+ <xs:assert test="matches(a[1], '[\P{IsArabic}]+')"/>
+ <xs:assert test="matches(a[2], '[\p{IsLatin-1Supplement}]+')"/>
+ <xs:assert test="matches(a[3], '[\p{Lu}]+')"/>
+ <xs:assert test="matches(a[4], '[\p{L}]+')"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Added:
xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_valid_1.xml
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_valid_1.xml?rev=1896245&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_valid_1.xml
(added)
+++ xerces/java/branches/xs-1.1-tests/data/assertions/unicode/regex_valid_1.xml
Tue Dec 21 13:23:55 2021
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<X>
+ <a>abc</a>
+ <a>ÀÇ</a>
+ <a>ABCDEF</a>
+ <a>abcdefABCDEF</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=1896245&r1=1896244&r2=1896245&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
Tue Dec 21 13:23:55 2021
@@ -2887,4 +2887,20 @@ public class AssertionTests extends Xerc
}
}
+ public void testAssert163() {
+ String xmlfile =
fDataDir+"/assertions/unicode/regex_valid_1.xml";
+ String schemapath =
fDataDir+"/assertions/unicode/regex_test_1.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);
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
