Merge pull request mybatis#3121 from epochcoder/fix/blocking-test-flaky

harawata · web-flow · commit 5718c1a8e43d · 2024-03-28T14:16:08.000+09:00
fix: Fix flaky test (testBlockingCache) on master/pr's
diff --git a/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java b/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,13 +18,14 @@
 import java.io.Reader;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,7 +48,7 @@ void setUp() throws Exception {
   }
 
   @Test
-  void testBlockingCache() {
+  void testBlockingCache() throws InterruptedException {
     ExecutorService defaultThreadPool = Executors.newFixedThreadPool(2);
 
     long init = System.currentTimeMillis();
@@ -57,13 +58,12 @@ void testBlockingCache() {
     }
 
     defaultThreadPool.shutdown();
-
-    while (!defaultThreadPool.isTerminated()) {
-      continue;
+    if (!defaultThreadPool.awaitTermination(5, TimeUnit.SECONDS)) {
+      defaultThreadPool.shutdownNow();
     }
 
     long totalTime = System.currentTimeMillis() - init;
-    Assertions.assertTrue(totalTime > 1000);
+    Assertions.assertThat(totalTime).isGreaterThanOrEqualTo(1000);
   }
 
   private void accessDB() {
