Author: mukulg
Date: Wed Nov 13 05:42:47 2019
New Revision: 1869720
URL: http://svn.apache.org/viewvc?rev=1869720&view=rev
Log:
committing a minor fix to xsd 1.1 xpath error messages. fixing corresponding
test cases as well.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/AssertionTests.java
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TypeAlternativeTests.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties?rev=1869720&r1=1869719&r2=1869720&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
Wed Nov 13 05:42:47 2019
@@ -114,7 +114,7 @@
cvc-assertions-valid-union-elem = cvc-assertions-valid-union-elem:
Value ''{0}'' is not facet-valid with respect to the specified assertions, on
type ''{2}'' on element ''{1}''.
cvc-assertions-valid-union-attr = cvc-assertions-valid-union-attr:
Value ''{0}'' is not facet-valid with respect to the specified assertions, on
type ''{3}'' on attribute ''{2}'/@'{1}''.
cvc-xpath.3.13.4.2a = cvc-xpath.3.13.4.2a: XPST0003 - Assertion XPath
expression (''{0}'') on the schema type ''{1}'' couldn''t compile successfully.
- cvc-xpath.3.13.4.2b = cvc-xpath.3.13.4.2b: An assert XPath expression
such as (''{0}'') containing / or //, on the schema type ''{1}'', cannot yield
a valid result (since an assert tree is rooted at a parentless element).
+ cvc-xpath.3.13.4.2b = cvc-xpath.3.13.4.2b: An assert XPath expression
such as (''{0}'') starting with / or // is not acceptable, on the schema type
''{1}'' (since an assert XPath tree is rooted at a parentless element).
#schema valid (3.X.3)
@@ -353,7 +353,7 @@
c-general-xpath = c-general-xpath: The expression ''{0}'' is not valid
with respect to the XPath subset supported by XML Schema.
c-general-xpath-ns = c-general-xpath-ns: A namespace prefix in XPath
expression ''{0}'' was not bound to a namespace.
c-cta-xpath = c-cta-xpath: The XPath expression ''{0}'' couldn''t
compile successfully in ''{1}'' mode, during CTA evaluation.
- c-cta-xpath-b = c-cta-xpath-b: The CTA XPath expression such as
(''{0}'') containing / or //, while in ''{1}'' mode, cannot yield a valid
result (since a CTA tree is rooted at a parentless element).
+ c-cta-xpath-b = c-cta-xpath-b: The CTA XPath expression such as
(''{0}'') starting with / or // is not acceptable, while in ''{1}'' mode (since
a CTA XPath tree is rooted at a parentless element).
c-cta-xpath-serr = c-cta-xpath-serr: The XPath expression ''{0}''
couldn''t compile successfully in ''{1}'' mode, during CTA evaluation. A static
error ''{2}'' occured in the XPath expression.
c-selector-xpath = c-selector-xpath: The selector value = ''{0}'' is
not valid; selector xpaths cannot contain attributes.
EmptyTargetNamespace = EmptyTargetNamespace: In schema document
''{0}'', the value of the ''targetNamespace'' attribute cannot be an empty
string.
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=1869720&r1=1869719&r2=1869720&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
Wed Nov 13 05:42:47 2019
@@ -2376,10 +2376,10 @@ public class AssertionTests extends Xerc
// test expected warning messages
List expectedMsgList = new ArrayList();
FailureMesgFragments mesgFragments = new FailureMesgFragments();
- mesgFragments.setMessageFragment("cvc-xpath.3.13.4.2b: An assert
XPath expression such as ('/X') containing / or //, on the schema type 'TYP1',
cannot yield a valid result (since an assert tree is rooted at a parentless
element).");
+ mesgFragments.setMessageFragment("cvc-xpath.3.13.4.2b: An assert
XPath expression such as ('/X') starting with / or // is not acceptable, on the
schema type 'TYP1' (since an assert XPath tree is rooted at a parentless
element).");
expectedMsgList.add(mesgFragments);
mesgFragments = new FailureMesgFragments();
- mesgFragments.setMessageFragment("cvc-xpath.3.13.4.2b: An assert
XPath expression such as ('X[//Y]') containing / or //, on the schema type
'TYP1', cannot yield a valid result (since an assert tree is rooted at a
parentless element).");
+ mesgFragments.setMessageFragment("cvc-xpath.3.13.4.2b: An assert
XPath expression such as ('X[//Y]') starting with / or // is not acceptable, on
the schema type 'TYP1' (since an assert XPath tree is rooted at a parentless
element).");
expectedMsgList.add(mesgFragments);
assertTrue(areErrorMessagesConsistent(expectedMsgList));
} catch(Exception ex) {
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TypeAlternativeTests.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TypeAlternativeTests.java?rev=1869720&r1=1869719&r2=1869720&view=diff
==============================================================================
---
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TypeAlternativeTests.java
(original)
+++
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TypeAlternativeTests.java
Wed Nov 13 05:42:47 2019
@@ -255,7 +255,7 @@ public class TypeAlternativeTests extend
// test expected warning messages
List expectedMsgList = new ArrayList();
FailureMesgFragments mesgFragments = new FailureMesgFragments();
- mesgFragments.setMessageFragment("c-cta-xpath-b: The CTA XPath
expression such as ('/E1') containing / or //, while in 'cta-full' mode, cannot
yield a valid result (since a CTA tree is rooted at a parentless element).");
+ mesgFragments.setMessageFragment("c-cta-xpath-b: The CTA XPath
expression such as ('/E1') starting with / or // is not acceptable, while in
'cta-full' mode (since a CTA XPath tree is rooted at a parentless element).");
expectedMsgList.add(mesgFragments);
assertTrue(areErrorMessagesConsistent(expectedMsgList));
} catch(Exception ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
