You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2026/05/06 12:31:07 UTC

(xerces-j) branch main updated: Combine JUnit tasks and turn on passing config tests (#94)

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xerces-j.git


The following commit(s) were added to refs/heads/main by this push:
     new 11b8a5f4a  Combine JUnit tasks and turn on passing config tests (#94)
11b8a5f4a is described below

commit 11b8a5f4ae90d9406ba767ba3ef9b67b00f06bc4
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Wed May 6 12:31:01 2026 +0000

     Combine JUnit tasks and turn on passing config tests (#94)
    
    * Combine JUnit tasks
    
    * wip
    
    * Combine annotation tests
    
    * Remove main methods
    
    * config tests
    
    * Remove main methods
    
    * delete suite class
---
 build.xml                                          | 65 +++++++++-------------
 tests/idc/AllTests.java                            | 42 --------------
 tests/schema/annotations/AllTests.java             | 51 -----------------
 tests/schema/annotations/TestCase.java             |  8 ---
 .../annotations/XSAttributeAnnotationsTest.java    | 10 +---
 .../XSAttributeGroupAnnotationsTest.java           |  4 --
 .../annotations/XSAttributeUseAnnotationsTest.java |  4 --
 .../annotations/XSElementAnnotationsTest.java      |  4 --
 .../schema/annotations/XSFacetAnnotationsTest.java |  9 ---
 .../annotations/XSModelGroupAnnotationsTest.java   |  4 --
 .../XSModelGroupDefinitionAnnotationsTest.java     |  5 --
 .../annotations/XSNotationAnnotationsTest.java     |  4 --
 .../annotations/XSParticleAnnotationsTest.java     |  9 ---
 .../annotations/XSWildcardAnnotationsTest.java     |  4 --
 tests/schema/config/AllTests.java                  | 53 ------------------
 tests/schema/config/BasicTest.java                 |  4 --
 tests/schema/config/FeaturePropagationTest.java    |  4 --
 tests/schema/config/FixedAttrTest.java             |  4 --
 tests/schema/config/IdIdrefCheckingTest.java       |  4 --
 .../config/IdentityConstraintCheckingTest.java     |  4 --
 tests/schema/config/IgnoreXSIType_A_A_Test.java    |  4 --
 tests/schema/config/IgnoreXSIType_A_C_Test.java    |  4 --
 tests/schema/config/IgnoreXSIType_C_AC_Test.java   |  4 --
 tests/schema/config/IgnoreXSIType_C_A_Test.java    |  4 --
 tests/schema/config/IgnoreXSIType_C_CA_Test.java   |  4 --
 tests/schema/config/IgnoreXSIType_C_C_Test.java    |  4 --
 .../config/RootSimpleTypeDefinitionTest.java       |  4 --
 tests/schema/config/RootTypeDefinitionTest.java    |  4 --
 tests/schema/config/SurrogatePairLengthTest.java   |  4 --
 .../schema/config/UnparsedEntityCheckingTest.java  |  5 +-
 .../config/UseGrammarPoolOnly_False_Test.java      |  4 --
 .../config/UseGrammarPoolOnly_True_Test.java       |  4 --
 32 files changed, 27 insertions(+), 318 deletions(-)

diff --git a/build.xml b/build.xml
index cc779b5bf..795d0613f 100644
--- a/build.xml
+++ b/build.xml
@@ -822,13 +822,35 @@ Authors:
         <batchtest fork="yes" todir="test-reports">
           <fileset dir="${build.dir}/classes">
              <include name="dom/traversal/*Test.class"/>                    
-             <include name="dom/range/*Test*.class"/>                    
-             <exclude name="dom/range/Test.class"/>                    
+             <include name="dom/range/TestCompare.class"/>                    
+             <include name="idc/IDConstraintTests.class"/>                    
+             <include name="schema/annotations/*Test.class"/>                    
+             <include name="schema/config/BasicTest.class"/>                    
+             <include name="schema/config/FeaturePropagationTest.class"/>                    
+             <include name="schema/config/FixedAttrTest.class"/> 
+             <include name="schema/config/IdentityConstraintCheckingTest.class"/>
+             <include name="schema/config/IdIdrefCheckingTest.class"/>
+             <include name="schema/config/IgnoreXSIType_A_A_Test.class"/>
+             <include name="schema/config/IgnoreXSIType_A_C_Test.class"/>
+             <include name="schema/config/IgnoreXSIType_C_A_Test.class"/>
+             <include name="schema/config/RootSimpleTypeDefinitionTest.class"/>
+             <include name="schema/config/RootTypeDefinitionTest.class"/>
+             <include name="schema/config/UseGrammarPoolOnly_False_Test.class"/>
+          <!-- These tests are failing. Fix them.
+             <include name="schema/config/IgnoreXSIType_C_AC_Test.class"/>
+             <include name="schema/config/IgnoreXSIType_C_CA_Test.class"/>
+             <include name="schema/config/IgnoreXSIType_C_C_Test.class"/>
+             <include name="schema/config/SurrogatePairLengthTest.class"/>
+             <include name="schema/config/UseGrammarPoolOnly_True_Test.class"/>
+             <include name="schema/config/UnparsedEntityCheckingTest.class"/>
+            -->             
            </fileset>
          </batchtest>
+
          
        <formatter type="brief" usefile="false"/>
     </junit>
+    <fail if="test.failed" message="JUnit tests failed! Check the output above."/>
 
     <echo message="Performing sanity test for ${parser.Name} ${parser.Version} ..." />
     <echo message="Using classpath='${run.classpath.string}'" />
@@ -910,7 +932,6 @@ Authors:
           classpathref="test.classpath"
           failOnError="yes">
     </java>
-
 <!--  
      TODO fix this test
      [java] error: Error occurred - Feature 'http://apache.org/xml/features/validation/schema' is not recognized.
@@ -930,33 +951,6 @@ Authors:
           classpathref="test.classpath"
           failOnError="yes">
     </java>
-    <!-- TODO some of these tests pass so I need to split them in such a way that we can enable them -->
-    <!-- These tests are failing. Fix them. 
-    <echo message="Running schema.config.AllTests..." />
-    <junit fork="yes"
-           haltonfailure="no" 
-           haltonerror="no" 
-           failureproperty="test.failed" 
-           errorproperty="test.failed"
-           showoutput="yes">
-        <classpath refid="test.classpath"/>
-        <test name="schema.config.AllTests"/>
-        <formatter type="brief" usefile="false"/>
-    </junit>
-    -->
-    <echo message="Running schema.annotations.AllTests..." />
-    <junit haltonfailure="no" 
-           haltonerror="no" 
-           failureproperty="test.failed" 
-           errorproperty="test.failed"
-           showoutput="yes">
-        <classpath>
-          <path refid="test.classpath"/>
-          <pathelement location="tests"/>
-        </classpath>
-        <test name="schema.annotations.AllTests"/>
-        <formatter type="brief" usefile="false"/>
-    </junit>
     <echo message="Running jaxp.PropertyTest..." />
     <java fork="yes"
           classname="jaxp.PropertyTest"
@@ -990,16 +984,7 @@ Authors:
           classname="dom.dom3.Test"
           classpathref="test.classpath"
           failOnError="yes">
-    </java>
-    <echo message="Running idc.AllTests..." />
-    <java fork="yes"
-          classname="idc.AllTests"
-          classpathref="test.classpath"
-          failOnError="yes">
-    </java>
-    
-    <fail if="test.failed" message="JUnit tests failed! Check the output above."/>
-    
+    </java>   
   </target>
 
   <target name="ci-test" depends="test">
diff --git a/tests/idc/AllTests.java b/tests/idc/AllTests.java
deleted file mode 100644
index 753416709..000000000
--- a/tests/idc/AllTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package idc;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * XSD IDC constraints tests.
- * 
- * @author <a href="mailto:mukulg@apache.org">Mukul Gandhi</a>
- * @version $Id$
- */
-public class AllTests {
-    
-    public static void main(String[] args) {
-        TestRunner.run(AllTests.suite());
-    }
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite("Tests for XSD IDC constraints.");
-        suite.addTestSuite(IDConstraintTests.class);
-        return suite;
-    }
-
-}
diff --git a/tests/schema/annotations/AllTests.java b/tests/schema/annotations/AllTests.java
deleted file mode 100644
index c28a72d92..000000000
--- a/tests/schema/annotations/AllTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package schema.annotations;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * All XSModel Tests
- * 
- * @author Neil Delima, IBM
- * @version $Id$
- */
-public class AllTests {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AllTests.suite());
-    }
-    public static Test suite() {
-        TestSuite suite = new TestSuite("Test for Schema Annotations");
-        //$JUnit-BEGIN$
-        suite.addTestSuite(XSAttributeGroupAnnotationsTest.class);
-        suite.addTestSuite(XSNotationAnnotationsTest.class);
-        suite.addTestSuite(XSElementAnnotationsTest.class);
-        suite.addTestSuite(XSAttributeUseAnnotationsTest.class);
-        suite.addTestSuite(XSAttributeAnnotationsTest.class);
-        suite.addTestSuite(XSFacetAnnotationsTest.class);
-        suite.addTestSuite(XSModelGroupDefinitionAnnotationsTest.class);
-        suite.addTestSuite(XSModelGroupAnnotationsTest.class);
-        suite.addTestSuite(XSParticleAnnotationsTest.class);
-        suite.addTestSuite(XSWildcardAnnotationsTest.class);
-        //$JUnit-END$
-        return suite;
-    }
-
-}
diff --git a/tests/schema/annotations/TestCase.java b/tests/schema/annotations/TestCase.java
index 75b20cf3f..33bf4a81f 100644
--- a/tests/schema/annotations/TestCase.java
+++ b/tests/schema/annotations/TestCase.java
@@ -65,12 +65,4 @@ public class TestCase extends junit.framework.TestCase {
         return String.copyValueOf(dest,0,j-1);
     }
 
-    /**
-     * 
-     * @param args
-     */
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(TestCase.class);
-    }
-
 }
diff --git a/tests/schema/annotations/XSAttributeAnnotationsTest.java b/tests/schema/annotations/XSAttributeAnnotationsTest.java
index 15572cba6..ae722724b 100644
--- a/tests/schema/annotations/XSAttributeAnnotationsTest.java
+++ b/tests/schema/annotations/XSAttributeAnnotationsTest.java
@@ -69,8 +69,8 @@ public class XSAttributeAnnotationsTest extends TestCase {
             fConfig.setParameter("validate", Boolean.TRUE);
 
         } catch (Exception e) {
-            fail("Expecting a NullPointerException");
             System.err.println("SETUP FAILED: XSAttributeAnnotationsTest");
+            fail("Expecting a NullPointerException");
         }
     }
 
@@ -253,12 +253,4 @@ public class XSAttributeAnnotationsTest extends TestCase {
         assertEquals("Synthetic Annotation Empty", 0, annotations.getLength());
     }
 
-    /**
-     * 
-     * @param args
-     */
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSAttributeAnnotationsTest.class);
-    }
-
 }
diff --git a/tests/schema/annotations/XSAttributeGroupAnnotationsTest.java b/tests/schema/annotations/XSAttributeGroupAnnotationsTest.java
index 7ed9a3368..1709d499a 100644
--- a/tests/schema/annotations/XSAttributeGroupAnnotationsTest.java
+++ b/tests/schema/annotations/XSAttributeGroupAnnotationsTest.java
@@ -278,8 +278,4 @@ public class XSAttributeGroupAnnotationsTest extends TestCase {
             assertEquals(trim(expectedResult), trim(actual));
         }
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSAttributeGroupAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSAttributeUseAnnotationsTest.java b/tests/schema/annotations/XSAttributeUseAnnotationsTest.java
index 8167f8d51..c1a9a197b 100644
--- a/tests/schema/annotations/XSAttributeUseAnnotationsTest.java
+++ b/tests/schema/annotations/XSAttributeUseAnnotationsTest.java
@@ -318,8 +318,4 @@ public class XSAttributeUseAnnotationsTest extends TestCase {
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
 
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSAttributeUseAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSElementAnnotationsTest.java b/tests/schema/annotations/XSElementAnnotationsTest.java
index 7483d7e2e..8a547d9ac 100644
--- a/tests/schema/annotations/XSElementAnnotationsTest.java
+++ b/tests/schema/annotations/XSElementAnnotationsTest.java
@@ -250,8 +250,4 @@ public class XSElementAnnotationsTest extends TestCase {
         XSObjectList annotations = elem.getAnnotations();
         assertEquals("TEST5_NO_ANNOTATIONS", 0, annotations.getLength());
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSElementAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSFacetAnnotationsTest.java b/tests/schema/annotations/XSFacetAnnotationsTest.java
index d8c904bb3..6acb028aa 100644
--- a/tests/schema/annotations/XSFacetAnnotationsTest.java
+++ b/tests/schema/annotations/XSFacetAnnotationsTest.java
@@ -734,13 +734,4 @@ public class XSFacetAnnotationsTest extends TestCase {
                 expected,
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
     }
-
-    /**
-     * 
-     * @param args
-     */
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSFacetAnnotationsTest.class);
-    }
-
 }
diff --git a/tests/schema/annotations/XSModelGroupAnnotationsTest.java b/tests/schema/annotations/XSModelGroupAnnotationsTest.java
index d7f7e9bb4..f71987c62 100644
--- a/tests/schema/annotations/XSModelGroupAnnotationsTest.java
+++ b/tests/schema/annotations/XSModelGroupAnnotationsTest.java
@@ -519,8 +519,4 @@ public class XSModelGroupAnnotationsTest extends TestCase {
                 trim(((XSAnnotation) part.getAnnotations().item(0))
                         .getAnnotationString()));
     } **/
-    
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSModelGroupAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSModelGroupDefinitionAnnotationsTest.java b/tests/schema/annotations/XSModelGroupDefinitionAnnotationsTest.java
index 8961b6f30..c9f58a677 100644
--- a/tests/schema/annotations/XSModelGroupDefinitionAnnotationsTest.java
+++ b/tests/schema/annotations/XSModelGroupDefinitionAnnotationsTest.java
@@ -210,9 +210,4 @@ public class XSModelGroupDefinitionAnnotationsTest extends TestCase {
                 expected,
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner
-                .run(XSModelGroupDefinitionAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSNotationAnnotationsTest.java b/tests/schema/annotations/XSNotationAnnotationsTest.java
index d293aedeb..15d7efb70 100644
--- a/tests/schema/annotations/XSNotationAnnotationsTest.java
+++ b/tests/schema/annotations/XSNotationAnnotationsTest.java
@@ -228,8 +228,4 @@ public class XSNotationAnnotationsTest extends TestCase {
                 trim(expected),
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSNotationAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/annotations/XSParticleAnnotationsTest.java b/tests/schema/annotations/XSParticleAnnotationsTest.java
index e597618fc..df0e46d7f 100644
--- a/tests/schema/annotations/XSParticleAnnotationsTest.java
+++ b/tests/schema/annotations/XSParticleAnnotationsTest.java
@@ -563,13 +563,4 @@ public class XSParticleAnnotationsTest extends TestCase {
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
 
     }
-
-    /**
-     * 
-     * @param args
-     */
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSParticleAnnotationsTest.class);
-    }
-
 }
diff --git a/tests/schema/annotations/XSWildcardAnnotationsTest.java b/tests/schema/annotations/XSWildcardAnnotationsTest.java
index 9c013da7e..d3857217e 100644
--- a/tests/schema/annotations/XSWildcardAnnotationsTest.java
+++ b/tests/schema/annotations/XSWildcardAnnotationsTest.java
@@ -336,8 +336,4 @@ public class XSWildcardAnnotationsTest extends TestCase {
                 expected,
                 trim(((XSAnnotation) annotations.item(0)).getAnnotationString()));
     }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(XSWildcardAnnotationsTest.class);
-    }
 }
diff --git a/tests/schema/config/AllTests.java b/tests/schema/config/AllTests.java
deleted file mode 100644
index 74423f7d2..000000000
--- a/tests/schema/config/AllTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package schema.config;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Peter McCracken, IBM
- * @version $Id$
- */
-public class AllTests {
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AllTests.suite());
-    }
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite("Tests for various schema validation configurations.");
-        suite.addTestSuite(BasicTest.class);
-        suite.addTestSuite(RootTypeDefinitionTest.class);
-        suite.addTestSuite(RootSimpleTypeDefinitionTest.class);
-        suite.addTestSuite(IgnoreXSIType_C_A_Test.class);
-        suite.addTestSuite(IgnoreXSIType_C_C_Test.class);
-        suite.addTestSuite(IgnoreXSIType_A_A_Test.class);
-        suite.addTestSuite(IgnoreXSIType_A_C_Test.class);
-        suite.addTestSuite(IgnoreXSIType_C_AC_Test.class);
-        suite.addTestSuite(IgnoreXSIType_C_CA_Test.class);
-        suite.addTestSuite(IdIdrefCheckingTest.class);
-        suite.addTestSuite(UnparsedEntityCheckingTest.class);
-        suite.addTestSuite(IdentityConstraintCheckingTest.class);
-        suite.addTestSuite(UseGrammarPoolOnly_True_Test.class);
-        suite.addTestSuite(UseGrammarPoolOnly_False_Test.class);
-        suite.addTestSuite(FixedAttrTest.class);
-        suite.addTestSuite(FeaturePropagationTest.class);
-        return suite;
-    }
-}
diff --git a/tests/schema/config/BasicTest.java b/tests/schema/config/BasicTest.java
index 4772f543f..f544cadee 100644
--- a/tests/schema/config/BasicTest.java
+++ b/tests/schema/config/BasicTest.java
@@ -28,10 +28,6 @@ import org.apache.xerces.xs.ItemPSVI;
  */
 public class BasicTest extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(BasicTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "base.xml";
     }
diff --git a/tests/schema/config/FeaturePropagationTest.java b/tests/schema/config/FeaturePropagationTest.java
index 6d731578c..77aa0bb8f 100644
--- a/tests/schema/config/FeaturePropagationTest.java
+++ b/tests/schema/config/FeaturePropagationTest.java
@@ -44,10 +44,6 @@ public class FeaturePropagationTest extends TestCase {
     public final String FEATURE_STRING_DEFAULT_TRUE = "http://apache.org/xml/features/validation/schema-full-checking";
     public final String SECURITY_MANAGER = "http://apache.org/xml/properties/security-manager";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(FeaturePropagationTest.class);
-    }
-    
     public FeaturePropagationTest(String name) {
         super(name);
     }
diff --git a/tests/schema/config/FixedAttrTest.java b/tests/schema/config/FixedAttrTest.java
index 911035458..53b71e93e 100644
--- a/tests/schema/config/FixedAttrTest.java
+++ b/tests/schema/config/FixedAttrTest.java
@@ -32,10 +32,6 @@ import org.apache.xerces.xs.ItemPSVI;
  */
 public class FixedAttrTest extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(FixedAttrTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "fixedAttr.xml";
     }
diff --git a/tests/schema/config/IdIdrefCheckingTest.java b/tests/schema/config/IdIdrefCheckingTest.java
index a87fd8064..6b86c2d8e 100644
--- a/tests/schema/config/IdIdrefCheckingTest.java
+++ b/tests/schema/config/IdIdrefCheckingTest.java
@@ -34,10 +34,6 @@ public class IdIdrefCheckingTest extends BaseTest {
     
     public static final String NO_ID_BINDING = "cvc-id.1";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IdIdrefCheckingTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "idIdref.xml";
     }
diff --git a/tests/schema/config/IdentityConstraintCheckingTest.java b/tests/schema/config/IdentityConstraintCheckingTest.java
index a506f8546..df0c66942 100644
--- a/tests/schema/config/IdentityConstraintCheckingTest.java
+++ b/tests/schema/config/IdentityConstraintCheckingTest.java
@@ -37,10 +37,6 @@ public class IdentityConstraintCheckingTest extends BaseTest {
     
     public static final String INVALID_KEYREF = "cvc-identity-constraint.4.3";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IdentityConstraintCheckingTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "idc.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_A_A_Test.java b/tests/schema/config/IgnoreXSIType_A_A_Test.java
index 87874110d..59cb0ce3f 100644
--- a/tests/schema/config/IgnoreXSIType_A_A_Test.java
+++ b/tests/schema/config/IgnoreXSIType_A_A_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_A_A_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_A_A_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_A_A.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_A_C_Test.java b/tests/schema/config/IgnoreXSIType_A_C_Test.java
index 3be3d9cc6..0b496bcee 100644
--- a/tests/schema/config/IgnoreXSIType_A_C_Test.java
+++ b/tests/schema/config/IgnoreXSIType_A_C_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_A_C_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_A_C_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_A_C.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_C_AC_Test.java b/tests/schema/config/IgnoreXSIType_C_AC_Test.java
index bb21cea2f..b2d9f4409 100644
--- a/tests/schema/config/IgnoreXSIType_C_AC_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_AC_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_C_AC_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_C_AC_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_C_AC.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_C_A_Test.java b/tests/schema/config/IgnoreXSIType_C_A_Test.java
index cff236339..04fac77cc 100644
--- a/tests/schema/config/IgnoreXSIType_C_A_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_A_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_C_A_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_C_A_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_C_A.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_C_CA_Test.java b/tests/schema/config/IgnoreXSIType_C_CA_Test.java
index 689206a5d..58425c9af 100644
--- a/tests/schema/config/IgnoreXSIType_C_CA_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_CA_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_C_CA_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_C_CA_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_C_CA.xml";
     }
diff --git a/tests/schema/config/IgnoreXSIType_C_C_Test.java b/tests/schema/config/IgnoreXSIType_C_C_Test.java
index 4567bb5ed..27e3c50a9 100644
--- a/tests/schema/config/IgnoreXSIType_C_C_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_C_Test.java
@@ -29,10 +29,6 @@ import org.xml.sax.SAXException;
  */
 public class IgnoreXSIType_C_C_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(IgnoreXSIType_C_C_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "xsitype_C_C.xml";
     }
diff --git a/tests/schema/config/RootSimpleTypeDefinitionTest.java b/tests/schema/config/RootSimpleTypeDefinitionTest.java
index 839b6f4aa..391041dc9 100644
--- a/tests/schema/config/RootSimpleTypeDefinitionTest.java
+++ b/tests/schema/config/RootSimpleTypeDefinitionTest.java
@@ -37,10 +37,6 @@ public class RootSimpleTypeDefinitionTest extends BaseTest {
     private final static String INVALID_TYPE_ERROR = "cvc-type.3.1.3";
     private final static String MININCLUSIVE_DERIVATION_ERROR = "cvc-minInclusive-valid";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RootSimpleTypeDefinitionTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "simpleType.xml";
     }
diff --git a/tests/schema/config/RootTypeDefinitionTest.java b/tests/schema/config/RootTypeDefinitionTest.java
index f06f5518c..e3b83eecc 100644
--- a/tests/schema/config/RootTypeDefinitionTest.java
+++ b/tests/schema/config/RootTypeDefinitionTest.java
@@ -47,10 +47,6 @@ public class RootTypeDefinitionTest extends BaseTest {
     
     private final static String INVALID_DERIVATION_ERROR = "cvc-elt.4.3";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RootTypeDefinitionTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "base.xml";
     }
diff --git a/tests/schema/config/SurrogatePairLengthTest.java b/tests/schema/config/SurrogatePairLengthTest.java
index 26a06a413..57ab99e81 100644
--- a/tests/schema/config/SurrogatePairLengthTest.java
+++ b/tests/schema/config/SurrogatePairLengthTest.java
@@ -34,10 +34,6 @@ public class SurrogatePairLengthTest extends BaseTest {
     
     private static final String LENGTH_ERROR = "cvc-length-valid";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(SurrogatePairLengthTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "surrogate.xml";
     }
diff --git a/tests/schema/config/UnparsedEntityCheckingTest.java b/tests/schema/config/UnparsedEntityCheckingTest.java
index f8d5110a7..3c7798fc6 100644
--- a/tests/schema/config/UnparsedEntityCheckingTest.java
+++ b/tests/schema/config/UnparsedEntityCheckingTest.java
@@ -31,10 +31,6 @@ public class UnparsedEntityCheckingTest extends BaseTest {
     
     public static final String UNDECLARED_ENTITY = "UndeclaredEntity";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(UnparsedEntityCheckingTest.class);
-    }
-    
     protected String getXMLDocument() {
         return "unparsedEntity.xml";
     }
@@ -59,6 +55,7 @@ public class UnparsedEntityCheckingTest extends BaseTest {
         }
         
         checkDefault();
+        throw new RuntimeException();
     }
     
     public void testSetFalseValid() {
diff --git a/tests/schema/config/UseGrammarPoolOnly_False_Test.java b/tests/schema/config/UseGrammarPoolOnly_False_Test.java
index 9d5952c15..baec0e893 100644
--- a/tests/schema/config/UseGrammarPoolOnly_False_Test.java
+++ b/tests/schema/config/UseGrammarPoolOnly_False_Test.java
@@ -30,10 +30,6 @@ public class UseGrammarPoolOnly_False_Test extends BaseTest {
     private final static String UNKNOWN_TYPE_ERROR = "cvc-type.1";
     private final static String INVALID_DERIVATION_ERROR = "cvc-elt.4.3";
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(UseGrammarPoolOnly_False_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "otherNamespace.xml";
     }
diff --git a/tests/schema/config/UseGrammarPoolOnly_True_Test.java b/tests/schema/config/UseGrammarPoolOnly_True_Test.java
index 9a4b17435..35fc054d5 100644
--- a/tests/schema/config/UseGrammarPoolOnly_True_Test.java
+++ b/tests/schema/config/UseGrammarPoolOnly_True_Test.java
@@ -27,10 +27,6 @@ import org.apache.xerces.xs.ItemPSVI;
  */
 public class UseGrammarPoolOnly_True_Test extends BaseTest {
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(UseGrammarPoolOnly_True_Test.class);
-    }
-    
     protected String getXMLDocument() {
         return "otherNamespace.xml";
     }


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