[tomcat] 05/18: Disable tests that depend on JSTL since it is not Jakarta EE compatible

[ma...@apache.org]

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

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

commit d96186c80860b542e064645c4dbaa37d3cfcdf8e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 28 09:57:24 2019 +0000

    Disable tests that depend on JSTL since it is not Jakarta EE compatible
---
 test/jakarta/el/TestCompositeELResolver.java             | 2 ++
 test/org/apache/el/TestELInJsp.java                      | 3 +++
 test/org/apache/jasper/compiler/TestParser.java          | 3 +++
 test/org/apache/jasper/tagplugins/jstl/core/TestSet.java | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/test/jakarta/el/TestCompositeELResolver.java b/test/jakarta/el/TestCompositeELResolver.java
index d2bbc37..7be20eb 100644
--- a/test/jakarta/el/TestCompositeELResolver.java
+++ b/test/jakarta/el/TestCompositeELResolver.java
@@ -19,6 +19,7 @@ package jakarta.el;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -26,6 +27,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestCompositeELResolver extends TomcatBaseTest {
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug50408() throws Exception {
         getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index 66c0f3d..9a5e6fa 100644
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import javax.servlet.DispatcherType;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Wrapper;
@@ -394,6 +395,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "05-Hello JUnit from Tomcat");
     }
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug56029() throws Exception {
         getTomcatInstanceTestWebapp(true, true);
@@ -407,6 +409,7 @@ public class TestELInJsp extends TomcatBaseTest {
     }
 
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug56147() throws Exception {
         getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java
index c9035be..010841d 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -17,6 +17,7 @@
 package org.apache.jasper.compiler;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -233,6 +234,7 @@ public class TestParser extends TomcatBaseTest {
              || result.contains("&#034;5&apos;5&#034;"));
     }
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug56265() throws Exception {
         getTomcatInstanceTestWebapp(true, true);
@@ -252,6 +254,7 @@ public class TestParser extends TomcatBaseTest {
                 result.contains("[4: [data-test]: [window.alert('Hello 'World <&>'!')]]"));
     }
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug56334And56561() throws Exception {
         getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java b/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
index 1a66978..7f6278f 100644
--- a/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
+++ b/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
@@ -19,12 +19,14 @@ package org.apache.jasper.tagplugins.jstl.core;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestSet extends AbstractTestTag {
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug54011() throws Exception {
         ByteChunk res = new ByteChunk();
@@ -39,6 +41,7 @@ public class TestSet extends AbstractTestTag {
     }
 
 
+    @Ignore // Jakarta EE / JSTL
     @Test
     public void testBug54338() throws Exception {
         ByteChunk res = new ByteChunk();


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