mirror of
https://github.com/ccmjga/zhilu-admin
synced 2026-03-15 22:23:41 +08:00
fix pmd and test
This commit is contained in:
@@ -46,7 +46,7 @@ public class JacksonAnnotationMvcTest {
|
||||
stubUserRolePermissionDto.setUsername(stubUsername);
|
||||
stubUserRolePermissionDto.setPassword(stubPassword);
|
||||
when(identityAccessService.pageQueryUser(
|
||||
PageRequestDto.of(1, 5), new UserQueryDto(stubUsername)))
|
||||
PageRequestDto.of(1, 5), new UserQueryDto(stubUsername, null, null)))
|
||||
.thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto)));
|
||||
mockMvc
|
||||
.perform(
|
||||
|
||||
@@ -59,7 +59,7 @@ class UserRolePermissionMvcTest {
|
||||
@Test
|
||||
@WithMockUser
|
||||
void deleteUser_givenValidHttpRequest_shouldSucceedWith200() throws Exception {
|
||||
Long stubUserId = 1L;
|
||||
Long stubUserId = 2L;
|
||||
mockMvc
|
||||
.perform(
|
||||
delete(String.format("/iam/user?userId=%s", stubUserId))
|
||||
@@ -152,7 +152,7 @@ class UserRolePermissionMvcTest {
|
||||
stubUserRolePermissionDto.setId(1L);
|
||||
stubUserRolePermissionDto.setUsername(stubUsername);
|
||||
when(identityAccessService.pageQueryUser(
|
||||
PageRequestDto.of(1, 5), new UserQueryDto(stubUsername)))
|
||||
PageRequestDto.of(1, 5), new UserQueryDto(stubUsername, null, null)))
|
||||
.thenReturn(new PageResponseDto<>(1, List.of(stubUserRolePermissionDto)));
|
||||
mockMvc
|
||||
.perform(
|
||||
|
||||
@@ -32,7 +32,7 @@ public class SortByDALTest extends AbstractDataAccessLayerTest {
|
||||
"INSERT INTO mjga.user (id, username,password) VALUES (3, 'testC','qFVVFvPqs291k10')",
|
||||
})
|
||||
void userPageFetchWithNoSort() {
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test");
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null);
|
||||
Result<Record> records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto);
|
||||
assertThat(records.get(0).get(USER.ID)).isEqualTo(1);
|
||||
assertThat(records.get(1).get(USER.ID)).isEqualTo(2);
|
||||
@@ -48,7 +48,7 @@ public class SortByDALTest extends AbstractDataAccessLayerTest {
|
||||
"INSERT INTO mjga.user (id, username,password) VALUES (4, 'testD','3')",
|
||||
})
|
||||
void userPageFetchWithSort() {
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test");
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null);
|
||||
HashMap<String, PageRequestDto.Direction> sortByIdDesc = new HashMap<>();
|
||||
sortByIdDesc.put("id", PageRequestDto.Direction.DESC);
|
||||
Result<Record> records =
|
||||
|
||||
@@ -96,7 +96,7 @@ public class UserRolePermissionDALTest extends AbstractDataAccessLayerTest {
|
||||
"INSERT INTO mjga.user (id, username,password) VALUES (2, 'testB','NTjRCeUq2EqCy')",
|
||||
})
|
||||
void user_pageFetchBy() {
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test");
|
||||
UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null);
|
||||
Result<Record> records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto);
|
||||
assertThat(records.size()).isEqualTo(2);
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ class UserRolePermissionUnitTest {
|
||||
// action
|
||||
PageResponseDto<List<UserRolePermissionDto>> result =
|
||||
identityAccessService.pageQueryUser(
|
||||
PageRequestDto.of(1, 10), new UserQueryDto(stubUserName2));
|
||||
PageRequestDto.of(1, 10), new UserQueryDto(stubUserName2, null, null));
|
||||
|
||||
// assert
|
||||
List<UserRolePermissionDto> userRolePermissionDtoList = result.getData();
|
||||
@@ -173,7 +173,7 @@ class UserRolePermissionUnitTest {
|
||||
.thenReturn(mockResult);
|
||||
PageResponseDto<List<UserRolePermissionDto>> result =
|
||||
identityAccessService.pageQueryUser(
|
||||
PageRequestDto.of(1, 10), new UserQueryDto("agydCO1Yi99a"));
|
||||
PageRequestDto.of(1, 10), new UserQueryDto("agydCO1Yi99a", null, null));
|
||||
assertThat(result.getTotal()).isEqualTo(0);
|
||||
assertThat(result.getData()).isNull();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user