ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1798283 [2/2] - in /webservices/axiom/trunk: implementations/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/ testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c...
Date Fri, 09 Jun 2017 21:19:29 GMT
Copied: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/ResolveURI.aj (from r1798282, webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/ResolveURI.aj)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/ResolveURI.aj?p2=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/ResolveURI.aj&p1=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/ResolveURI.aj&r1=1798282&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/ResolveURI.aj (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/ResolveURI.aj Fri Jun  9 21:19:29 2017
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
+package org.apache.axiom.ts.dom.w3c;
 
 import java.net.URL;
 

Copied: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java (from r1798257, webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java?p2=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java&p1=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java&r1=1798257&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CDOMTestSuiteBuilder.java Fri Jun  9 21:19:29 2017
@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
-
-import static org.apache.axiom.testing.multiton.Multiton.getInstances;
+package org.apache.axiom.ts.dom.w3c;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -26,14 +24,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
-import org.apache.axiom.ts.jaxp.DOMImplementation;
-import org.apache.axiom.ts.jaxp.XSLTImplementation;
-import org.apache.axiom.ts.xml.XMLSample;
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
 import org.objectweb.asm.ClassReader;
 import org.w3c.domts.DOMTestCase;
 import org.w3c.domts.DOMTestDocumentBuilderFactory;
@@ -42,174 +34,17 @@ import org.w3c.domts.DOMTestSink;
 import org.w3c.domts.DOMTestSuite;
 import org.w3c.domts.DocumentBuilderSetting;
 
-public final class DOMTestSuiteBuilder extends MatrixTestSuiteBuilder {
-    private static final QName[] validAttrQNames = new QName[] {
-        new QName("urn:ns2", "attr", "q"),
-        new QName("", "attr", ""),
-        new QName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "ns", XMLConstants.XMLNS_ATTRIBUTE),
-        new QName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE, ""),
-    };
-    
-    private static final QName[] invalidAttrQNames = new QName[] {
-        new QName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "attr", ""),
-        new QName(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "attr", "p"),
-        new QName("urn:test", "p", XMLConstants.XMLNS_ATTRIBUTE),
-        new QName("", XMLConstants.XMLNS_ATTRIBUTE, ""),
-    };
-    
+public abstract class W3CDOMTestSuiteBuilder extends MatrixTestSuiteBuilder {
     private final DocumentBuilderFactoryFactory dbff;
     private final Set<DOMFeature> unsupportedFeatures;
     
-    public DOMTestSuiteBuilder(DocumentBuilderFactoryFactory dbff, DOMFeature... unsupportedFeatures) {
+    public W3CDOMTestSuiteBuilder(DocumentBuilderFactoryFactory dbff, DOMFeature... unsupportedFeatures) {
         this.dbff = dbff;
         this.unsupportedFeatures = new HashSet<DOMFeature>(Arrays.asList(unsupportedFeatures));
     }
     
-    protected void addTests() {
-        DocumentBuilderFactory dbf = dbff.newInstance();
-        dbf.setNamespaceAware(true);
-        addTest(new org.apache.axiom.ts.dom.attr.TestCloneNode(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.attr.TestCloneNode(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.attr.TestGetChildNodes(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestGetFirstChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestGetNamespaceURIWithNoNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestGetValueWithMultipleChildren(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestLookupNamespaceURIWithoutOwnerElement(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestSetPrefixNotNullWithNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestSetPrefixNotNullWithoutNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.attr.TestSetPrefixNullWithNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.builder.TestParseURI(dbf));
-        addTest(new org.apache.axiom.ts.dom.builder.TestWhitespaceAroundDocumentElement(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAdoptNode(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAdoptNodeToSameDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAdoptNodeWithParent(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAllowedChildren(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAppendChildForeignImplementation(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestAppendChildWrongDocument(dbf));
-        for (XMLSample file : getInstances(XMLSample.class)) {
-            addTest(new org.apache.axiom.ts.dom.document.TestCloneNode(dbf, file));
-        }
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateAttribute(dbf));
-        for (int i=0; i<validAttrQNames.length; i++) {
-            addTest(new org.apache.axiom.ts.dom.document.TestCreateAttributeNS(dbf, validAttrQNames[i]));
-        }
-        for (int i=0; i<invalidAttrQNames.length; i++) {
-            addTest(new org.apache.axiom.ts.dom.document.TestCreateAttributeNSInvalid(dbf, invalidAttrQNames[i]));
-        }
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateAttributeNSWithoutNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateCDATASection(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateElement(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateElementNS(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateElementNSWithInvalidName(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateElementNSWithoutNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateEntityReference(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestCreateText(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestDocumentSiblings(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestGetDomConfigDefaults(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestGetOwnerDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestLookupNamespaceURI(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestLookupNamespaceURIWithEmptyDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestLookupPrefixWithEmptyDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.document.TestNormalizeDocumentNamespace(dbf));
-        for (XSLTImplementation xsltImplementation : getInstances(XSLTImplementation.class)) {
-            addTest(new org.apache.axiom.ts.dom.document.TestTransformerWithIdentityStylesheet(dbf, xsltImplementation));
-            addTest(new org.apache.axiom.ts.dom.document.TestTransformerWithStylesheet(dbf, xsltImplementation));
-        }
-        addTest(new org.apache.axiom.ts.dom.document.TestValidator(dbf));
-        addTest(new org.apache.axiom.ts.dom.documentfragment.TestCloneNodeDeep(dbf));
-        addTest(new org.apache.axiom.ts.dom.documentfragment.TestCloneNodeShallow(dbf));
-        addTest(new org.apache.axiom.ts.dom.documentfragment.TestLookupNamespaceURI(dbf));
-        addTest(new org.apache.axiom.ts.dom.documentfragment.TestLookupPrefix(dbf));
-        addTest(new org.apache.axiom.ts.dom.documenttype.TestWithParser1(dbf));
-        addTest(new org.apache.axiom.ts.dom.documenttype.TestWithParser2(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAppendChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAppendChildCyclic(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAppendChildSelf(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAppendChildWrongDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAttributes(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAttributes2(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAttributes3(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestAttributes4(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestCloneNode(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestCloneNodeWithAttributeHavingMultipleChildren(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestCloneNodeWithAttributes(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.element.TestCloneNodeWithAttributes(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagName(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameNS(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameRecursive(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameWithNamespaces(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetElementsByTagNameWithWildcard(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetNamespaceURIWithNoNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetPrefixWithDefaultNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestGetTextContent(dbf));
-        for (XMLSample file : getInstances(XMLSample.class)) {
-            for (DOMImplementation from : getInstances(DOMImplementation.class)) {
-                addTest(new org.apache.axiom.ts.dom.element.TestImportNode(dbf, file, from));
-            }
-        }
-        addTest(new org.apache.axiom.ts.dom.element.TestInsertBefore(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestInsertBeforeWithDocumentFragment(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupNamespaceURIDefaultBindings(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupNamespaceURIExplicit(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupNamespaceURIImplicit(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupNamespaceURINamespaceDeclarationAsNSUnawareAttribute(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupPrefixDefaultBindings(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupPrefixEmptyNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupPrefixExplicitMasked(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestLookupPrefixImplicitMasked(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestRemoveAttributeNodeForeignImplementation(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestRemoveAttributeNodeNotOwner(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestRemoveFirstChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestRemoveLastChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestRemoveSingleChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildCyclic(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildFirst(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildFirst(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildFirstWithDocumentFragment(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildLast(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildLast(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildLastWithDocumentFragment(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildMiddle(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildMiddle(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildMiddleWithDocumentFragment(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildNotFound(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildNullNewChild(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildSingle(dbf, false));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildSingle(dbf, true));
-        addTest(new org.apache.axiom.ts.dom.element.TestReplaceChildWrongDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNodeNSForeignImplementation(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNodeNSInUse(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNodeNSReplace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNodeNSWrongDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNodeWrongDocument(dbf));
-        for (int i=0; i<validAttrQNames.length; i++) {
-            addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNS(dbf, validAttrQNames[i], "value"));
-        }
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNSExisting(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNSExistingDefaultNamespaceDeclaration(dbf));
-        for (int i=0; i<invalidAttrQNames.length; i++) {
-            addTest(new org.apache.axiom.ts.dom.element.TestSetAttributeNSInvalid(dbf, invalidAttrQNames[i]));
-        }
-        addTest(new org.apache.axiom.ts.dom.element.TestSetPrefixNotNullWithNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetPrefixNotNullWithoutNamespace(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetPrefixNull(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.TestSetTextContent(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.attributes.TestSetNamedItemNSWrongDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.element.attributes.TestSetNamedItemWrongDocument(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestAppendData(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestGetChildNodes(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestGetLength(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestGetWholeText(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestGetWholeTextWithCDATASection(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestGetWholeTextWithComment(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestLookupNamespaceURIWithoutParent(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestReplaceDataAppend(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestSetPrefix(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestSplitText(dbf));
-        addTest(new org.apache.axiom.ts.dom.text.TestSplitTextWithoutParent(dbf));
-        
-        DOMTestDocumentBuilderFactory factory;
+    protected final void addTests() {
+        final DOMTestDocumentBuilderFactory factory;
         try {
             factory = new DOMTestDocumentBuilderFactoryImpl(dbff, new DocumentBuilderSetting[] {
                     DocumentBuilderSetting.notCoalescing,
@@ -221,17 +56,15 @@ public final class DOMTestSuiteBuilder e
             // TODO
             throw new Error(ex);
         }
+        
+        DOMTestSuite suite;
         try {
-            addW3CTests(factory, new org.w3c.domts.level1.core.alltests(factory));
-            addW3CTests(factory, new org.w3c.domts.level2.core.alltests(factory));
-            addW3CTests(factory, new org.w3c.domts.level3.core.alltests(factory));
+            suite = createDOMTestSuite(factory);
         } catch (Exception ex) {
             // TODO
             throw new Error(ex);
         }
-    }
-    
-    private void addW3CTests(final DOMTestDocumentBuilderFactory factory, DOMTestSuite suite) {
+        
         suite.build(new DOMTestSink() {
             public void addTest(Class testClass) {
                 try {
@@ -254,7 +87,7 @@ public final class DOMTestSuiteBuilder e
                         throw ex.getTargetException();
                     }
                     test.setFramework(JUnitTestFramework.INSTANCE);
-                    DOMTestSuiteBuilder.this.addTest(new W3CTestCase(test));
+                    W3CDOMTestSuiteBuilder.this.addTest(new W3CTestCase(test));
                 }
                 catch (Throwable ex) {
                     // TODO
@@ -263,4 +96,6 @@ public final class DOMTestSuiteBuilder e
             }
         });
     }
+
+    protected abstract DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory factory) throws Exception;
 }

Copied: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java (from r1798282, webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/W3CTestCase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java?p2=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java&p1=webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/W3CTestCase.java&r1=1798282&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/W3CTestCase.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/W3CTestCase.java Fri Jun  9 21:19:29 2017
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
+package org.apache.axiom.ts.dom.w3c;
 
 import org.apache.axiom.testutils.suite.MatrixTestCase;
 import org.w3c.domts.DOMTestCase;

Added: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java?rev=1798283&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java (added)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java Fri Jun  9 21:19:29 2017
@@ -0,0 +1,38 @@
+/*
+ * 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 org.apache.axiom.ts.dom.w3c.level1;
+
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.DOMFeature;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
+import org.w3c.domts.DOMTestDocumentBuilderFactory;
+import org.w3c.domts.DOMTestSuite;
+import org.w3c.domts.level1.core.alltests;
+
+public final class W3CDOMLevel1TestSuiteBuilder extends W3CDOMTestSuiteBuilder {
+    public W3CDOMLevel1TestSuiteBuilder(DocumentBuilderFactoryFactory dbff,
+            DOMFeature... unsupportedFeatures) {
+        super(dbff, unsupportedFeatures);
+    }
+
+    @Override
+    protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory factory) throws Exception {
+        return new alltests(factory);
+    }
+}

Propchange: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level1/W3CDOMLevel1TestSuiteBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java?rev=1798283&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java (added)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java Fri Jun  9 21:19:29 2017
@@ -0,0 +1,38 @@
+/*
+ * 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 org.apache.axiom.ts.dom.w3c.level2;
+
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.DOMFeature;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
+import org.w3c.domts.DOMTestDocumentBuilderFactory;
+import org.w3c.domts.DOMTestSuite;
+import org.w3c.domts.level2.core.alltests;
+
+public final class W3CDOMLevel2TestSuiteBuilder extends W3CDOMTestSuiteBuilder {
+    public W3CDOMLevel2TestSuiteBuilder(DocumentBuilderFactoryFactory dbff,
+            DOMFeature... unsupportedFeatures) {
+        super(dbff, unsupportedFeatures);
+    }
+
+    @Override
+    protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory factory) throws Exception {
+        return new alltests(factory);
+    }
+}

Propchange: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level2/W3CDOMLevel2TestSuiteBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java?rev=1798283&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java (added)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java Fri Jun  9 21:19:29 2017
@@ -0,0 +1,38 @@
+/*
+ * 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 org.apache.axiom.ts.dom.w3c.level3;
+
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.DOMFeature;
+import org.apache.axiom.ts.dom.w3c.W3CDOMTestSuiteBuilder;
+import org.w3c.domts.DOMTestDocumentBuilderFactory;
+import org.w3c.domts.DOMTestSuite;
+import org.w3c.domts.level3.core.alltests;
+
+public final class W3CDOMLevel3TestSuiteBuilder extends W3CDOMTestSuiteBuilder {
+    public W3CDOMLevel3TestSuiteBuilder(DocumentBuilderFactoryFactory dbff,
+            DOMFeature... unsupportedFeatures) {
+        super(dbff, unsupportedFeatures);
+    }
+
+    @Override
+    protected DOMTestSuite createDOMTestSuite(DOMTestDocumentBuilderFactory factory) throws Exception {
+        return new alltests(factory);
+    }
+}

Propchange: webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/w3c/level3/W3CDOMLevel3TestSuiteBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java?rev=1798283&r1=1798282&r2=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java Fri Jun  9 21:19:29 2017
@@ -47,51 +47,6 @@ public class XercesTest extends TestCase
         // Xerces has difficulties importing nodes from Crimson
         builder.exclude(TestImportNode.class, "(from=crimson)");
         
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild13)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild24)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild38)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textiselementcontentwhitespace05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfogettypename04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom15)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom17)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom19)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom21)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom40)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom41)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom58)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom59)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom66)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom67)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom68)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom73)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
-        
         return builder.build();
     }
 }

Copied: webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java (from r1798257, webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java?p2=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java&p1=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java&r1=1798257&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level1/XercesTest.java Fri Jun  9 21:19:29 2017
@@ -16,81 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
+package org.apache.axiom.ts.dom.w3c.level1;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.axiom.ts.dom.document.TestLookupNamespaceURIWithEmptyDocument;
-import org.apache.axiom.ts.dom.document.TestLookupPrefixWithEmptyDocument;
-import org.apache.axiom.ts.dom.element.TestImportNode;
-import org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586;
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.W3CTestCase;
 import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 
 public class XercesTest extends TestCase {
     public static TestSuite suite() {
-        DOMTestSuiteBuilder builder = new DOMTestSuiteBuilder(new DocumentBuilderFactoryFactory() {
+        W3CDOMLevel1TestSuiteBuilder builder = new W3CDOMLevel1TestSuiteBuilder(new DocumentBuilderFactoryFactory() {
             public DocumentBuilderFactory newInstance() {
                 return new DocumentBuilderFactoryImpl();
             }
         });
         
-        // XERCESJ-1582
-        builder.exclude(TestLookupNamespaceURIWithEmptyDocument.class);
-        builder.exclude(TestLookupPrefixWithEmptyDocument.class);
-        
-        // XERCESJ-1586
-        builder.exclude(TestLookupNamespaceURIXercesJ1586.class);
-        
-        // Xerces has difficulties importing nodes from Crimson
-        builder.exclude(TestImportNode.class, "(from=crimson)");
-        
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild13)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild24)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild38)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textiselementcontentwhitespace05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfogettypename04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom15)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom17)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom19)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom21)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom40)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom41)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom58)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom59)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom66)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom67)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom68)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom73)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
         
         return builder.build();
     }

Copied: webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java (from r1798257, webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java?p2=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java&p1=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java&r1=1798257&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level2/XercesTest.java Fri Jun  9 21:19:29 2017
@@ -16,38 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
+package org.apache.axiom.ts.dom.w3c.level2;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.axiom.ts.dom.document.TestLookupNamespaceURIWithEmptyDocument;
-import org.apache.axiom.ts.dom.document.TestLookupPrefixWithEmptyDocument;
-import org.apache.axiom.ts.dom.element.TestImportNode;
-import org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586;
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.W3CTestCase;
 import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 
 public class XercesTest extends TestCase {
     public static TestSuite suite() {
-        DOMTestSuiteBuilder builder = new DOMTestSuiteBuilder(new DocumentBuilderFactoryFactory() {
+        W3CDOMLevel2TestSuiteBuilder builder = new W3CDOMLevel2TestSuiteBuilder(new DocumentBuilderFactoryFactory() {
             public DocumentBuilderFactory newInstance() {
                 return new DocumentBuilderFactoryImpl();
             }
         });
         
-        // XERCESJ-1582
-        builder.exclude(TestLookupNamespaceURIWithEmptyDocument.class);
-        builder.exclude(TestLookupPrefixWithEmptyDocument.class);
-        
-        // XERCESJ-1586
-        builder.exclude(TestLookupNamespaceURIXercesJ1586.class);
-        
-        // Xerces has difficulties importing nodes from Crimson
-        builder.exclude(TestImportNode.class, "(from=crimson)");
-        
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
@@ -55,42 +42,6 @@ public class XercesTest extends TestCase
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument11)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/domconfigurationcansetparameter06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/elementgetschematypeinfo07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/entities03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/infoset07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegetbaseuri16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodegettextcontent18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild13)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild24)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodereplacechild38)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/textiselementcontentwhitespace05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfogettypename04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom15)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom16)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom17)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom18)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom19)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom21)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom40)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom41)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom58)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom59)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom66)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom67)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom68)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/typeinfoisderivedfrom73)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
         
         return builder.build();
     }

Copied: webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java (from r1798257, webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java?p2=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java&p1=webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java&r1=1798257&r2=1798283&rev=1798283&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/w3c/level3/XercesTest.java Fri Jun  9 21:19:29 2017
@@ -16,45 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.ts.dom;
+package org.apache.axiom.ts.dom.w3c.level3;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.axiom.ts.dom.document.TestLookupNamespaceURIWithEmptyDocument;
-import org.apache.axiom.ts.dom.document.TestLookupPrefixWithEmptyDocument;
-import org.apache.axiom.ts.dom.element.TestImportNode;
-import org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586;
+import org.apache.axiom.ts.dom.DocumentBuilderFactoryFactory;
+import org.apache.axiom.ts.dom.w3c.W3CTestCase;
 import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
 
 public class XercesTest extends TestCase {
     public static TestSuite suite() {
-        DOMTestSuiteBuilder builder = new DOMTestSuiteBuilder(new DocumentBuilderFactoryFactory() {
+        W3CDOMLevel3TestSuiteBuilder builder = new W3CDOMLevel3TestSuiteBuilder(new DocumentBuilderFactoryFactory() {
             public DocumentBuilderFactory newInstance() {
                 return new DocumentBuilderFactoryImpl();
             }
         });
         
-        // XERCESJ-1582
-        builder.exclude(TestLookupNamespaceURIWithEmptyDocument.class);
-        builder.exclude(TestLookupPrefixWithEmptyDocument.class);
-        
-        // XERCESJ-1586
-        builder.exclude(TestLookupNamespaceURIXercesJ1586.class);
-        
-        // Xerces has difficulties importing nodes from Crimson
-        builder.exclude(TestImportNode.class, "(from=crimson)");
-        
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getNamedItemNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentgetinputencoding03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument07)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/documentnormalizedocument10)");



Mime
View raw message