! adjust thread pool cleanup awaitTermination time, improve unit test…

… stability

src/test/java/com/alibaba/demo/session_cache/SessionCacheDemo.kt

@@ -8,6 +8,7 @@ import io.reactivex.Flowable
 import io.reactivex.plugins.RxJavaPlugins
 import io.reactivex.schedulers.Schedulers
 import org.junit.*
+import org.junit.Assert.assertTrue
 import java.util.concurrent.*
 
 
@@ -74,8 +75,7 @@ class SessionCacheDemo {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) Assert.fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 

src/test/java/com/alibaba/perf/tps/TpsCounter.kt

@@ -1,6 +1,6 @@
 package com.alibaba.perf.tps
 
-import org.junit.Assert.fail
+import org.junit.Assert.assertTrue
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
@@ -36,7 +36,6 @@ class TpsCounter internal constructor(private val threadCount: Int) {
         stopped = true
 
         executorService.shutdown()
-        executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-        if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+        assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
     }
 }

src/test/java/com/alibaba/third_part_lib_test/ExecutorsTest.kt

@@ -32,7 +32,7 @@ class ExecutorsTest {
         futures.forEach { it.get() }
 
         threadPool.shutdown()
-        assertTrue(threadPool.awaitTermination(10, TimeUnit.MILLISECONDS))
+        assertTrue("Fail to shutdown thread pool", threadPool.awaitTermination(100, TimeUnit.MILLISECONDS))
     }
 }
 

src/test/java/com/alibaba/third_part_lib_test/ForkJoinPoolTest.kt

@@ -3,8 +3,8 @@ package com.alibaba.third_part_lib_test
 import com.alibaba.support.junit.conditional.BelowJava7
 import com.alibaba.support.junit.conditional.ConditionalIgnoreRule
 import com.alibaba.support.junit.conditional.ConditionalIgnoreRule.ConditionalIgnore
-import org.junit.Assert.assertEquals
-import org.junit.Assert.fail
+import org.junit.Assert
+import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.ForkJoinPool
@@ -35,7 +35,7 @@ class ForkJoinPoolTest {
 
         // close
         pool.shutdown()
-        if (!pool.awaitTermination(100, TimeUnit.MILLISECONDS)) fail("Fail to shutdown thread pool")
+        assertTrue("Fail to shutdown thread pool", pool.awaitTermination(100, TimeUnit.MILLISECONDS))
     }
 }
 

src/test/java/com/alibaba/ttl/TtlCallableTest.kt

@@ -190,8 +190,7 @@ class TtlCallableTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }

src/test/java/com/alibaba/ttl/TtlRunnableTest.kt

@@ -316,8 +316,7 @@ class TtlRunnableTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }

src/test/java/com/alibaba/ttl/TtlWrappersTest.kt

@@ -241,8 +241,7 @@ class TtlWrappersTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }

src/test/java/com/alibaba/ttl/threadlocal_integration/ThreadLocalIntegrationTest.kt

@@ -172,8 +172,7 @@ class ThreadLocalIntegrationTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }

src/test/java/com/alibaba/ttl/threadpool/ScheduledExecutorServiceTtlWrapperTest.kt

@@ -241,8 +241,7 @@ class ScheduledExecutorServiceTtlWrapperTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }

src/test/java/com/alibaba/ttl/user_api_test/TransmittableThreadLocal_Transmitter_UserTest.kt

@@ -177,8 +177,7 @@ class TransmittableThreadLocal_Transmitter_UserTest {
         @Suppress("unused")
         fun afterClass() {
             executorService.shutdown()
-            executorService.awaitTermination(100, TimeUnit.MILLISECONDS)
-            if (!executorService.isTerminated) fail("Fail to shutdown thread pool")
+            assertTrue("Fail to shutdown thread pool", executorService.awaitTermination(100, TimeUnit.MILLISECONDS))
         }
     }
 }