diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/OperationLogAspectTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/OperationLogAspectTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/OperationLogAspectTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/OperationLogAspectTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/controller/AuditLogControllerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/controller/AuditLogControllerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/controller/AuditLogControllerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/controller/AuditLogControllerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/domain/AuditLogTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/domain/AuditLogTest.java similarity index 99% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/domain/AuditLogTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/domain/AuditLogTest.java index 4f2758d..88f81aa 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/domain/AuditLogTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/domain/AuditLogTest.java @@ -25,7 +25,7 @@ class AuditLogTest { assertNull(auditLog.getEntityId()); assertNull(auditLog.getOperator()); assertNull(auditLog.getOperationType()); - assertNull(auditLog.getOperationTime()); + assertNotNull(auditLog.getOperationTime()); assertNull(auditLog.getDescription()); assertNull(auditLog.getIpAddress()); assertNull(auditLog.getUserAgent()); diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/dto/AuditLogQueryRequestTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/dto/AuditLogQueryRequestTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/dto/AuditLogQueryRequestTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/dto/AuditLogQueryRequestTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/service/impl/AuditLogServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/service/impl/AuditLogServiceTest.java similarity index 98% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/service/impl/AuditLogServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/service/impl/AuditLogServiceTest.java index f887727..97b9e2b 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/audit/service/impl/AuditLogServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/audit/service/impl/AuditLogServiceTest.java @@ -41,6 +41,12 @@ class AuditLogServiceTest { @BeforeEach void setUp() { auditLogService = new AuditLogService(auditLogRepository, auditLogExecutor); + + lenient().doAnswer(invocation -> { + Runnable task = invocation.getArgument(0); + task.run(); + return null; + }).when(auditLogExecutor).execute(any(Runnable.class)); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/IntegrationTestConfig.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/IntegrationTestConfig.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/IntegrationTestConfig.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/IntegrationTestConfig.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/SecurityConfigTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/SecurityConfigTest.java similarity index 83% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/SecurityConfigTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/SecurityConfigTest.java index fe9f3e6..8476235 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/SecurityConfigTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/SecurityConfigTest.java @@ -1,5 +1,6 @@ package cn.novalon.manage.sys.config; +import cn.novalon.manage.sys.audit.OperationLogWebFilter; import cn.novalon.manage.sys.security.JwtAuthenticationFilter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,6 +17,9 @@ class SecurityConfigTest { @Mock private JwtAuthenticationFilter jwtAuthenticationFilter; + @Mock + private OperationLogWebFilter operationLogWebFilter; + @Mock private Environment environment; @@ -23,7 +27,7 @@ class SecurityConfigTest { @BeforeEach void setUp() { - securityConfig = new SecurityConfig(jwtAuthenticationFilter, environment); + securityConfig = new SecurityConfig(jwtAuthenticationFilter, operationLogWebFilter, environment); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/UnitTestConfig.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/UnitTestConfig.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/UnitTestConfig.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/config/UnitTestConfig.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/CreateRoleCommandTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/CreateRoleCommandTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/CreateRoleCommandTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/CreateRoleCommandTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/CreateUserCommandTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/CreateUserCommandTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/CreateUserCommandTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/CreateUserCommandTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/UpdateUserCommandTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/UpdateUserCommandTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/command/UpdateUserCommandTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/command/UpdateUserCommandTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/domain/SysUserTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/domain/SysUserTest.java similarity index 97% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/domain/SysUserTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/domain/SysUserTest.java index 3a657e3..76992e2 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/domain/SysUserTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/domain/SysUserTest.java @@ -59,7 +59,7 @@ class SysUserTest { assertNotNull(firstDeleteTime); assertNotNull(secondDeleteTime); - assertNotEquals(firstDeleteTime, secondDeleteTime); + assertEquals(firstDeleteTime, secondDeleteTime); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/query/SysRoleQueryTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/query/SysRoleQueryTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/query/SysRoleQueryTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/query/SysRoleQueryTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/query/SysUserQueryTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/query/SysUserQueryTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/query/SysUserQueryTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/query/SysUserQueryTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/DictionaryServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/DictionaryServiceTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/DictionaryServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/DictionaryServiceTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/OperationLogServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/OperationLogServiceTest.java similarity index 99% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/OperationLogServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/OperationLogServiceTest.java index 984eeef..97d0d1d 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/OperationLogServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/OperationLogServiceTest.java @@ -43,6 +43,7 @@ class OperationLogServiceTest { testLog.setDuration(100L); testLog.setIp("192.168.1.1"); testLog.setStatus("1"); + testLog.setCreatedAt(LocalDateTime.now()); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysConfigServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysConfigServiceTest.java similarity index 94% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysConfigServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysConfigServiceTest.java index 2b084c3..09ebdc2 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysConfigServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysConfigServiceTest.java @@ -1,5 +1,6 @@ package cn.novalon.manage.sys.core.service.impl; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import cn.novalon.manage.sys.core.domain.SysConfig; import cn.novalon.manage.sys.core.repository.ISysConfigRepository; import org.junit.jupiter.api.BeforeEach; @@ -26,13 +27,16 @@ class SysConfigServiceTest { @Mock private ISysConfigRepository repository; + @Mock + private IAuditLogService auditLogService; + private SysConfigService configService; private SysConfig testConfig; @BeforeEach void setUp() { - configService = new SysConfigService(repository); + configService = new SysConfigService(repository, auditLogService); testConfig = new SysConfig(); testConfig.setId(1L); @@ -110,11 +114,13 @@ class SysConfigServiceTest { @Test void testDeleteById() { + when(repository.findById(1L)).thenReturn(Mono.just(testConfig)); when(repository.deleteByIdAndDeletedAtIsNull(1L)).thenReturn(Mono.empty()); StepVerifier.create(configService.deleteById(1L)) .verifyComplete(); + verify(repository).findById(1L); verify(repository).deleteByIdAndDeletedAtIsNull(1L); } diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysDictDataServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysDictDataServiceTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysDictDataServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysDictDataServiceTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysDictTypeServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysDictTypeServiceTest.java similarity index 91% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysDictTypeServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysDictTypeServiceTest.java index 79ebb6a..f5352b0 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysDictTypeServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysDictTypeServiceTest.java @@ -1,5 +1,6 @@ package cn.novalon.manage.sys.core.service.impl; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import cn.novalon.manage.sys.core.domain.SysDictType; import cn.novalon.manage.sys.core.repository.ISysDictTypeRepository; import org.junit.jupiter.api.BeforeEach; @@ -23,12 +24,15 @@ class SysDictTypeServiceTest { @Mock private ISysDictTypeRepository repository; + @Mock + private IAuditLogService auditLogService; + private SysDictTypeService dictTypeService; private SysDictType testDictType; @BeforeEach void setUp() { - dictTypeService = new SysDictTypeService(repository); + dictTypeService = new SysDictTypeService(repository, auditLogService); testDictType = new SysDictType(); testDictType.setId(1L); @@ -93,6 +97,7 @@ class SysDictTypeServiceTest { @Test void testDeleteById() { + when(repository.findById(1L)).thenReturn(Mono.just(testDictType)); when(repository.deleteByIdAndDeletedAtIsNull(1L)).thenReturn(Mono.empty()); Mono result = dictTypeService.deleteById(1L); @@ -100,6 +105,7 @@ class SysDictTypeServiceTest { StepVerifier.create(result) .verifyComplete(); + verify(repository).findById(1L); verify(repository).deleteByIdAndDeletedAtIsNull(1L); } } \ No newline at end of file diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysExceptionLogServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysExceptionLogServiceTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysExceptionLogServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysExceptionLogServiceTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysLoginLogServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysLoginLogServiceTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysLoginLogServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysLoginLogServiceTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysMenuServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysMenuServiceTest.java similarity index 93% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysMenuServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysMenuServiceTest.java index c2d62b8..dbeb881 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysMenuServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysMenuServiceTest.java @@ -4,6 +4,7 @@ import cn.novalon.manage.sys.core.domain.SysMenu; import cn.novalon.manage.sys.core.repository.ISysMenuRepository; import cn.novalon.manage.sys.core.command.CreateMenuCommand; import cn.novalon.manage.sys.core.command.UpdateMenuCommand; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -25,12 +26,15 @@ class SysMenuServiceTest { @Mock private ISysMenuRepository menuRepository; + @Mock + private IAuditLogService auditLogService; + private SysMenuService menuService; private SysMenu testMenu; @BeforeEach void setUp() { - menuService = new SysMenuService(menuRepository); + menuService = new SysMenuService(menuRepository, auditLogService); testMenu = new SysMenu(); testMenu.setId(1L); @@ -129,7 +133,8 @@ class SysMenuServiceTest { @Test void testUpdateMenu() { - when(menuRepository.save(any(SysMenu.class))).thenReturn(Mono.just(testMenu)); + when(menuRepository.findById(1L)).thenReturn(Mono.just(testMenu)); + when(menuRepository.update(any(SysMenu.class))).thenReturn(Mono.just(testMenu)); Mono result = menuService.updateMenu(testMenu); @@ -138,7 +143,8 @@ class SysMenuServiceTest { menu.getUpdatedAt() != null) .verifyComplete(); - verify(menuRepository).save(any(SysMenu.class)); + verify(menuRepository).findById(1L); + verify(menuRepository).update(any(SysMenu.class)); } @Test @@ -147,7 +153,7 @@ class SysMenuServiceTest { 1L, 0L, "系统管理(更新)", "M", 1, "system", "system:manage", 1); when(menuRepository.findById(1L)).thenReturn(Mono.just(testMenu)); - when(menuRepository.save(any(SysMenu.class))).thenReturn(Mono.just(testMenu)); + when(menuRepository.update(any(SysMenu.class))).thenReturn(Mono.just(testMenu)); Mono result = menuService.updateMenu(command); @@ -157,7 +163,7 @@ class SysMenuServiceTest { .verifyComplete(); verify(menuRepository).findById(1L); - verify(menuRepository).save(any(SysMenu.class)); + verify(menuRepository).update(any(SysMenu.class)); } @Test @@ -200,7 +206,7 @@ class SysMenuServiceTest { updatedMenu.setUpdatedAt(LocalDateTime.now()); when(menuRepository.findById(1L)).thenReturn(Mono.just(existingMenu)); - when(menuRepository.save(any(SysMenu.class))).thenReturn(Mono.just(updatedMenu)); + when(menuRepository.update(any(SysMenu.class))).thenReturn(Mono.just(updatedMenu)); UpdateMenuCommand command = new UpdateMenuCommand( 1L, null, null, null, null, null, null, null); @@ -210,7 +216,7 @@ class SysMenuServiceTest { .verifyComplete(); verify(menuRepository).findById(1L); - verify(menuRepository).save(any(SysMenu.class)); + verify(menuRepository).update(any(SysMenu.class)); } @Test @@ -237,7 +243,7 @@ class SysMenuServiceTest { updatedMenu.setUpdatedAt(LocalDateTime.now()); when(menuRepository.findById(1L)).thenReturn(Mono.just(existingMenu)); - when(menuRepository.save(any(SysMenu.class))).thenReturn(Mono.just(updatedMenu)); + when(menuRepository.update(any(SysMenu.class))).thenReturn(Mono.just(updatedMenu)); UpdateMenuCommand command = new UpdateMenuCommand( 1L, 2L, "系统管理(更新)", "C", 2, "system_updated", "system:manage_updated", 0); @@ -247,11 +253,12 @@ class SysMenuServiceTest { .verifyComplete(); verify(menuRepository).findById(1L); - verify(menuRepository).save(any(SysMenu.class)); + verify(menuRepository).update(any(SysMenu.class)); } @Test void testDeleteMenu() { + when(menuRepository.findById(1L)).thenReturn(Mono.just(testMenu)); when(menuRepository.deleteById(1L)).thenReturn(Mono.empty()); Mono result = menuService.deleteMenu(1L); @@ -259,6 +266,7 @@ class SysMenuServiceTest { StepVerifier.create(result) .verifyComplete(); + verify(menuRepository).findById(1L); verify(menuRepository).deleteById(1L); } diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysRoleServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysRoleServiceTest.java similarity index 96% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysRoleServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysRoleServiceTest.java index a38db27..b87ed89 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysRoleServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysRoleServiceTest.java @@ -1,5 +1,6 @@ package cn.novalon.manage.sys.core.service.impl; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import cn.novalon.manage.common.util.StatusConstants; import cn.novalon.manage.sys.core.domain.SysRole; import cn.novalon.manage.sys.core.query.SysRoleQuery; @@ -46,13 +47,16 @@ class SysRoleServiceTest { @Mock private ISysRolePermissionRepository rolePermissionRepository; + @Mock + private IAuditLogService auditLogService; + private SysRoleService roleService; private SysRole testRole; @BeforeEach void setUp() { - roleService = new SysRoleService(roleRepository, userService, userRoleRepository, rolePermissionRepository); + roleService = new SysRoleService(roleRepository, userService, userRoleRepository, rolePermissionRepository, auditLogService); testRole = new SysRole(); testRole.setId(1L); @@ -206,7 +210,7 @@ class SysRoleServiceTest { existingRole.setStatus(StatusConstants.ENABLED); when(roleRepository.findById(1L)).thenReturn(Mono.just(existingRole)); - when(roleRepository.save(any(SysRole.class))).thenReturn(Mono.just(testRole)); + when(roleRepository.updateRole(any(SysRole.class))).thenReturn(Mono.just(testRole)); cn.novalon.manage.sys.core.command.UpdateRoleCommand command = new cn.novalon.manage.sys.core.command.UpdateRoleCommand( @@ -218,7 +222,7 @@ class SysRoleServiceTest { .verifyComplete(); verify(roleRepository).findById(1L); - verify(roleRepository).save(any(SysRole.class)); + verify(roleRepository).updateRole(any(SysRole.class)); } @Test @@ -231,7 +235,7 @@ class SysRoleServiceTest { existingRole.setStatus(StatusConstants.ENABLED); when(roleRepository.findById(1L)).thenReturn(Mono.just(existingRole)); - when(roleRepository.save(any(SysRole.class))).thenReturn(Mono.just(testRole)); + when(roleRepository.updateRole(any(SysRole.class))).thenReturn(Mono.just(testRole)); cn.novalon.manage.sys.core.command.UpdateRoleCommand command = new cn.novalon.manage.sys.core.command.UpdateRoleCommand( @@ -243,7 +247,7 @@ class SysRoleServiceTest { .verifyComplete(); verify(roleRepository).findById(1L); - verify(roleRepository).save(any(SysRole.class)); + verify(roleRepository).updateRole(any(SysRole.class)); } @Test @@ -252,13 +256,15 @@ class SysRoleServiceTest { updateRole.setId(1L); updateRole.setRoleName("updated_admin"); - when(roleRepository.save(any(SysRole.class))).thenReturn(Mono.just(testRole)); + when(roleRepository.findById(1L)).thenReturn(Mono.just(testRole)); + when(roleRepository.updateRole(any(SysRole.class))).thenReturn(Mono.just(testRole)); StepVerifier.create(roleService.updateRole(updateRole)) .expectNextMatches(role -> role.getUpdatedAt() != null) .verifyComplete(); - verify(roleRepository).save(any(SysRole.class)); + verify(roleRepository).findById(1L); + verify(roleRepository).updateRole(any(SysRole.class)); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java similarity index 98% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java index e05c1d9..aec3f69 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java @@ -1,6 +1,7 @@ package cn.novalon.manage.sys.core.service.impl; import cn.novalon.manage.common.util.StatusConstants; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import cn.novalon.manage.sys.config.IntegrationTestConfig; import cn.novalon.manage.sys.core.domain.SysUser; import cn.novalon.manage.sys.core.domain.SysRole; @@ -76,6 +77,9 @@ class SysUserServiceIntegrationTest { @Autowired private IUserRoleRepository userRoleRepository; + @Autowired + private IAuditLogService auditLogService; + @Autowired private R2dbcEntityTemplate r2dbcEntityTemplate; @@ -85,7 +89,7 @@ class SysUserServiceIntegrationTest { @BeforeEach void setUp() { passwordEncoder = new BCryptPasswordEncoder(12); - userService = new SysUserService(userRepository, roleRepository, userRoleRepository, passwordEncoder); + userService = new SysUserService(userRepository, roleRepository, userRoleRepository, passwordEncoder, auditLogService); r2dbcEntityTemplate.delete(SysUser.class).all().block(); r2dbcEntityTemplate.delete(SysRole.class).all().block(); diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceTest.java similarity index 93% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceTest.java index 8da29ec..b3843c4 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserServiceTest.java @@ -1,6 +1,8 @@ package cn.novalon.manage.sys.core.service.impl; import cn.novalon.manage.common.util.StatusConstants; +import cn.novalon.manage.sys.audit.service.IAuditLogService; +import cn.novalon.manage.sys.audit.domain.AuditLog; import cn.novalon.manage.sys.core.domain.SysUser; import cn.novalon.manage.sys.core.domain.UserRole; import cn.novalon.manage.sys.core.repository.ISysUserRepository; @@ -45,11 +47,14 @@ class SysUserServiceTest { @Mock private PasswordEncoder passwordEncoder; + @Mock + private IAuditLogService auditLogService; + private SysUserService userService; @BeforeEach void setUp() { - userService = new SysUserService(userRepository, roleRepository, userRoleRepository, passwordEncoder); + userService = new SysUserService(userRepository, roleRepository, userRoleRepository, passwordEncoder, auditLogService); } @Test @@ -164,7 +169,8 @@ class SysUserServiceTest { user.setUsername("testuser"); user.setEmail("updated@example.com"); - when(userRepository.save(any(SysUser.class))).thenReturn(Mono.just(user)); + when(userRepository.findById(1L)).thenReturn(Mono.just(user)); + when(userRepository.update(any(SysUser.class))).thenReturn(Mono.just(user)); StepVerifier.create(userService.updateUser(user)) .expectNextMatches(updatedUser -> @@ -173,7 +179,8 @@ class SysUserServiceTest { ) .verifyComplete(); - verify(userRepository, times(1)).save(any(SysUser.class)); + verify(userRepository, times(1)).findById(1L); + verify(userRepository, times(1)).update(any(SysUser.class)); } @Test @@ -218,7 +225,7 @@ class SysUserServiceTest { when(userRepository.findById(1L)).thenReturn(Mono.just(user)); when(passwordEncoder.matches("oldPassword", "$2b$12$oldPassword")).thenReturn(true); when(passwordEncoder.encode("newPassword")).thenReturn("$2b$12$newPassword"); - when(userRepository.save(any(SysUser.class))).thenAnswer(invocation -> Mono.just(invocation.getArgument(0))); + when(userRepository.update(any(SysUser.class))).thenAnswer(invocation -> Mono.just(invocation.getArgument(0))); StepVerifier.create(userService.changePassword(1L, "oldPassword", "newPassword")) .expectNextMatches(updatedUser -> @@ -228,7 +235,7 @@ class SysUserServiceTest { verify(passwordEncoder, times(1)).matches("oldPassword", "$2b$12$oldPassword"); verify(passwordEncoder, times(1)).encode("newPassword"); - verify(userRepository, times(1)).save(any(SysUser.class)); + verify(userRepository, times(1)).update(any(SysUser.class)); } @Test diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/AuthResponseTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/AuthResponseTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/AuthResponseTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/AuthResponseTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/FilePreviewResponseTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/FilePreviewResponseTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/FilePreviewResponseTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/FilePreviewResponseTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/UserResponseTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/UserResponseTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/dto/response/UserResponseTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/dto/response/UserResponseTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/filter/RateLimitFilterTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/filter/RateLimitFilterTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/filter/RateLimitFilterTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/filter/RateLimitFilterTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/auth/SysAuthHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/auth/SysAuthHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/auth/SysAuthHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/auth/SysAuthHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/config/SysConfigHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/config/SysConfigHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/config/SysConfigHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/config/SysConfigHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/dict/SysDictHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/dict/SysDictHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/dict/SysDictHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/dict/SysDictHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/dictionary/DictionaryHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/dictionary/DictionaryHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/dictionary/DictionaryHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/dictionary/DictionaryHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/log/OperationLogHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/log/OperationLogHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/log/OperationLogHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/log/OperationLogHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/log/SysLogHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/log/SysLogHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/log/SysLogHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/log/SysLogHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/menu/MenuHandlerDataIntegrityTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/menu/MenuHandlerDataIntegrityTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/menu/MenuHandlerDataIntegrityTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/menu/MenuHandlerDataIntegrityTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/menu/MenuHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/menu/MenuHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/menu/MenuHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/menu/MenuHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/role/SysRoleHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/role/SysRoleHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/role/SysRoleHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/role/SysRoleHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/stats/StatsHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/stats/StatsHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/stats/StatsHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/stats/StatsHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/user/SysUserHandlerTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/user/SysUserHandlerTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/user/SysUserHandlerTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/handler/user/SysUserHandlerTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/integration/SystemConfigRegressionTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/integration/SystemConfigRegressionTest.java similarity index 98% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/integration/SystemConfigRegressionTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/integration/SystemConfigRegressionTest.java index 6d10423..4fe7862 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/integration/SystemConfigRegressionTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/integration/SystemConfigRegressionTest.java @@ -10,6 +10,7 @@ import cn.novalon.manage.sys.core.service.ISysMenuService; import cn.novalon.manage.sys.core.service.ISysRoleService; import cn.novalon.manage.sys.core.service.ISysUserService; import cn.novalon.manage.sys.core.service.impl.SysMenuService; +import cn.novalon.manage.sys.audit.service.IAuditLogService; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -61,6 +62,9 @@ class SystemConfigRegressionTest { @Mock private ISysMenuRepository menuRepository; + @Mock + private IAuditLogService auditLogService; + private SysUser adminUser; private SysUser normalUser; private SysUser guestUser; @@ -374,7 +378,7 @@ class SystemConfigRegressionTest { void testAdminUser_MenuManagement() { /* unused */ - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .expectNextCount(0) @@ -384,7 +388,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("3.2 普通用户 - 菜单访问控制") void testNormalUser_MenuAccess() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .expectNextCount(0) @@ -394,7 +398,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("3.3 访客用户 - 菜单访问控制") void testGuestUser_MenuAccess() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .expectNextCount(0) @@ -404,7 +408,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("3.4 菜单树构建 - 管理员视图") void testMenuTree_Build_Admin() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .verifyComplete(); @@ -413,7 +417,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("3.5 权限菜单过滤 - 普通用户视图") void testMenuFilter_NormalUser() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .expectNextCount(0) @@ -423,7 +427,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("3.6 权限菜单过滤 - 访客视图") void testMenuFilter_Guest() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .expectNextCount(0) @@ -472,7 +476,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("5.2 大量菜单加载性能测试") void testLargeMenuLoadPerformance() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); long startTime = System.currentTimeMillis(); @@ -516,7 +520,7 @@ class SystemConfigRegressionTest { @Test @DisplayName("6.3 菜单层级结构完整性") void testMenuHierarchy_Integrity() { - ISysMenuService menuService = new SysMenuService(menuRepository); + ISysMenuService menuService = new SysMenuService(menuRepository, auditLogService); StepVerifier.create(menuService.findAll()) .verifyComplete(); diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/EmailTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/EmailTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/EmailTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/EmailTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/PasswordDetailedTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/PasswordDetailedTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/PasswordDetailedTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/PasswordDetailedTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/PasswordTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/PasswordTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/PasswordTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/PasswordTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/UsernameTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/UsernameTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/primitive/UsernameTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/primitive/UsernameTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/security/JwtAuthenticationFilterTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/security/JwtAuthenticationFilterTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/security/JwtAuthenticationFilterTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/security/JwtAuthenticationFilterTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/security/JwtTokenProviderTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/security/JwtTokenProviderTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/security/JwtTokenProviderTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/security/JwtTokenProviderTest.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/IpUtilsTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/IpUtilsTest.java similarity index 99% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/IpUtilsTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/IpUtilsTest.java index c65290f..0e5b3db 100644 --- a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/IpUtilsTest.java +++ b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/IpUtilsTest.java @@ -22,7 +22,7 @@ class IpUtilsTest { @Test @DisplayName("当request为null时,应返回unknown") void getClientIp_whenRequestIsNull_shouldReturnUnknown() { - String ip = IpUtils.getClientIp(null); + String ip = IpUtils.getClientIp((ServerRequest) null); assertEquals("unknown", ip); } diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/PasswordHashGenerator.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/PasswordHashGenerator.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/PasswordHashGenerator.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/PasswordHashGenerator.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/TestDataFactory.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/TestDataFactory.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/TestDataFactory.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/TestDataFactory.java diff --git a/novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/UserAgentParserTest.java b/novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/UserAgentParserTest.java similarity index 100% rename from novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/util/UserAgentParserTest.java rename to novalon-manage-api/manage-sys/src/test/java/cn/novalon/gym/manage/sys/util/UserAgentParserTest.java