Author: veithen
Date: Fri Jun 19 23:31:48 2015
New Revision: 1686516
URL: http://svn.apache.org/r1686516
Log:
Ensure that DOOM doesn't have the same issue as XERCESJ-1586.
Added:
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
(with props)
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
webservices/axiom/trunk/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
Modified:
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1686516&r1=1686515&r2=1686516&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
Fri Jun 19 23:31:48 2015
@@ -52,10 +52,8 @@ public aspect DOMElementSupport {
String namespace = this.getNamespaceURI();
String prefix = this.getPrefix();
// First check for namespaces implicitly defined by the namespace
prefix/URI of the element
- // TODO: although the namespace != null condition conforms to the
specs, it is likely incorrect; see XERCESJ-1586
- if (namespace != null
- && (prefix == null && specifiedPrefix == null
- || prefix != null && prefix.equals(specifiedPrefix))) {
+ if (prefix == null && specifiedPrefix == null
+ || prefix != null && prefix.equals(specifiedPrefix)) {
return namespace;
}
// looking in attributes
Modified:
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/DOMTestSuiteBuilder.java?rev=1686516&r1=1686515&r2=1686516&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/DOMTestSuiteBuilder.java
Fri Jun 19 23:31:48 2015
@@ -145,6 +145,7 @@ public final class DOMTestSuiteBuilder e
addTest(new
org.apache.axiom.ts.dom.element.TestInsertBeforeWithDocumentFragment(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.TestLookupNamespaceURIXercesJ1586(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));
Added:
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java?rev=1686516&view=auto
==============================================================================
---
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
(added)
+++
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
Fri Jun 19 23:31:48 2015
@@ -0,0 +1,47 @@
+/*
+ * 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.element;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.axiom.ts.dom.DOMTestCase;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Tests that the DOM implementation is not affected by <a
+ * href="https://issues.apache.org/jira/browse/XERCESJ-1586";>XERCESJ-1586</a>.
+ */
+public class TestLookupNamespaceURIXercesJ1586 extends DOMTestCase {
+ public TestLookupNamespaceURIXercesJ1586(DocumentBuilderFactory dbf) {
+ super(dbf);
+ }
+
+ @Override
+ protected void runTest() throws Throwable {
+ Document document = dbf.newDocumentBuilder().newDocument();
+ Element root = document.createElementNS("urn:test", "root");
+ document.appendChild(root);
+ Element child = document.createElementNS(null, "child");
+ root.appendChild(child);
+ assertThat(child.lookupNamespaceURI(null)).isNull();
+ }
+}
Propchange:
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.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=1686516&r1=1686515&r2=1686516&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 19 23:31:48 2015
@@ -25,6 +25,7 @@ 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.TestLookupNamespaceURIXercesJ1586;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
public class XercesTest extends TestCase {
@@ -39,6 +40,9 @@ public class XercesTest extends TestCase
builder.exclude(TestLookupNamespaceURIWithEmptyDocument.class);
builder.exclude(TestLookupPrefixWithEmptyDocument.class);
+ // XERCESJ-1586
+ builder.exclude(TestLookupNamespaceURIXercesJ1586.class);
+
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)");
