(bookkeeper) branch master updated: build: disable BookieZKExpireTest beyond jdk17 (#4309)

[shoothzj]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 99776d43e2 build: disable BookieZKExpireTest beyond jdk17 (#4309)
99776d43e2 is described below

commit 99776d43e28a7aa49e5b3633824ed94d2cf1f7e0
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Sun Apr 28 09:09:35 2024 +0800

    build: disable BookieZKExpireTest beyond jdk17 (#4309)
    
    Signed-off-by: ZhangJian He <shoot...@gmail.com>
---
 .../apache/bookkeeper/test/BookieZKExpireTest.java | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
index 808b7e8f90..e64ff8c218 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
@@ -21,10 +21,10 @@
 
 package org.apache.bookkeeper.test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import io.netty.buffer.UnpooledByteBufAllocator;
 import java.io.File;
@@ -38,6 +38,8 @@ import org.apache.bookkeeper.proto.BookieServer;
 import org.apache.bookkeeper.stats.NullStatsLogger;
 import org.apache.bookkeeper.util.PortManager;
 import org.junit.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 /**
  * Test bookie expiration.
@@ -54,6 +56,7 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
     */
     @Test
     @SuppressWarnings("deprecation")
+    @EnabledForJreRange(max = JRE.JAVA_17)
     public void testBookieServerZKRequestTimeoutBehaviour() throws Exception {
         // 6000 is minimum due to default tick time
         System.setProperty("zookeeper.request.timeout", "6000");
@@ -98,7 +101,7 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
                     break;
                 }
             }
-            assertNotNull("Send thread not found", sendthread);
+            assertNotNull(sendthread, "Send thread not found");
 
             log.info("Suspending threads");
             sendthread.suspend();
@@ -108,8 +111,8 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
 
             // allow watcher thread to run
             Thread.sleep(3000);
-            assertTrue("Bookie should not shutdown on zk timeout", 
server.isBookieRunning());
-            assertTrue("Bookie Server should not shutdown on zk timeout", 
server.isRunning());
+            assertTrue(server.isBookieRunning(), "Bookie should not shutdown 
on zk timeout");
+            assertTrue(server.isRunning(), "Bookie Server should not shutdown 
on zk timeout");
         } finally {
             System.clearProperty("zookeeper.request.timeout");
             server.shutdown();
@@ -124,6 +127,7 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
     */
     @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/4142";)
     @SuppressWarnings("deprecation")
+    @EnabledForJreRange(max = JRE.JAVA_17)
     public void testBookieServerZKSessionExpireBehaviour() throws Exception {
         // 6000 is minimum due to default tick time
         System.setProperty("zookeeper.request.timeout", "0");
@@ -168,7 +172,7 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
                     break;
                 }
             }
-            assertNotNull("Send thread not found", sendthread);
+            assertNotNull(sendthread, "Send thread not found");
 
             log.info("Suspending threads");
             sendthread.suspend();
@@ -178,8 +182,8 @@ public class BookieZKExpireTest extends 
BookKeeperClusterTestCase {
 
             // allow watcher thread to run
             Thread.sleep(3000);
-            assertFalse("Bookie should shutdown on losing zk session", 
server.isBookieRunning());
-            assertFalse("Bookie Server should shutdown on losing zk session", 
server.isRunning());
+            assertFalse(server.isBookieRunning(), "Bookie should shutdown on 
losing zk session");
+            assertFalse(server.isRunning(), "Bookie Server should shutdown on 
losing zk session");
         } finally {
             System.clearProperty("zookeeper.request.timeout");
             server.shutdown();