diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java index b554af7abe9ba2f074c46bee5edf2346c9f74b8a..cfadfc74701b20f6c9b565f067c9ee2cd43f96f5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java +++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java @@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.exception.ErrorCode; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.collection.SetUtils; +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; @@ -77,7 +78,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // mock 方法(访问令牌) OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 10L, ChronoUnit.MILLIS)); // 多给 10 毫秒,ä¿è¯å¯æ‰§è¡Œå®Œ + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS)); when(oauth2GrantService.grantAuthorizationCodeForAccessToken(eq("test_client_id"), eq(code), eq(redirectUri), eq(state))).thenReturn(accessTokenDO); @@ -87,7 +88,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // æ–言 assertEquals(0, result.getCode()); assertPojoEquals(accessTokenDO, result.getData()); - assertEquals(30L, result.getData().getExpiresIn()); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ } @Test @@ -105,7 +106,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // mock 方法(访问令牌) OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30050L, ChronoUnit.MILLIS)); // 多给 10 毫秒,ä¿è¯å¯æ‰§è¡Œå®Œ + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS)); when(oauth2GrantService.grantPassword(eq(username), eq(password), eq("test_client_id"), eq(Lists.newArrayList("write", "read")))).thenReturn(accessTokenDO); @@ -115,7 +116,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // æ–言 assertEquals(0, result.getCode()); assertPojoEquals(accessTokenDO, result.getData()); - assertEquals(30L, result.getData().getExpiresIn()); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ } @Test @@ -132,7 +133,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // mock 方法(访问令牌) OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30050L, ChronoUnit.MILLIS)); // 多给 10 毫秒,ä¿è¯å¯æ‰§è¡Œå®Œ + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS)); when(oauth2GrantService.grantRefreshToken(eq(refreshToken), eq("test_client_id"))).thenReturn(accessTokenDO); // 调用 @@ -141,7 +142,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { // æ–言 assertEquals(0, result.getCode()); assertPojoEquals(accessTokenDO, result.getData()); - assertEquals(30L, result.getData().getExpiresIn()); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // æ‰§è¡Œè¿‡ç¨‹ä¼šè¿‡åŽ»å‡ æ¯«ç§’ } @Test