commit fe82df6a4f9e644344308e82b904b49203dbcf72
author Michael Glavassevich <mrglavas@apache.org> Tue Feb 04 21:41:58 2014 +0000
committer Michael Glavassevich <mrglavas@apache.org> Tue Feb 04 21:41:58 2014 +0000
tree 82bac845aeba7fbb856d94b7173c811bd34d9e4c
parent 461babc36200f1ee286732e4a000021ab421a960

The EntityResolver should be invoked when jdk.xml.resolveExternalEntities is set to true and should not be invoked when the property has been set to false. Enhancing the tests to check for this expected behaviour.

git-svn-id: https://svn.apache.org/repos/asf/xerces/java/trunk@1564517 13f79535-47bb-0310-9956-ffa450edef68

tests/jaxp/JAXPSecureProcessingTest.java

diff --git a/tests/jaxp/JAXPSecureProcessingTest.java b/tests/jaxp/JAXPSecureProcessingTest.java
index 29993d1..9a358ea 100644
--- a/tests/jaxp/JAXPSecureProcessingTest.java
+++ b/tests/jaxp/JAXPSecureProcessingTest.java
@@ -33,6 +33,8 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -388,6 +390,13 @@
     public void testSAXEnableExternalEntityResolution() throws Exception {
         System.setProperty(RESOLVE_EXTERNAL_ENTITIES_PROPERTY_NAME, "true");
         XMLReader reader = newSecureXMLReader();
+        reader.setEntityResolver(new EntityResolver() {
+            public InputSource resolveEntity(String publicId, String systemId)
+                    throws SAXException, IOException {
+                assertEquals("xerces:///x:/this/does/not/exist.xml", systemId);
+                return null;
+            }
+        });
         try {
             reader.parse(new InputData("badExternalEntity.xml"));
             fail("Expected IOException");
@@ -398,6 +407,13 @@
     public void testDOMEnableExternalEntityResolution() throws Exception {
         System.setProperty(RESOLVE_EXTERNAL_ENTITIES_PROPERTY_NAME, "true");
         DocumentBuilder reader = newSecureDocumentBuilder();
+        reader.setEntityResolver(new EntityResolver() {
+            public InputSource resolveEntity(String publicId, String systemId)
+                    throws SAXException, IOException {
+                assertEquals("xerces:///x:/this/does/not/exist.xml", systemId);
+                return null;
+            }
+        });
         try {
             reader.parse(new InputData("badExternalEntity.xml"));
             fail("Expected IOException");
@@ -408,6 +424,13 @@
     public void testSAXDisableExternalEntityResolution() throws Exception {
         System.setProperty(RESOLVE_EXTERNAL_ENTITIES_PROPERTY_NAME, "false");
         XMLReader reader = newSecureXMLReader();
+        reader.setEntityResolver(new EntityResolver() {
+            public InputSource resolveEntity(String publicId, String systemId)
+                    throws SAXException, IOException {
+                fail("resolveEntity call not expected.");
+                return null;
+            }
+        });
         reader.setContentHandler(new ContentHandler() {
             final int START_DOCUMENT = 0;
             final int START_ELEMENT = 1;
@@ -466,6 +489,13 @@
     public void testDOMDisableExternalEntityResolution() throws Exception {
         System.setProperty(RESOLVE_EXTERNAL_ENTITIES_PROPERTY_NAME, "false");
         DocumentBuilder reader = newSecureDocumentBuilder();
+        reader.setEntityResolver(new EntityResolver() {
+            public InputSource resolveEntity(String publicId, String systemId)
+                    throws SAXException, IOException {
+                fail("resolveEntity call not expected.");
+                return null;
+            }
+        });
         Document doc = reader.parse(new InputData("badExternalEntity.xml"));
         Element e = doc.getDocumentElement();
         assertEquals("root", e.getLocalName());