(freemarker) branch 3 updated: Servlet: Fixed some test cases

[ddekany]

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

ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/3 by this push:
     new 7c11a153 Servlet: Fixed some test cases
7c11a153 is described below

commit 7c11a153e07745d4357c3b9b7777774fe2a5c357
Author: ddekany <ddek...@apache.org>
AuthorDate: Fri Dec 29 01:20:32 2023 +0100

    Servlet: Fixed some test cases
---
 .../org/apache/freemarker/servlet/jsp/RealServletContainerTest.java     | 2 --
 .../test/java/org/apache/freemarker/servlet/test/WebAppTestCase.java    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java
 
b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java
index e3027136..8af1e33d 100644
--- 
a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java
+++ 
b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java
@@ -59,7 +59,6 @@ public class RealServletContainerTest extends WebAppTestCase {
     private static final String WEBAPP_MULTIPLE_LOADERS = "multipleLoaders";
 
     @Test
-    @Ignore // Doesn't work since switched to Jetty 11 (Jakarta)
     public void basicTrivial() throws Exception {
         assertJSPAndFTLOutputEquals(WEBAPP_BASIC, "tester?view=trivial");
     }
@@ -169,7 +168,6 @@ public class RealServletContainerTest extends 
WebAppTestCase {
      * Jetty container's JSTL jar-s will still be discovered.
      */
     @Test
-    @Ignore // Doesn't work since switched to Jetty 11 (Jakarta)
     public void tldDiscoveryNoClasspath() throws Exception {
         try {
             
System.setProperty(FreemarkerServlet.SYSTEM_PROPERTY_META_INF_TLD_SOURCES, 
"clear, webInfPerLibJars");
diff --git 
a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/test/WebAppTestCase.java
 
b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/test/WebAppTestCase.java
index 1eb6b732..e4739f23 100644
--- 
a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/test/WebAppTestCase.java
+++ 
b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/test/WebAppTestCase.java
@@ -243,7 +243,7 @@ public class WebAppTestCase {
         // Pattern of jar file names scanned for META-INF/*.tld:
         context.setAttribute(
                 ATTR_JETTY_CONTAINER_INCLUDE_JAR_PATTERN,
-                ".*taglib.*\\.jar$");
+                ".*(taglib|jsp\\.jstl).*\\.jar$");
 
         addJasperInitializer(context);