You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2019/11/01 04:36:12 UTC

svn commit: r1869234 - in /xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests: ConditionalInclusionTests.java IDConstraintTests.java JiraBugsTests.java OverrideTests.java TargetNamespaceTests.java XercesAbstractTestCase.java

Author: mukulg
Date: Fri Nov  1 04:36:12 2019
New Revision: 1869234

URL: http://svn.apache.org/viewvc?rev=1869234&view=rev
Log:
we should set the feature http://apache.org/xml/features/validation/schema-full-checking to 'true' where ever possible while running XSD test cases. i'm doing this change with this commit.

Modified:
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/ConditionalInclusionTests.java
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/IDConstraintTests.java
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TargetNamespaceTests.java
    xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/XercesAbstractTestCase.java

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/ConditionalInclusionTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/ConditionalInclusionTests.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/ConditionalInclusionTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/ConditionalInclusionTests.java Fri Nov  1 04:36:12 2019
@@ -77,6 +77,7 @@ public class ConditionalInclusionTests e
 		String xmlfile = fDataDir+"/version-control/test37.xml";
 		String schemapath = fDataDir+"/version-control/test37.xsd";		
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -111,6 +112,7 @@ public class ConditionalInclusionTests e
 		String xmlfile = fDataDir+"/version-control/test38.xml";
 		String schemapath = fDataDir+"/version-control/test38.xsd";		
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -145,6 +147,7 @@ public class ConditionalInclusionTests e
 		String xmlfile = fDataDir+"/version-control/test40.xml";
 		String schemapath = fDataDir+"/version-control/test39.xsd";		
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -261,6 +264,7 @@ public class ConditionalInclusionTests e
 		try {
 			// test a) run validation in XSD 1.0 mode
 			// instance validation fails.
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 			fSchemaFactory = SchemaFactory.newInstance(DEFAULT_SCHEMA_LANGUAGE);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/IDConstraintTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/IDConstraintTests.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/IDConstraintTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/IDConstraintTests.java Fri Nov  1 04:36:12 2019
@@ -344,6 +344,7 @@ public class IDConstraintTests extends X
 		String xmlfile = fDataDir+"/idconstraints/idc_1_valid_1.xml";
 		String schemapath = fDataDir+"/idconstraints/idc_1.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -372,6 +373,7 @@ public class IDConstraintTests extends X
 		String xmlfile = fDataDir+"/idconstraints/idc_1_invalid_1.xml";
 		String schemapath = fDataDir+"/idconstraints/idc_1.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -422,6 +424,7 @@ public class IDConstraintTests extends X
 		String xmlfile = fDataDir+"/idconstraints/idc_1_invalid_2.xml";
 		String schemapath = fDataDir+"/idconstraints/idc_1.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -472,6 +475,7 @@ public class IDConstraintTests extends X
 		String xmlfile = fDataDir+"/idconstraints/idc_1_invalid_3.xml";
 		String schemapath = fDataDir+"/idconstraints/idc_1.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java Fri Nov  1 04:36:12 2019
@@ -184,6 +184,7 @@ public class JiraBugsTests extends Xerce
 		String xmlfile = fDataDir+"/jira_bugs/3.xml";	
 		String schemapath = fDataDir+"/jira_bugs/3.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -207,6 +208,7 @@ public class JiraBugsTests extends Xerce
 		String xmlfile = fDataDir+"/jira_bugs/3_1.xml";	
 		String schemapath = fDataDir+"/jira_bugs/3_1.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -254,6 +256,7 @@ public class JiraBugsTests extends Xerce
 		String xmlfile = fDataDir+"/jira_bugs/ag.xml";	
 		String schemapath = fDataDir+"/jira_bugs/ag3.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);
@@ -298,6 +301,7 @@ public class JiraBugsTests extends Xerce
 		String xmlfile = fDataDir+"/jira_bugs/gr.xml";	
 		String schemapath = fDataDir+"/jira_bugs/gr3.xsd";	
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/OverrideTests.java Fri Nov  1 04:36:12 2019
@@ -43,6 +43,7 @@ public class OverrideTests extends Xerce
 		String xmlfile = fDataDir+"/override/test1.xml";
 		String schemapath = fDataDir+"/override/test1.xsd";		
 		try {
+			fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		    Schema s = fSchemaFactory.newSchema(new StreamSource(schemapath));
             Validator v = s.newValidator();
 		    v.setErrorHandler(this);

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TargetNamespaceTests.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TargetNamespaceTests.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TargetNamespaceTests.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/TargetNamespaceTests.java Fri Nov  1 04:36:12 2019
@@ -117,6 +117,7 @@ public class TargetNamespaceTests extend
             // test 'b'
             // run validation in XSD 1.0 mode
     		fSchemaFactory = SchemaFactory.newInstance(DEFAULT_SCHEMA_LANGUAGE);
+    		fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
     		s = fSchemaFactory.newSchema(new StreamSource(schemapath));
     		v = s.newValidator();
 		    v.setErrorHandler(this);

Modified: xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/XercesAbstractTestCase.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/XercesAbstractTestCase.java?rev=1869234&r1=1869233&r2=1869234&view=diff
==============================================================================
--- xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/XercesAbstractTestCase.java (original)
+++ xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/XercesAbstractTestCase.java Fri Nov  1 04:36:12 2019
@@ -75,6 +75,7 @@ public class XercesAbstractTestCase exte
 		System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema/v1.1", SCHEMA_11_FACTORY);
 		fDataDir = System.getProperty("org.apache.xerces.tests.dataDir");
 		fSchemaFactory = SchemaFactory.newInstance(SCHEMA_11_LANGUAGE);
+		fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, true);
 		fSchemaFactory.setFeature(CTA_FULL_XPATH, true);
 		failureList = new ArrayList();
 		warningList = new ArrayList(); 
@@ -86,6 +87,7 @@ public class XercesAbstractTestCase exte
 		failureList = null;
 		warningList = null;
 		checkOnlyWarnings = false;
+		fSchemaFactory.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, false);
 		fSchemaFactory.setFeature(CTA_FULL_XPATH, false);
 	}
 	



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org