fix flaky tests under DubboAppenderTest (apache#14900)

* fix flaky test under DubboAppenderTest * fix format issue * format code issue --------- Co-authored-by: li261 <[email protected]>
atanu2531 · Nov 20, 2024 · 36b69f1 · 36b69f1
1 parent 27c51c3
commit 36b69f1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DubboAppenderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DubboAppenderTest.java
@@ -27,8 +27,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -42,6 +40,9 @@ public void setUp() throws Exception {
         when(event.getLevel()).thenReturn(Level.INFO);
         when(event.getThreadName()).thenReturn("thread-name");
         when(event.getMessage()).thenReturn(new SimpleMessage("message"));
+
+        DubboAppender.clear();
+        DubboAppender.doStop();
     }
 
     @AfterEach
@@ -52,7 +53,7 @@ public void tearDown() throws Exception {
 
     @Test
     void testAvailable() {
-        assumeFalse(DubboAppender.available);
+        assertThat(DubboAppender.available, is(false));
         DubboAppender.doStart();
         assertThat(DubboAppender.available, is(true));
         DubboAppender.doStop();
@@ -62,8 +63,9 @@ void testAvailable() {
     @Test
     void testAppend() {
         DubboAppender appender = new DubboAppender();
+        assertThat(DubboAppender.logList, hasSize(0));
         appender.append(event);
-        assumeTrue(DubboAppender.logList.isEmpty());
+        assertThat(DubboAppender.logList, hasSize(0));
         DubboAppender.doStart();
         appender.append(event);
         assertThat(DubboAppender.logList, hasSize(1));
@@ -75,7 +77,7 @@ void testClear() {
         DubboAppender.doStart();
         DubboAppender appender = new DubboAppender();
         appender.append(event);
-        assumeTrue(1 == DubboAppender.logList.size());
+        assertThat(DubboAppender.logList, hasSize(1));
         DubboAppender.clear();
         assertThat(DubboAppender.logList, hasSize(0));
     }