Merge pull request #758 from volosied/MYFACES-4681-5.0

Fix MYFACES-4681 [5.0] + tests
apache · Oct 1, 2024 · 7435859 · 7435859
2 parents ac9c675 + 2e2b1f9
commit 7435859
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
@@ -145,6 +145,12 @@ public void writeDoctype(String name, String publicId, String systemId)
 
         DoctypeUnit unit = new DoctypeUnit(this.alias, this.nextTagId(),
             name, publicId, systemId, faceletsProcessingInstructions.isHtml5Doctype());
+        if(faceletsProcessingInstructions.isHtml5Doctype())
+        {
+            // MYFACES-4681: if facelet processing is HTML5 (default) then these should be null
+            publicId = null;
+            systemId = null;
+        }
         this.doctype = new DoctypeImpl(name, publicId, systemId);
         this.startUnit(unit);
     }

diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/doctype/DoctypeTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/doctype/DoctypeTestCase.java
@@ -68,8 +68,9 @@ public void testCompilerXhtml() throws Exception {
 
         Assertions.assertNotNull(((AbstractFacelet) f).getDoctype());
         Assertions.assertEquals("html", ((AbstractFacelet) f).getDoctype().getRootElement());
-        Assertions.assertEquals("-//W3C//DTD XHTML 1.0 Transitional//EN", ((AbstractFacelet) f).getDoctype().getPublic());
-        Assertions.assertEquals("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", ((AbstractFacelet) f).getDoctype().getSystem());
+        // MYFACES-4681 - Simplified to <!DOCTYPE html> as HTML5 is default
+        Assertions.assertEquals(null, ((AbstractFacelet) f).getDoctype().getPublic());
+        Assertions.assertEquals(null, ((AbstractFacelet) f).getDoctype().getSystem());
     }
 
     @Test
@@ -92,7 +93,8 @@ public void testXhtml() throws Exception
 
         Assertions.assertNotNull(root.getDoctype());
         Assertions.assertEquals("html", root.getDoctype().getRootElement());
-        Assertions.assertEquals("-//W3C//DTD XHTML 1.0 Transitional//EN", root.getDoctype().getPublic());
-        Assertions.assertEquals("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", root.getDoctype().getSystem());
+        // MYFACES-4681 - Simplified to <!DOCTYPE html> as HTML5 is default
+        Assertions.assertEquals(null, root.getDoctype().getPublic()); 
+        Assertions.assertEquals(null, root.getDoctype().getSystem());
     }
 }
diff --git a/...st/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java b/...st/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
@@ -97,7 +97,8 @@ public void testUpdateScript3Head() throws Exception
         // the inclusion should trigger update head
         Assertions.assertTrue(text.contains("update id=\"jakarta.faces.Resource\""));
         Assertions.assertTrue(text.contains("alert(\"script3\");"));
-        Assertions.assertTrue(text.contains("link rel=\"stylesheet\" type=\"text/css\" href=\"/test/faces/jakarta.faces.resource/style3.css\""));
+         // MYFACES-4681 - HTML5 is default output mode, so the type attribute is unnecessary
+        Assertions.assertTrue(text.contains("link rel=\"stylesheet\" href=\"/test/faces/jakarta.faces.resource/style3.css\""));
         //System.out.println(text);
         endRequest();
     }