(tomcat) 05/16: Refactor test so it accounts for running on different JREs

[markt]

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

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

commit 7080da004d9252c1e8ad76c07da8a7b8d58be02e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 3 12:36:59 2024 +0000

    Refactor test so it accounts for running on different JREs
---
 test/org/apache/jasper/compiler/TestGenerator.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/jasper/compiler/TestGenerator.java 
b/test/org/apache/jasper/compiler/TestGenerator.java
index b8bd60a880..0e9a5ffb5f 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -40,7 +40,6 @@ import jakarta.servlet.jsp.tagext.TryCatchFinally;
 import jakarta.servlet.jsp.tagext.VariableInfo;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -50,6 +49,7 @@ import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.jasper.servlet.JasperInitializer;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.compat.JreCompat;
 
 public class TestGenerator extends TomcatBaseTest {
 
@@ -796,13 +796,17 @@ public class TestGenerator extends TomcatBaseTest {
         doTestJsp("usebean-04.jsp", 
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     }
 
-    @Ignore // Requires specific Java settings
     @Test
     public void testUseBean05() throws Exception {
         // Whether this test passes or fails depends on the Java version used
         // and the JRE settings.
-        // For the test to pass use --illegal-access=deny
-        doTestJsp("usebean-05.jsp", 
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        // For the test to pass it requires --illegal-access=deny
+        // This is the default setting on Java 16 upwards
+        if (JreCompat.isJre16Available()) {
+            doTestJsp("usebean-05.jsp", 
HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        } else {
+            doTestJsp("usebean-05.jsp", HttpServletResponse.SC_OK);
+        }
     }
 
     @Test


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