format code

Author: yanhom1314

test/test-core/src/test/java/org/dromara/dynamictp/test/core/converter/ExecutorConverterTest.java

@@ -135,6 +135,7 @@ void testToMetricsPoolSize() {
         ExecutorWrapper wrapper = ExecutorWrapper.of(dtpExecutor);
         ThreadPoolStats stats = ExecutorConverter.toMetrics(wrapper);
 
+        assertNotNull(stats);
         assertEquals(3, stats.getCorePoolSize());
         assertEquals(6, stats.getMaximumPoolSize());
         assertEquals(0, stats.getActiveCount());

test/test-core/src/test/java/org/dromara/dynamictp/test/core/selector/ExecutorSelectorTest.java

@@ -24,6 +24,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -41,9 +42,9 @@ class ExecutorSelectorTest {
     @Test
     void testHashedSelectConsistent() {
         HashedExecutorSelector selector = new HashedExecutorSelector();
-        Executor e1 = Executors.newSingleThreadExecutor();
-        Executor e2 = Executors.newSingleThreadExecutor();
-        Executor e3 = Executors.newSingleThreadExecutor();
+        ExecutorService e1 = Executors.newSingleThreadExecutor();
+        ExecutorService e2 = Executors.newSingleThreadExecutor();
+        ExecutorService e3 = Executors.newSingleThreadExecutor();
         List<Executor> executors = Arrays.asList(e1, e2, e3);
 
         // Same arg should always select the same executor
@@ -52,18 +53,17 @@ void testHashedSelectConsistent() {
         Executor second = selector.select(executors, key);
         assertEquals(first, second);
 
-        e1.toString(); e2.toString(); e3.toString();
         // cleanup
-        ((java.util.concurrent.ExecutorService) e1).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e2).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e3).shutdownNow();
+        e1.shutdownNow();
+        e2.shutdownNow();
+        e3.shutdownNow();
     }
 
     @Test
     void testHashedSelectDifferentKeys() {
         HashedExecutorSelector selector = new HashedExecutorSelector();
-        Executor e1 = Executors.newSingleThreadExecutor();
-        Executor e2 = Executors.newSingleThreadExecutor();
+        ExecutorService e1 = Executors.newSingleThreadExecutor();
+        ExecutorService e2 = Executors.newSingleThreadExecutor();
         List<Executor> executors = Arrays.asList(e1, e2);
 
         // Different keys should still return valid executors
@@ -74,15 +74,15 @@ void testHashedSelectDifferentKeys() {
         assertTrue(executors.contains(r1));
         assertTrue(executors.contains(r2));
 
-        ((java.util.concurrent.ExecutorService) e1).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e2).shutdownNow();
+        e1.shutdownNow();
+        e2.shutdownNow();
     }
 
     @Test
     void testHashedNegativeHashCode() {
         HashedExecutorSelector selector = new HashedExecutorSelector();
-        Executor e1 = Executors.newSingleThreadExecutor();
-        Executor e2 = Executors.newSingleThreadExecutor();
+        ExecutorService e1 = Executors.newSingleThreadExecutor();
+        ExecutorService e2 = Executors.newSingleThreadExecutor();
         List<Executor> executors = Arrays.asList(e1, e2);
 
         // Object with negative hashCode
@@ -96,16 +96,16 @@ public int hashCode() {
         assertNotNull(result);
         assertTrue(executors.contains(result));
 
-        ((java.util.concurrent.ExecutorService) e1).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e2).shutdownNow();
+        e1.shutdownNow();
+        e2.shutdownNow();
     }
 
     @Test
     void testRandomSelectReturnsValid() {
         RandomExecutorSelector selector = new RandomExecutorSelector();
-        Executor e1 = Executors.newSingleThreadExecutor();
-        Executor e2 = Executors.newSingleThreadExecutor();
-        Executor e3 = Executors.newSingleThreadExecutor();
+        ExecutorService e1 = Executors.newSingleThreadExecutor();
+        ExecutorService e2 = Executors.newSingleThreadExecutor();
+        ExecutorService e3 = Executors.newSingleThreadExecutor();
         List<Executor> executors = Arrays.asList(e1, e2, e3);
 
         // Run multiple times to verify it always returns a valid executor
@@ -115,8 +115,8 @@ void testRandomSelectReturnsValid() {
             assertTrue(executors.contains(selected));
         }
 
-        ((java.util.concurrent.ExecutorService) e1).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e2).shutdownNow();
-        ((java.util.concurrent.ExecutorService) e3).shutdownNow();
+        e1.shutdownNow();
+        e2.shutdownNow();
+        e3.shutdownNow();
     }
 }

test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/DtpLifecycleSupportTest.java

@@ -41,7 +41,10 @@ class DtpLifecycleSupportTest {
     void testInternalShutdownGraceful() {
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.submit(() -> {
-            try { Thread.sleep(200); } catch (InterruptedException ignored) { }
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException ignored) {
+            }
         });
 
         DtpLifecycleSupport.internalShutdown(executor, "test-graceful", true, 5);
@@ -54,7 +57,10 @@ void testInternalShutdownGraceful() {
     void testInternalShutdownImmediate() {
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.submit(() -> {
-            try { Thread.sleep(5000); } catch (InterruptedException ignored) { }
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException ignored) {
+            }
         });
 
         DtpLifecycleSupport.internalShutdown(executor, "test-immediate", false, 1);
@@ -81,7 +87,10 @@ void testInternalShutdownZeroAwait() {
     void testCancelRemainingTaskWithFuture() throws Exception {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<?> future = executor.submit(() -> {
-            try { Thread.sleep(5000); } catch (InterruptedException ignored) { }
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException ignored) {
+            }
         });
 
         // shutdownNow returns remaining tasks
@@ -97,7 +106,10 @@ void testCancelRemainingTaskWithFuture() throws Exception {
     void testShutdownGracefulAsync() throws InterruptedException {
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.submit(() -> {
-            try { Thread.sleep(200); } catch (InterruptedException ignored) { }
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException ignored) {
+            }
         });
 
         DtpLifecycleSupport.shutdownGracefulAsync(executor, "test-async", 5);
@@ -112,7 +124,10 @@ void testShutdownAlreadyTerminated() {
         ExecutorService executor = Executors.newSingleThreadExecutor();
         executor.submit(() -> { });
         executor.shutdown();
-        try { executor.awaitTermination(5, TimeUnit.SECONDS); } catch (InterruptedException ignored) { }
+        try {
+            executor.awaitTermination(5, TimeUnit.SECONDS);
+        } catch (InterruptedException ignored) {
+        }
 
         assertTrue(executor.isTerminated());
         // Should not throw when called on already terminated executor

test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/ExecutorWrapperTest.java

@@ -29,6 +29,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -130,7 +131,7 @@ void testCaptureReturnsSnapshot() {
 
         assertEquals(original.getThreadPoolName(), captured.getThreadPoolName());
         assertNotNull(captured.getExecutor());
-        assertTrue(captured.getExecutor() instanceof CapturedExecutor);
+        assertInstanceOf(CapturedExecutor.class, captured.getExecutor());
         // captured executor is a different object
         assertNotSame(original.getExecutor(), captured.getExecutor());
     }

test/test-core/src/test/java/org/dromara/dynamictp/test/core/support/task/wrapper/TaskWrappersTest.java

@@ -27,6 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -47,7 +48,7 @@ void testGetInstanceNotNull() {
     void testGetInstanceSingleton() {
         TaskWrappers a = TaskWrappers.getInstance();
         TaskWrappers b = TaskWrappers.getInstance();
-        assertTrue(a == b);
+        assertSame(a, b);
     }
 
     @Test