getPrefix should return null for not-in-scope namespace URIs

gburgett · Jan 4, 2013 · f1c765a · f1c765a
1 parent 359a998
commit f1c765a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/core/src/java/org/jdom2/jaxb/JDOMNamespaceContext.java b/core/src/java/org/jdom2/jaxb/JDOMNamespaceContext.java
@@ -134,7 +134,7 @@ public String getPrefix(final String namespaceURI) {
             }
         }
 
-        return "";
+        return null;
     }
 
     @SuppressWarnings("rawtypes")

diff --git a/test/src/java/org/jdom2/test/cases/jaxb/TestJDOMNamespaceContext.java b/test/src/java/org/jdom2/test/cases/jaxb/TestJDOMNamespaceContext.java
@@ -94,18 +94,24 @@ public void testGetNamespaceURIWithoutDef() {
 	public void testGetPrefixWithDef() {
 		final JDOMNamespaceContext nsc = new JDOMNamespaceContext(Arrays.asList(nsok));
 		assertEquals("", nsc.getPrefix("defns"));
-		assertEquals(Namespace.NO_NAMESPACE.getPrefix(), nsc.getPrefix(Namespace.NO_NAMESPACE.getURI()));
+		assertEquals(null, nsc.getPrefix(Namespace.NO_NAMESPACE.getURI()));
 		assertEquals(Namespace.XML_NAMESPACE.getPrefix(), nsc.getPrefix(Namespace.XML_NAMESPACE.getURI()));
 		assertEquals(JDOMConstants.NS_PREFIX_XMLNS, nsc.getPrefix(JDOMConstants.NS_URI_XMLNS));
 		assertEquals("a", nsc.getPrefix("urla"));
 		assertEquals("b", nsc.getPrefix("urlb"));
+		try {
+			nsc.getPrefix(null);
+			failNoException(IllegalArgumentException.class);
+		} catch (Exception e) {
+			checkException(IllegalArgumentException.class, e);
+		}
 	}
 
 	@Test
 	public void testGetPrefixWithoutDef() {
 		final JDOMNamespaceContext nsc = new JDOMNamespaceContext(Arrays.asList(nsmay));
-		assertEquals("", nsc.getPrefix("defns"));
+		assertEquals(null, nsc.getPrefix("defns"));
-		assertEquals(Namespace.NO_NAMESPACE.getPrefix(), nsc.getPrefix(Namespace.NO_NAMESPACE.getURI()));
+		assertEquals(null, nsc.getPrefix(Namespace.NO_NAMESPACE.getURI()));
 		assertEquals(Namespace.XML_NAMESPACE.getPrefix(), nsc.getPrefix(Namespace.XML_NAMESPACE.getURI()));
 		assertEquals(JDOMConstants.NS_PREFIX_XMLNS, nsc.getPrefix(JDOMConstants.NS_URI_XMLNS));
 		assertEquals("a", nsc.getPrefix("urla"));
@@ -121,6 +127,12 @@ public void testGetPrefixesWithDef() {
 		checkIteratorEquals(nsc.getPrefixes(JDOMConstants.NS_URI_XMLNS), JDOMConstants.NS_PREFIX_XMLNS);
 		checkIteratorEquals(nsc.getPrefixes("urla"), "a", "a2");
 		checkIteratorEquals(nsc.getPrefixes("urlb"), "b");
+		try {
+			nsc.getPrefixes(null);
+			failNoException(IllegalArgumentException.class);
+		} catch (Exception e) {
+			checkException(IllegalArgumentException.class, e);
+		}
 	}
 
 	@Test