(shenyu) branch master updated: test(admin): isolate logger mocks and cover CI regressions (#7546)

[liuhongyu]

This is an automated email from the ASF dual-hosted git repository.

Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f45ae484d test(admin): isolate logger mocks and cover CI regressions 
(#7546)
6f45ae484d is described below

commit 6f45ae484d0224f9ee5b09f3b2c822a3fef9a346
Author: shown <yuluo08290...@gmail.com>
AuthorDate: Mon Oct 12 09:11:01 2026 +0800

    test(admin): isolate logger mocks and cover CI regressions (#7546)
---
 .../admin/listener/websocket/WebsocketCollectorTest.java      | 11 ++++++++++-
 .../apache/shenyu/admin/service/UpstreamCheckServiceTest.java |  1 -
 .../admin/service/impl/ProxySelectorServiceImplTest.java      |  4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollectorTest.java
 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollectorTest.java
index 88ec67b4b8..2cab5b9805 100644
--- 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollectorTest.java
+++ 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollectorTest.java
@@ -33,6 +33,7 @@ import org.apache.shenyu.common.dto.WebsocketSyncFrame;
 import org.apache.shenyu.common.enums.DataEventTypeEnum;
 import org.apache.shenyu.common.exception.ShenyuException;
 import org.apache.shenyu.common.utils.GsonUtils;
+import org.apache.shenyu.common.utils.JsonUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -58,6 +59,7 @@ import java.util.UUID;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -100,7 +102,6 @@ public final class WebsocketCollectorTest {
         loggerSpy = spy(LoggerFactory.getLogger(WebsocketCollector.class));
         loggerFactoryMockedStatic = mockStatic(LoggerFactory.class, 
CALLS_REAL_METHODS);
         loggerFactoryMockedStatic.when(() -> 
LoggerFactory.getLogger(WebsocketCollector.class)).thenReturn(loggerSpy);
-        loggerFactoryMockedStatic.when(() -> 
LoggerFactory.getLogger(anyString())).thenReturn(loggerSpy);
     }
 
     @AfterAll
@@ -108,6 +109,14 @@ public final class WebsocketCollectorTest {
         loggerFactoryMockedStatic.close();
     }
 
+    @Test
+    public void testUnrelatedClassLoggerIsPreserved() {
+        Logger logger = LoggerFactory.getLogger(JsonUtils.class);
+        assertNotNull(logger);
+        assertEquals(JsonUtils.class.getName(), logger.getName());
+        assertNull(JsonUtils.jsonToObject("", Map.class));
+    }
+
     @BeforeEach
     void setUp() {
         websocketCollector = new WebsocketCollector();
diff --git 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
index 12d88076b3..bf4271d55f 100644
--- 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
+++ 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/UpstreamCheckServiceTest.java
@@ -121,7 +121,6 @@ public final class UpstreamCheckServiceTest {
         loggerSpy = spy(LoggerFactory.getLogger(UpstreamCheckService.class));
         loggerFactoryMockedStatic = mockStatic(LoggerFactory.class, 
CALLS_REAL_METHODS);
         loggerFactoryMockedStatic.when(() -> 
LoggerFactory.getLogger(UpstreamCheckService.class)).thenReturn(loggerSpy);
-        loggerFactoryMockedStatic.when(() -> 
LoggerFactory.getLogger(anyString())).thenReturn(loggerSpy);
     }
 
     @AfterAll
diff --git 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImplTest.java
 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImplTest.java
index 03cd2a2b5d..e0f3366791 100644
--- 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImplTest.java
+++ 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImplTest.java
@@ -20,6 +20,7 @@ package org.apache.shenyu.admin.service.impl;
 import org.apache.shenyu.admin.discovery.DiscoveryProcessor;
 import org.apache.shenyu.admin.discovery.DiscoveryProcessorHolder;
 import org.apache.shenyu.admin.exception.ValidFailException;
+import org.apache.shenyu.admin.listener.DataChangedEvent;
 import org.apache.shenyu.admin.mapper.DiscoveryHandlerMapper;
 import org.apache.shenyu.admin.mapper.DiscoveryMapper;
 import org.apache.shenyu.admin.mapper.DiscoveryRelMapper;
@@ -158,6 +159,7 @@ public final class ProxySelectorServiceImplTest {
 
         assertThrows(ValidFailException.class, () -> 
proxySelectorService.update(dto));
         verify(discoveryMapper, 
never()).updateSelective(any(DiscoveryDO.class));
+        verifyNoInteractions(eventPublisher);
     }
 
     @Test
@@ -181,5 +183,7 @@ public final class ProxySelectorServiceImplTest {
         lenient().when(discoveryMapper.updateSelective(any())).thenReturn(1);
 
         assertEquals(ShenyuResultMessage.UPDATE_SUCCESS, 
proxySelectorService.update(dto));
+        // Without transaction synchronization, a successful update publishes 
immediately.
+        verify(eventPublisher).publishEvent(any(DataChangedEvent.class));
     }
 }