(tomcat) branch 10.1.x updated: Skip tests if running on Java 11

[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 a51c659e44 Skip tests if running on Java 11
a51c659e44 is described below

commit a51c659e44c3de7a90c434a83442ff3424b040ce
Author: remm <r...@apache.org>
AuthorDate: Thu Jun 20 11:13:32 2024 +0200

    Skip tests if running on Java 11
---
 test/org/apache/catalina/realm/TestDataSourceRealm.java        | 4 ++++
 test/org/apache/catalina/users/TestDataSourceUserDatabase.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/test/org/apache/catalina/realm/TestDataSourceRealm.java 
b/test/org/apache/catalina/realm/TestDataSourceRealm.java
index 57486a54c9..f36f7d61e7 100644
--- a/test/org/apache/catalina/realm/TestDataSourceRealm.java
+++ b/test/org/apache/catalina/realm/TestDataSourceRealm.java
@@ -26,10 +26,12 @@ import java.util.List;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.startup.LoggingBaseTest;
+import org.apache.tomcat.util.compat.JreCompat;
 
 public class TestDataSourceRealm extends LoggingBaseTest {
 
@@ -95,6 +97,8 @@ public class TestDataSourceRealm extends LoggingBaseTest {
     @Test
     public void testRealm() throws Exception {
 
+        Assume.assumeTrue(JreCompat.isJre16Available());
+
         db = new DerbyDataSourceRealm("dsRealm");
         db.setUserTable("users");
         db.setUserNameCol("user_name");
diff --git a/test/org/apache/catalina/users/TestDataSourceUserDatabase.java 
b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
index 56e5458472..ae1004824b 100644
--- a/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
+++ b/test/org/apache/catalina/users/TestDataSourceUserDatabase.java
@@ -24,12 +24,14 @@ import java.util.Iterator;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 import org.apache.catalina.Group;
 import org.apache.catalina.Role;
 import org.apache.catalina.User;
 import org.apache.catalina.startup.LoggingBaseTest;
+import org.apache.tomcat.util.compat.JreCompat;
 
 public class TestDataSourceUserDatabase extends LoggingBaseTest {
 
@@ -119,6 +121,8 @@ public class TestDataSourceUserDatabase extends 
LoggingBaseTest {
     @Test
     public void testBasicUserRoleDatabase()
         throws Exception {
+        Assume.assumeTrue(JreCompat.isJre16Available());
+
         // Test functionality with the DataSourceRealm schema
 
         db = new DerbyUserDatabase("simple");
@@ -169,6 +173,7 @@ public class TestDataSourceUserDatabase extends 
LoggingBaseTest {
     @Test
     public void testUserDatabase()
         throws Exception {
+        Assume.assumeTrue(JreCompat.isJre16Available());
 
         db = new DerbyUserDatabase("full");
         db.setReadonly(false);


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