|
@@ -22,7 +22,6 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService;
|
|
|
import com.xingyuv.captcha.model.common.ResponseModel;
|
|
|
import com.xingyuv.captcha.service.CaptchaService;
|
|
|
import jakarta.annotation.Resource;
|
|
|
-import jakarta.validation.ConstraintViolationException;
|
|
|
import jakarta.validation.Validation;
|
|
|
import jakarta.validation.Validator;
|
|
|
import org.junit.jupiter.api.BeforeEach;
|
|
@@ -37,7 +36,6 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
|
|
|
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
|
|
|
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
|
|
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
|
-import static org.junit.jupiter.api.Assertions.assertThrows;
|
|
|
import static org.mockito.ArgumentMatchers.eq;
|
|
|
import static org.mockito.Mockito.*;
|
|
|
|
|
@@ -66,7 +64,7 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
|
|
|
|
|
|
@BeforeEach
|
|
|
public void setUp() {
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", true);
|
|
|
+ authService.setCaptchaEnable(true);
|
|
|
// 注入一个 Validator 对象
|
|
|
ReflectUtil.setFieldValue(authService, "validator",
|
|
|
Validation.buildDefaultValidatorFactory().getValidator());
|
|
@@ -156,7 +154,7 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
|
|
|
.setSocialType(randomEle(SocialTypeEnum.values()).getType()));
|
|
|
|
|
|
// mock 验证码正确
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", false);
|
|
|
+ authService.setCaptchaEnable(false);
|
|
|
// mock user 数据
|
|
|
AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L).setUsername("test_username")
|
|
|
.setPassword("test_password").setStatus(CommonStatusEnum.ENABLE.getStatus()));
|
|
@@ -269,8 +267,6 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
|
|
|
// 准备参数
|
|
|
AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
|
|
|
|
|
|
- // mock 验证码打开
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", true);
|
|
|
// mock 验证通过
|
|
|
when(captchaService.verification(argThat(captchaVO -> {
|
|
|
assertEquals(reqVO.getCaptchaVerification(), captchaVO.getCaptchaVerification());
|
|
@@ -287,34 +283,17 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
|
|
|
AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
|
|
|
|
|
|
// mock 验证码关闭
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", false);
|
|
|
+ authService.setCaptchaEnable(false);
|
|
|
|
|
|
// 调用,无需断言
|
|
|
authService.validateCaptcha(reqVO);
|
|
|
}
|
|
|
|
|
|
- @Test
|
|
|
- public void testValidateCaptcha_constraintViolationException() {
|
|
|
- // 准备参数
|
|
|
- AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
|
|
|
- reqVO.setCaptchaVerification(null);
|
|
|
-
|
|
|
- // mock 验证码打开
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", true);
|
|
|
-
|
|
|
- // 调用,并断言异常
|
|
|
- assertThrows(ConstraintViolationException.class, () -> authService.validateCaptcha(reqVO),
|
|
|
- "验证码不能为空");
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
@Test
|
|
|
public void testCaptcha_fail() {
|
|
|
// 准备参数
|
|
|
AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class);
|
|
|
|
|
|
- // mock 验证码打开
|
|
|
- ReflectUtil.setFieldValue(authService, "captchaEnable", true);
|
|
|
// mock 验证通过
|
|
|
when(captchaService.verification(argThat(captchaVO -> {
|
|
|
assertEquals(reqVO.getCaptchaVerification(), captchaVO.getCaptchaVerification());
|