(tomcat) branch 10.1.x updated: Add assume

[remm]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 2bfbee4f38 Add assume
2bfbee4f38 is described below

commit 2bfbee4f382f3ab5a67a390f7e8a5f8cb2ab2d0d
Author: remm <r...@apache.org>
AuthorDate: Thu Dec 5 23:38:29 2024 +0100

    Add assume
---
 test/org/apache/catalina/servlets/TestWebdavPropertyStore.java      | 6 ++++++
 .../catalina/session/TestPersistentManagerDataSourceStore.java      | 4 ++++
 test/org/apache/catalina/valves/TestJDBCAccessLogValve.java         | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java 
b/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java
index 8f1bd2d6d2..651c198f71 100644
--- a/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java
+++ b/test/org/apache/catalina/servlets/TestWebdavPropertyStore.java
@@ -34,6 +34,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -44,6 +45,7 @@ import 
org.apache.catalina.servlets.WebdavServlet.PropertyUpdateType;
 import org.apache.catalina.servlets.WebdavServlet.ProppatchOperation;
 import org.apache.catalina.startup.LoggingBaseTest;
 import org.apache.catalina.util.XMLWriter;
+import org.apache.tomcat.util.compat.JreCompat;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
@@ -163,6 +165,10 @@ public class TestWebdavPropertyStore extends 
LoggingBaseTest {
 
     @Test
     public void testStore() throws Exception {
+        if (storeName.contains("DataSource")) {
+            Assume.assumeTrue(JreCompat.isJre16Available());
+        }
+
         DocumentBuilderFactory documentBuilderFactory = 
DocumentBuilderFactory.newInstance();
         documentBuilderFactory.setNamespaceAware(true);
         documentBuilderFactory.setExpandEntityReferences(false);
diff --git 
a/test/org/apache/catalina/session/TestPersistentManagerDataSourceStore.java 
b/test/org/apache/catalina/session/TestPersistentManagerDataSourceStore.java
index 0b95ba442e..0fb8386e27 100644
--- a/test/org/apache/catalina/session/TestPersistentManagerDataSourceStore.java
+++ b/test/org/apache/catalina/session/TestPersistentManagerDataSourceStore.java
@@ -29,6 +29,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -36,6 +37,7 @@ import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Session;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.compat.JreCompat;
 
 public class TestPersistentManagerDataSourceStore extends TomcatBaseTest {
 
@@ -79,6 +81,8 @@ public class TestPersistentManagerDataSourceStore extends 
TomcatBaseTest {
 
     @Test
     public void testDSStore() throws Exception {
+        Assume.assumeTrue(JreCompat.isJre16Available());
+
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 689876fe94..6ddad0d1fe 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -27,6 +27,7 @@ import java.util.List;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -37,6 +38,7 @@ import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.compat.JreCompat;
 
 @SuppressWarnings("deprecation")
 @RunWith(Parameterized.class)
@@ -73,6 +75,8 @@ public class TestJDBCAccessLogValve extends TomcatBaseTest {
     @Test
     public void testValve() throws Exception {
 
+        Assume.assumeTrue(JreCompat.isJre16Available());
+
         Tomcat tomcat = getTomcatInstance();
         // No file system docBase required
         getTomcatInstanceTestWebapp(false, false);


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