Thanks Remy for fixing the new test failures.
Am 05.12.24 um 23:42 schrieb r...@apache.org:
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 35a04b2ed0 Add assume
35a04b2ed0 is described below
commit 35a04b2ed0270f6c1c71adfa66c5c8cc65aa959f
Author: remm <r...@apache.org>
AuthorDate: Thu Dec 5 23:38:29 2024 +0100
Add assume
---
test/org/apache/catalina/servlets/TestWebdavPropertyStore.java | 6 ++++++
test/org/apache/catalina/valves/TestJDBCAccessLogValve.java | 4 ++++
2 files changed, 10 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/valves/TestJDBCAccessLogValve.java
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 9a5ea08848..785dacc440 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 javax.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
