Commit 45a4108138c377de19fd39aeff5b5b7748f5ab83

Authored by LAPTOP-00JMG2HE\George Wei
1 parent e3667125

添加忽略expiresTime、createTime和updateTime的TODO提示

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java
@@ -114,6 +114,7 @@ public class JobLogServiceImplTest extends BaseDbUnitTest { @@ -114,6 +114,7 @@ public class JobLogServiceImplTest extends BaseDbUnitTest {
114 assertEquals(1, count); 114 assertEquals(1, count);
115 List<JobLogDO> logs = jobLogMapper.selectList(); 115 List<JobLogDO> logs = jobLogMapper.selectList();
116 assertEquals(1, logs.size()); 116 assertEquals(1, logs.size());
  117 + // TODO @芋艿:createTime updateTime 被屏蔽,仅 win11 会复现,建议后续修复。
117 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime"); 118 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
118 } 119 }
119 120
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
@@ -91,6 +91,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest { @@ -91,6 +91,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
91 assertEquals(1, count); 91 assertEquals(1, count);
92 List<ApiAccessLogDO> logs = apiAccessLogMapper.selectList(); 92 List<ApiAccessLogDO> logs = apiAccessLogMapper.selectList();
93 assertEquals(1, logs.size()); 93 assertEquals(1, logs.size());
  94 + // TODO @芋艿:createTime updateTime 被屏蔽,仅 win11 会复现,建议后续修复。
94 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime"); 95 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
95 } 96 }
96 97
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
@@ -157,6 +157,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest { @@ -157,6 +157,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
157 assertEquals(1, count); 157 assertEquals(1, count);
158 List<ApiErrorLogDO> logs = apiErrorLogMapper.selectList(); 158 List<ApiErrorLogDO> logs = apiErrorLogMapper.selectList();
159 assertEquals(1, logs.size()); 159 assertEquals(1, logs.size());
  160 + // TODO @芋艿:createTime updateTime 被屏蔽,仅 win11 会复现,建议后续修复。
160 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime"); 161 assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
161 } 162 }
162 163
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
@@ -209,6 +209,7 @@ public class OAuth2ApproveServiceImplTest extends BaseDbUnitTest { @@ -209,6 +209,7 @@ public class OAuth2ApproveServiceImplTest extends BaseDbUnitTest {
209 List<OAuth2ApproveDO> result = oauth2ApproveService.getApproveList(userId, userType, clientId); 209 List<OAuth2ApproveDO> result = oauth2ApproveService.getApproveList(userId, userType, clientId);
210 // 断言 210 // 断言
211 assertEquals(1, result.size()); 211 assertEquals(1, result.size());
  212 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
212 assertPojoEquals(approve, result.get(0), "expiresTime"); 213 assertPojoEquals(approve, result.get(0), "expiresTime");
213 } 214 }
214 215
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java
@@ -50,6 +50,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest { @@ -50,6 +50,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest {
50 scopes, redirectUri, state); 50 scopes, redirectUri, state);
51 // 断言 51 // 断言
52 OAuth2CodeDO dbCodeDO = oauth2CodeMapper.selectByCode(codeDO.getCode()); 52 OAuth2CodeDO dbCodeDO = oauth2CodeMapper.selectByCode(codeDO.getCode());
  53 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
53 assertPojoEquals(codeDO, dbCodeDO, "expiresTime", "createTime", "updateTime", "deleted"); 54 assertPojoEquals(codeDO, dbCodeDO, "expiresTime", "createTime", "updateTime", "deleted");
54 assertEquals(userId, codeDO.getUserId()); 55 assertEquals(userId, codeDO.getUserId());
55 assertEquals(userType, codeDO.getUserType()); 56 assertEquals(userType, codeDO.getUserType());
@@ -92,6 +93,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest { @@ -92,6 +93,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest {
92 93
93 // 调用 94 // 调用
94 OAuth2CodeDO result = oauth2CodeService.consumeAuthorizationCode(code); 95 OAuth2CodeDO result = oauth2CodeService.consumeAuthorizationCode(code);
  96 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
95 assertPojoEquals(codeDO, result, "expiresTime"); 97 assertPojoEquals(codeDO, result, "expiresTime");
96 assertNull(oauth2CodeMapper.selectByCode(code)); 98 assertNull(oauth2CodeMapper.selectByCode(code));
97 } 99 }
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
@@ -77,6 +77,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -77,6 +77,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
77 OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, userType, clientId, scopes); 77 OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, userType, clientId, scopes);
78 // 断言访问令牌 78 // 断言访问令牌
79 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(accessTokenDO.getAccessToken()); 79 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(accessTokenDO.getAccessToken());
  80 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
80 assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted"); 81 assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
81 assertEquals(userId, accessTokenDO.getUserId()); 82 assertEquals(userId, accessTokenDO.getUserId());
82 assertEquals(userType, accessTokenDO.getUserType()); 83 assertEquals(userType, accessTokenDO.getUserType());
@@ -88,6 +89,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -88,6 +89,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
88 assertFalse(DateUtils.isExpired(accessTokenDO.getExpiresTime())); 89 assertFalse(DateUtils.isExpired(accessTokenDO.getExpiresTime()));
89 // 断言访问令牌的缓存 90 // 断言访问令牌的缓存
90 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken()); 91 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken());
  92 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
91 assertPojoEquals(accessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted"); 93 assertPojoEquals(accessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
92 // 断言刷新令牌 94 // 断言刷新令牌
93 OAuth2RefreshTokenDO refreshTokenDO = oauth2RefreshTokenMapper.selectList().get(0); 95 OAuth2RefreshTokenDO refreshTokenDO = oauth2RefreshTokenMapper.selectList().get(0);
@@ -177,12 +179,14 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -177,12 +179,14 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
177 assertNull(oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken())); 179 assertNull(oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken()));
178 // 断言,新的访问令牌 180 // 断言,新的访问令牌
179 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(newAccessTokenDO.getAccessToken()); 181 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(newAccessTokenDO.getAccessToken());
  182 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
180 assertPojoEquals(newAccessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted"); 183 assertPojoEquals(newAccessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
181 assertPojoEquals(newAccessTokenDO, refreshTokenDO, "id", "expiresTime", "createTime", "updateTime", "deleted", 184 assertPojoEquals(newAccessTokenDO, refreshTokenDO, "id", "expiresTime", "createTime", "updateTime", "deleted",
182 "creator", "updater"); 185 "creator", "updater");
183 assertFalse(DateUtils.isExpired(newAccessTokenDO.getExpiresTime())); 186 assertFalse(DateUtils.isExpired(newAccessTokenDO.getExpiresTime()));
184 // 断言,新的访问令牌的缓存 187 // 断言,新的访问令牌的缓存
185 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(newAccessTokenDO.getAccessToken()); 188 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(newAccessTokenDO.getAccessToken());
  189 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
186 assertPojoEquals(newAccessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted"); 190 assertPojoEquals(newAccessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
187 } 191 }
188 192
@@ -198,8 +202,10 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -198,8 +202,10 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
198 // 调用 202 // 调用
199 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken); 203 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken);
200 // 断言 204 // 断言
  205 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
201 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted", 206 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
202 "creator", "updater"); 207 "creator", "updater");
  208 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
203 assertPojoEquals(accessTokenDO, oauth2AccessTokenRedisDAO.get(accessToken), "expiresTime", "createTime", "updateTime", "deleted", 209 assertPojoEquals(accessTokenDO, oauth2AccessTokenRedisDAO.get(accessToken), "expiresTime", "createTime", "updateTime", "deleted",
204 "creator", "updater"); 210 "creator", "updater");
205 } 211 }
@@ -237,6 +243,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -237,6 +243,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
237 // 调研,并断言 243 // 调研,并断言
238 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken); 244 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken);
239 // 断言 245 // 断言
  246 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
240 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted", 247 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
241 "creator", "updater"); 248 "creator", "updater");
242 } 249 }
@@ -259,6 +266,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -259,6 +266,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
259 oauth2RefreshTokenMapper.insert(refreshTokenDO); 266 oauth2RefreshTokenMapper.insert(refreshTokenDO);
260 // 调用 267 // 调用
261 OAuth2AccessTokenDO result = oauth2TokenService.removeAccessToken(accessTokenDO.getAccessToken()); 268 OAuth2AccessTokenDO result = oauth2TokenService.removeAccessToken(accessTokenDO.getAccessToken());
  269 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
262 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted", 270 assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
263 "creator", "updater"); 271 "creator", "updater");
264 // 断言数据 272 // 断言数据
@@ -297,6 +305,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest { @@ -297,6 +305,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
297 // 断言 305 // 断言
298 assertEquals(1, pageResult.getTotal()); 306 assertEquals(1, pageResult.getTotal());
299 assertEquals(1, pageResult.getList().size()); 307 assertEquals(1, pageResult.getList().size());
  308 + // TODO @芋艿:expiresTime 被屏蔽,仅 win11 会复现,建议后续修复。
300 assertPojoEquals(dbAccessToken, pageResult.getList().get(0), "expiresTime"); 309 assertPojoEquals(dbAccessToken, pageResult.getList().get(0), "expiresTime");
301 } 310 }
302 311