This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch theme-resource-media-headers in repository https://gitbox.apache.org/repos/asf/roller.git
commit 225bad30133ce385fb148104d61ba106724ac38d Author: David M. Johnson <[email protected]> AuthorDate: Fri Oct 16 19:00:57 2026 -0400 Use neutral file names in the new tests --- .../weblogger/ui/rendering/servlets/ResourceServletTest.java | 10 +++++----- .../roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServletTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServletTest.java index a021c3363..5c1030dff 100644 --- a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServletTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServletTest.java @@ -73,8 +73,8 @@ class ResourceServletTest { when(weblog.getTheme()).thenReturn(new WeblogCustomTheme(weblog)); ServletContext context = mock(ServletContext.class); - when(context.getMimeType("evil.html")).thenReturn("text/html"); - when(context.getMimeType("/evil.html")).thenReturn("text/html"); + when(context.getMimeType("page.html")).thenReturn("text/html"); + when(context.getMimeType("/page.html")).thenReturn("text/html"); when(context.getMimeType("/css/site.css")).thenReturn("text/css"); ServletConfig config = mock(ServletConfig.class); when(config.getServletContext()).thenReturn(context); @@ -90,12 +90,12 @@ class ResourceServletTest { @Test void uploadedDocumentFoundByCustomThemeIsADownload() throws Exception { - HttpServletResponse response = serve("/evil.html", - "<script>document.title='x'</script>"); + HttpServletResponse response = serve("/page.html", + "<p>page</p>"); verify(response).setContentType("application/octet-stream"); verify(response).setHeader("Content-Disposition", - "attachment; filename=\"/evil.html\""); + "attachment; filename=\"/page.html\""); verify(response).setHeader("X-Content-Type-Options", "nosniff"); verify(response, never()).setContentType("text/html"); } diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java index 85a4d1a79..46ad1a335 100644 --- a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java @@ -31,12 +31,12 @@ class MediaFileBeanTest { @Test void copyToLeavesTheOriginalPathAlone() throws Exception { MediaFileBean bean = new MediaFileBean(); - bean.setName("evil.html"); - bean.setOriginalPath("/evil.html"); + bean.setName("page.html"); + bean.setOriginalPath("/page.html"); MediaFile added = new MediaFile(); bean.copyTo(added); - assertEquals("evil.html", added.getName()); + assertEquals("page.html", added.getName()); assertNull(added.getOriginalPath()); MediaFile imported = new MediaFile();
