BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 123617a9af5257566af28cd3b2ddb5b9713474d5

Authored by YunaiV
1 parent b2e6e36f

1. 修复 OAuth2OpenControllerTest 单元测试

Inline Side-by-side
Showing 1 changed file with 7 additions and 6 deletions
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java
  View file @123617a
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; @@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
8 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 8 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
9 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 9 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 import cn.iocoder.yudao.framework.common.util.collection.SetUtils; 10 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
  11 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
11 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; 12 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
12 import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; 13 import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO;
13 import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; 14 import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO;
@@ -77,7 +78,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -77,7 +78,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
77 78
78 // mock 方法（访问令牌） 79 // mock 方法（访问令牌）
79 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) 80 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class)
80 - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 10L, ChronoUnit.MILLIS)); // 多给 10 毫秒，保证可执行完 81 + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS));
81 when(oauth2GrantService.grantAuthorizationCodeForAccessToken(eq("test_client_id"), 82 when(oauth2GrantService.grantAuthorizationCodeForAccessToken(eq("test_client_id"),
82 eq(code), eq(redirectUri), eq(state))).thenReturn(accessTokenDO); 83 eq(code), eq(redirectUri), eq(state))).thenReturn(accessTokenDO);
83 84
@@ -87,7 +88,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -87,7 +88,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
87 // 断言 88 // 断言
88 assertEquals(0, result.getCode()); 89 assertEquals(0, result.getCode());
89 assertPojoEquals(accessTokenDO, result.getData()); 90 assertPojoEquals(accessTokenDO, result.getData());
90 - assertEquals(30L, result.getData().getExpiresIn()); // 执行过程会过去几毫秒 91 + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // 执行过程会过去几毫秒
91 } 92 }
92 93
93 @Test 94 @Test
@@ -105,7 +106,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -105,7 +106,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
105 106
106 // mock 方法（访问令牌） 107 // mock 方法（访问令牌）
107 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) 108 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class)
108 - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30050L, ChronoUnit.MILLIS)); // 多给 10 毫秒，保证可执行完 109 + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS));
109 when(oauth2GrantService.grantPassword(eq(username), eq(password), eq("test_client_id"), 110 when(oauth2GrantService.grantPassword(eq(username), eq(password), eq("test_client_id"),
110 eq(Lists.newArrayList("write", "read")))).thenReturn(accessTokenDO); 111 eq(Lists.newArrayList("write", "read")))).thenReturn(accessTokenDO);
111 112
@@ -115,7 +116,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -115,7 +116,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
115 // 断言 116 // 断言
116 assertEquals(0, result.getCode()); 117 assertEquals(0, result.getCode());
117 assertPojoEquals(accessTokenDO, result.getData()); 118 assertPojoEquals(accessTokenDO, result.getData());
118 - assertEquals(30L, result.getData().getExpiresIn()); // 执行过程会过去几毫秒 119 + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // 执行过程会过去几毫秒
119 } 120 }
120 121
121 @Test 122 @Test
@@ -132,7 +133,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -132,7 +133,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
132 133
133 // mock 方法（访问令牌） 134 // mock 方法（访问令牌）
134 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) 135 OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class)
135 - .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30050L, ChronoUnit.MILLIS)); // 多给 10 毫秒，保证可执行完 136 + .setExpiresTime(LocalDateTimeUtil.offset(LocalDateTime.now(), 30000L, ChronoUnit.MILLIS));
136 when(oauth2GrantService.grantRefreshToken(eq(refreshToken), eq("test_client_id"))).thenReturn(accessTokenDO); 137 when(oauth2GrantService.grantRefreshToken(eq(refreshToken), eq("test_client_id"))).thenReturn(accessTokenDO);
137 138
138 // 调用 139 // 调用
@@ -141,7 +142,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { @@ -141,7 +142,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest {
141 // 断言 142 // 断言
142 assertEquals(0, result.getCode()); 143 assertEquals(0, result.getCode());
143 assertPojoEquals(accessTokenDO, result.getData()); 144 assertPojoEquals(accessTokenDO, result.getData());
144 - assertEquals(30L, result.getData().getExpiresIn()); // 执行过程会过去几毫秒 145 + assertTrue(ObjectUtils.equalsAny(result.getData().getExpiresIn(), 29L, 30L)); // 执行过程会过去几毫秒
145 } 146 }
146 147
147 @Test 148 @Test