improve unit test stability

alibaba · Oct 11, 2023 · 9fbfef6 · 9fbfef6
1 parent b6779f2
commit 9fbfef6
Showing 1 changed file with 59 additions and 38 deletions.
diff --git a/jetcache-test/src/main/java/com/alicp/jetcache/test/AbstractCacheTest.java b/jetcache-test/src/main/java/com/alicp/jetcache/test/AbstractCacheTest.java
@@ -13,6 +13,7 @@
 import com.alicp.jetcache.support.DefaultCacheMonitor;
 import com.alicp.jetcache.support.StatInfo;
 import com.alicp.jetcache.support.StatInfoLogger;
+import com.alicp.jetcache.test.anno.TestUtil;
 import com.alicp.jetcache.test.support.DynamicQuery;
 import org.junit.Assert;
 import org.slf4j.Logger;
@@ -817,7 +818,7 @@ public Object apply(Object k) {
                         fail.set(true);
                     }
                 } catch (Throwable e) {
-                    if(!"mock error".equals(e.getMessage())){
+                    if (!"mock error".equals(e.getMessage())) {
                         e.printStackTrace();
                     }
                     getFailCount.incrementAndGet();
@@ -842,6 +843,7 @@ private static void penetrationProtectTestWithLoadingCache(Cache cache) throws E
 
         Function<Integer, Integer> loaderFunction = new Function<Integer, Integer>() {
             ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>();
+
             @Override
             public Integer apply(Integer key) {
                 try {
@@ -914,44 +916,63 @@ private static void penetrationProtectReEntryTest(Cache cache) {
         Assert.assertEquals("V", v);
     }
 
+    private static class PenetrationTestThread extends Thread {
+
+        private final String keyPrefix;
+        private final Cache cache;
+        private final Function loader;
+        volatile boolean running;
+
+        PenetrationTestThread(String keyPrefix, Cache cache, AtomicInteger loadSuccess) {
+            this.keyPrefix = keyPrefix;
+            this.cache = cache;
+            this.loader = k -> {
+                try {
+                    Thread.sleep(75);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                loadSuccess.incrementAndGet();
+                return k + "_V";
+            };
+        }
+
+        @Override
+        public void run() {
+            running = true;
+            cache.computeIfAbsent(keyPrefix, loader);
+        }
+    }
+
     private static void penetrationProtectTimeoutTest(Cache cache) throws Exception {
         String keyPrefix = "penetrationProtectTimeoutTest_";
-        AtomicInteger loadSuccess = new AtomicInteger(0);
-        Function loader = k -> {
-            try {
-                Thread.sleep(75);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            loadSuccess.incrementAndGet();
-            return k + "_V";
-        };
-
-        cache.config().setPenetrationProtectTimeout(Duration.ofMillis(1));
-        Runnable runnable = () -> cache.computeIfAbsent(keyPrefix + 1, loader);
-        Thread t1 = new Thread(runnable);
-        Thread t2 = new Thread(runnable);
-        t1.start();
-        t2.start();
-        t1.join();
-        t2.join();
-        Assert.assertEquals(2, loadSuccess.intValue());
-
-        cache.config().setPenetrationProtectTimeout(Duration.ofMillis(200));
-        loadSuccess.set(0);
-        runnable = () -> cache.computeIfAbsent(keyPrefix + 2, loader);
-        t1 = new Thread(runnable);
-        t2 = new Thread(runnable);
-        Thread t3 = new Thread(runnable);
-        t1.start();
-        t2.start();
-        Thread.sleep(25);
-        t3.start();
-        Thread.sleep(25);
-        t3.interrupt();
-        t1.join();
-        t2.join();
-        t3.join();
-        Assert.assertEquals(2, loadSuccess.intValue());
+        {
+            AtomicInteger loadSuccess = new AtomicInteger(0);
+            cache.config().setPenetrationProtectTimeout(Duration.ofMillis(1));
+            PenetrationTestThread t1 = new PenetrationTestThread(keyPrefix + 1, cache, loadSuccess);
+            PenetrationTestThread t2 = new PenetrationTestThread(keyPrefix + 1, cache, loadSuccess);
+            t1.start();
+            t2.start();
+            t1.join();
+            t2.join();
+            Assert.assertEquals(2, loadSuccess.intValue());
+        }
+        {
+            AtomicInteger loadSuccess = new AtomicInteger(0);
+            cache.config().setPenetrationProtectTimeout(Duration.ofMillis(200));
+            PenetrationTestThread t1 = new PenetrationTestThread(keyPrefix + 2, cache, loadSuccess);
+            PenetrationTestThread t2 = new PenetrationTestThread(keyPrefix + 2, cache, loadSuccess);
+            PenetrationTestThread t3 = new PenetrationTestThread(keyPrefix + 2, cache, loadSuccess);
+            t1.start();
+            t2.start();
+            TestUtil.waitUtil(() -> t1.running == true || t2.running == true);
+            t3.start();
+            TestUtil.waitUtil(() -> t3.running == true);
+            t3.interrupt();
+            t1.join();
+            t2.join();
+            t3.join();
+            Assert.assertEquals(2, loadSuccess.intValue());
+        }
     }
 }