(tomcat) 17/19: Add a bit more of XML validation

[remm]

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

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e88fa7c0681a3779c4cd563ee09310f9a62891e1
Author: remm <r...@apache.org>
AuthorDate: Tue Oct 22 11:52:50 2024 +0200

    Add a bit more of XML validation
---
 test/org/apache/catalina/servlets/TestWebdavServlet.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/org/apache/catalina/servlets/TestWebdavServlet.java 
b/test/org/apache/catalina/servlets/TestWebdavServlet.java
index f8c3546c58..4b46a53b91 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServlet.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServlet.java
@@ -295,6 +295,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
         client.processRequest(true);
         Assert.assertEquals(WebdavStatus.SC_MULTI_STATUS, 
client.getStatusCode());
         
Assert.assertTrue(client.getResponseBody().contains("<T:othercustomprop"));
+        validateXml(client.getResponseBody());
 
         client.setRequest(new String[] { "PROPFIND /file1.txt HTTP/1.1" + 
SimpleHttpClient.CRLF +
                 "Host: localhost:" + getPort() + SimpleHttpClient.CRLF +
@@ -338,6 +339,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
         
Assert.assertTrue(client.getResponseBody().contains("<D:getcontenttype>"));
         
Assert.assertFalse(client.getResponseBody().contains("<D:getlastmodified>"));
         Assert.assertTrue(client.getResponseBody().contains("<myvalue 
xmlns=\"http://tomcat.apache.org/testsuite\";>"));
+        validateXml(client.getResponseBody());
 
     }
 
@@ -649,6 +651,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
         client.processRequest(true);
         Assert.assertEquals(WebdavStatus.SC_MULTI_STATUS, 
client.getStatusCode());
         Assert.assertFalse(client.getResponseBody().contains("/myfolder"));
+        validateXml(client.getResponseBody());
 
     }
 
@@ -812,6 +815,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
             }
         }
         Assert.assertNotNull(lockToken3);
+        validateXml(client.getResponseBody());
 
         client.setRequest(new String[] { "PROPFIND / HTTP/1.1" + 
SimpleHttpClient.CRLF +
                 "Host: localhost:" + getPort() + SimpleHttpClient.CRLF +
@@ -825,6 +829,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
         String timeoutValue = 
client.getResponseBody().substring(client.getResponseBody().indexOf("Second-"));
         timeoutValue = timeoutValue.substring("Second-".length(), 
timeoutValue.indexOf('<'));
         Assert.assertTrue(Integer.valueOf(timeoutValue).intValue() > 100000);
+        validateXml(client.getResponseBody());
 
         client.setRequest(new String[] { "PUT 
/myfolder/myfolder2/myfolder4/myfolder5/file4.txt HTTP/1.1" + 
SimpleHttpClient.CRLF +
                 "Host: localhost:" + getPort() + SimpleHttpClient.CRLF +
@@ -919,6 +924,7 @@ public class TestWebdavServlet extends TomcatBaseTest {
         Assert.assertEquals(WebdavStatus.SC_MULTI_STATUS, 
client.getStatusCode());
         // Verify all the shared locks are cleared
         
Assert.assertFalse(client.getResponseBody().contains("opaquelocktoken:"));
+        validateXml(client.getResponseBody());
 
     }
 
@@ -1028,6 +1034,10 @@ public class TestWebdavServlet extends TomcatBaseTest {
 
     }
 
+    private void validateXml(String xmlContent) throws Exception {
+        SAXParserFactory.newInstance().newSAXParser().getXMLReader().parse(new 
InputSource(new StringReader(xmlContent)));
+    }
+
     private static final class Client extends SimpleHttpClient {
 
         @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org