[jena] branch main updated: Allow both forms of property access return value

[andy]

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

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 4de0883612 Allow both forms of property access return value
     new a1d56289c8 Merge pull request #1317 from afs/java19
4de0883612 is described below

commit 4de088361204fd28a7a2545b0344fa77754162e7
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Mon May 16 22:25:01 2022 +0100

    Allow both forms of property access return value
---
 .../src/test/java/org/apache/jena/system/TestReadXML.java  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/jena-arq/src/test/java/org/apache/jena/system/TestReadXML.java 
b/jena-arq/src/test/java/org/apache/jena/system/TestReadXML.java
index 5d195388d2..7cfdf874bb 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/TestReadXML.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/TestReadXML.java
@@ -20,6 +20,7 @@ package org.apache.jena.system;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
@@ -68,9 +69,16 @@ public class TestReadXML {
     @Test public void stax_setup() {
         XMLInputFactory xf = XMLInputFactory.newInstance() ;
         JenaXMLInput.initXMLInputFactory(xf);
-        assertEquals(Boolean.FALSE, 
xf.getProperty(XMLInputFactory.SUPPORT_DTD));
-        assertEquals(null, xf.getProperty(XMLConstants.ACCESS_EXTERNAL_DTD));
-        
assertEquals(Boolean.FALSE,xf.getProperty("javax.xml.stream.isSupportingExternalEntities"));
+        assertEquals("XMLInputFactory.SUPPORT_DTD",
+                     Boolean.FALSE, 
xf.getProperty(XMLInputFactory.SUPPORT_DTD));
+
+        // Java19. Setting ACCESS_EXTERNAL_DTD to "" now returns "" whereas it 
was returning null.
+        Object obj = xf.getProperty(XMLConstants.ACCESS_EXTERNAL_DTD);
+        boolean noAccessExternalDTD = ( (obj == null) || ((obj instanceof 
String) && ((String)obj).isEmpty()) );
+        assertTrue("XMLConstants.ACCESS_EXTERNAL_DTD", noAccessExternalDTD);
+
+        assertEquals("javax.xml.stream.isSupportingExternalEntities",
+                     
Boolean.FALSE,xf.getProperty("javax.xml.stream.isSupportingExternalEntities"));
     }
 
     @Test public void srx_dtd_http() {