You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2011/10/01 21:45:12 UTC
svn commit: r1178078 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/
axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/
Author: veithen
Date: Sat Oct 1 19:45:11 2011
New Revision: 1178078
URL: http://svn.apache.org/viewvc?rev=1178078&view=rev
Log:
Rationalized the test cases for the equals methods defined by OMNamespace.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java?rev=1178078&r1=1178077&r2=1178078&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java Sat Oct 1 19:45:11 2011
@@ -27,29 +27,6 @@ import org.apache.axiom.om.impl.common.O
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
public class NamespaceTest extends TestCase {
- public void testEquals() throws Exception {
- boolean goodResult = false;
- OMNamespaceImpl ns1;
- OMNamespaceImpl ns2;
-
- try {
- new OMNamespaceImpl(null, null);
- } catch (IllegalArgumentException e) {
- // Caught null, good.
- goodResult = true;
- }
- if (!goodResult)
- fail("Null namespace allowed!");
-
- String URI1 = "http://testuri1";
- String URI2 = "http://";
- ns1 = new OMNamespaceImpl(URI1, null);
- ns2 = new OMNamespaceImpl("http://testuri1", null);
- URI2 = URI2 + "testuri1"; // Make sure the strings don't intern to the same place
- assertTrue(ns1.equals(URI2, null));
- assertTrue(ns1.equals(ns2));
- }
-
public void testSearch() throws Exception {
String NSURI = "http://testns";
String NSURI_UPPER = "HTTP://TESTNS";
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java?rev=1178078&r1=1178077&r2=1178078&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestEquals.java Sat Oct 1 19:45:11 2011
@@ -36,6 +36,8 @@ public class TestEquals extends AxiomTes
OMFactory factory = metaFactory.getOMFactory();
OMNamespace ns = factory.createOMNamespace("http://www.w3.org/XML/1998/namespace", "xml");
assertTrue(ns.equals("http://www.w3.org/XML/1998/namespace", "xml"));
+ // The implementation must not assume that namespace URI or prefixes are interned
+ assertTrue(ns.equals(new String("http://www.w3.org/XML/1998/namespace"), new String("xml")));
assertFalse(ns.equals("http://www.w3.org/XML/1998/namespace", "xml2"));
assertFalse(ns.equals("http://www.w3.org/XML/1998/namespace", null));
assertFalse(ns.equals("http://www.w3.org/XML/2001/namespace", "xml"));
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java?rev=1178078&r1=1178077&r2=1178078&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/namespace/TestObjectEquals.java Sat Oct 1 19:45:11 2011
@@ -34,8 +34,10 @@ public class TestObjectEquals extends Ax
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- OMNamespace ns1 = factory.createOMNamespace("urn:ns", "ns");
- OMNamespace ns2 = factory.createOMNamespace("urn:ns", "ns");
+ // The implementation must not assume that namespace URI or prefixes are interned.
+ // Therefore we use new String(String).
+ OMNamespace ns1 = factory.createOMNamespace(new String("urn:ns"), new String("ns"));
+ OMNamespace ns2 = factory.createOMNamespace(new String("urn:ns"), new String("ns"));
assertTrue(ns1.equals(ns2));
}
}