Merge branch 'jetty-11.0.x' into jetty-12.0.x-merge-11

jetty · Oct 17, 2023 · 75bf414 · 75bf414
2 parents e99d47c + 65b18ac
commit 75bf414
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java b/jetty-core/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java
@@ -20,6 +20,7 @@
 
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.junit.jupiter.api.Test;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
@@ -35,7 +36,16 @@ public void testXmlParser() throws Exception
     {
         // we want to parse a simple XML, no dtds, no xsds.
         // just do it, without validation
-        XmlParser parser = new XmlParser(false);
+        XmlParser parser = new XmlParser(false)
+        {
+            @Override
+            protected InputSource resolveEntity(String pid, String sid)
+            {
+                InputSource inputSource = super.resolveEntity(pid, sid);
+                assertNotNull(inputSource, "You are using entities in your XML that don't match your redirectEntity mappings: pid=" + pid + ", sid=" + sid);
+                return inputSource;
+            }
+        };
         URL url = XmlParserTest.class.getResource("configureSimple.xml");
         assertNotNull(url);
         XmlParser.Node testDoc = parser.parse(url.toString());
@@ -44,7 +54,7 @@ public void testXmlParser() throws Exception
         assertTrue(testDocStr.startsWith("<Configure"));
         assertTrue(testDocStr.endsWith("</Configure>"));
     }
-
+    
     @Test
     public void testAddCatalogSimple() throws Exception
     {