BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e36671255a9f0c0f6f71691a75974cbdd11d9327

Authored by LAPTOP-00JMG2HE\George Wei
1 parent 9b2ec3d3

修复执行mvn test时多个TestCase失败的问题。失败原因：1)使用断言比较POJO对象时未忽略expiresTime、createTime、updat… 

…eTime属性；2)初始化测试数据库时未以UTF8编码读取脚本
Inline Side-by-side
Showing 7 changed files with 16 additions and 15 deletions
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java
  View file @e366712
... ... @@ -114,7 +114,7 @@ public class JobLogServiceImplTest extends BaseDbUnitTest {
114 114 assertEquals(1, count);
115 115 List<JobLogDO> logs = jobLogMapper.selectList();
116 116 assertEquals(1, logs.size());
117   - assertEquals(log02, logs.get(0));
  117 + assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
118 118 }
119 119  
120 120 @Test
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
  View file @e366712
... ... @@ -91,7 +91,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
91 91 assertEquals(1, count);
92 92 List<ApiAccessLogDO> logs = apiAccessLogMapper.selectList();
93 93 assertEquals(1, logs.size());
94   - assertEquals(log02, logs.get(0));
  94 + assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
95 95 }
96 96  
97 97 @Test
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
  View file @e366712
... ... @@ -157,7 +157,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
157 157 assertEquals(1, count);
158 158 List<ApiErrorLogDO> logs = apiErrorLogMapper.selectList();
159 159 assertEquals(1, logs.size());
160   - assertEquals(log02, logs.get(0));
  160 + assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
161 161 }
162 162  
163 163 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml
  View file @e366712
... ... @@ -19,6 +19,7 @@ spring:
19 19 sql:
20 20 init:
21 21 schema-locations: classpath:/sql/create_tables.sql
  22 + encoding: UTF-8
22 23  
23 24 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
24 25 data:
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
  View file @e366712
... ... @@ -209,7 +209,7 @@ public class OAuth2ApproveServiceImplTest extends BaseDbUnitTest {
209 209 List<OAuth2ApproveDO> result = oauth2ApproveService.getApproveList(userId, userType, clientId);
210 210 // 断言
211 211 assertEquals(1, result.size());
212   - assertPojoEquals(approve, result.get(0));
  212 + assertPojoEquals(approve, result.get(0), "expiresTime");
213 213 }
214 214  
215 215 @Test
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java
  View file @e366712
... ... @@ -50,7 +50,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest {
50 50 scopes, redirectUri, state);
51 51 // 断言
52 52 OAuth2CodeDO dbCodeDO = oauth2CodeMapper.selectByCode(codeDO.getCode());
53   - assertPojoEquals(codeDO, dbCodeDO, "createTime", "updateTime", "deleted");
  53 + assertPojoEquals(codeDO, dbCodeDO, "expiresTime", "createTime", "updateTime", "deleted");
54 54 assertEquals(userId, codeDO.getUserId());
55 55 assertEquals(userType, codeDO.getUserType());
56 56 assertEquals(clientId, codeDO.getClientId());
... ... @@ -92,7 +92,7 @@ class OAuth2CodeServiceImplTest extends BaseDbUnitTest {
92 92  
93 93 // 调用
94 94 OAuth2CodeDO result = oauth2CodeService.consumeAuthorizationCode(code);
95   - assertPojoEquals(codeDO, result);
  95 + assertPojoEquals(codeDO, result, "expiresTime");
96 96 assertNull(oauth2CodeMapper.selectByCode(code));
97 97 }
98 98  
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
  View file @e366712
... ... @@ -77,7 +77,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
77 77 OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, userType, clientId, scopes);
78 78 // 断言访问令牌
79 79 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(accessTokenDO.getAccessToken());
80   - assertPojoEquals(accessTokenDO, dbAccessTokenDO, "createTime", "updateTime", "deleted");
  80 + assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
81 81 assertEquals(userId, accessTokenDO.getUserId());
82 82 assertEquals(userType, accessTokenDO.getUserType());
83 83 assertEquals(2, accessTokenDO.getUserInfo().size());
... ... @@ -88,7 +88,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
88 88 assertFalse(DateUtils.isExpired(accessTokenDO.getExpiresTime()));
89 89 // 断言访问令牌的缓存
90 90 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken());
91   - assertPojoEquals(accessTokenDO, redisAccessTokenDO, "createTime", "updateTime", "deleted");
  91 + assertPojoEquals(accessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
92 92 // 断言刷新令牌
93 93 OAuth2RefreshTokenDO refreshTokenDO = oauth2RefreshTokenMapper.selectList().get(0);
94 94 assertPojoEquals(accessTokenDO, refreshTokenDO, "id", "expiresTime", "createTime", "updateTime", "deleted");
... ... @@ -177,13 +177,13 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
177 177 assertNull(oauth2AccessTokenRedisDAO.get(accessTokenDO.getAccessToken()));
178 178 // 断言，新的访问令牌
179 179 OAuth2AccessTokenDO dbAccessTokenDO = oauth2AccessTokenMapper.selectByAccessToken(newAccessTokenDO.getAccessToken());
180   - assertPojoEquals(newAccessTokenDO, dbAccessTokenDO, "createTime", "updateTime", "deleted");
  180 + assertPojoEquals(newAccessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
181 181 assertPojoEquals(newAccessTokenDO, refreshTokenDO, "id", "expiresTime", "createTime", "updateTime", "deleted",
182 182 "creator", "updater");
183 183 assertFalse(DateUtils.isExpired(newAccessTokenDO.getExpiresTime()));
184 184 // 断言，新的访问令牌的缓存
185 185 OAuth2AccessTokenDO redisAccessTokenDO = oauth2AccessTokenRedisDAO.get(newAccessTokenDO.getAccessToken());
186   - assertPojoEquals(newAccessTokenDO, redisAccessTokenDO, "createTime", "updateTime", "deleted");
  186 + assertPojoEquals(newAccessTokenDO, redisAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
187 187 }
188 188  
189 189 @Test
... ... @@ -198,9 +198,9 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
198 198 // 调用
199 199 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken);
200 200 // 断言
201   - assertPojoEquals(accessTokenDO, result, "createTime", "updateTime", "deleted",
  201 + assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
202 202 "creator", "updater");
203   - assertPojoEquals(accessTokenDO, oauth2AccessTokenRedisDAO.get(accessToken), "createTime", "updateTime", "deleted",
  203 + assertPojoEquals(accessTokenDO, oauth2AccessTokenRedisDAO.get(accessToken), "expiresTime", "createTime", "updateTime", "deleted",
204 204 "creator", "updater");
205 205 }
206 206  
... ... @@ -237,7 +237,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
237 237 // 调研，并断言
238 238 OAuth2AccessTokenDO result = oauth2TokenService.getAccessToken(accessToken);
239 239 // 断言
240   - assertPojoEquals(accessTokenDO, result, "createTime", "updateTime", "deleted",
  240 + assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
241 241 "creator", "updater");
242 242 }
243 243  
... ... @@ -259,7 +259,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
259 259 oauth2RefreshTokenMapper.insert(refreshTokenDO);
260 260 // 调用
261 261 OAuth2AccessTokenDO result = oauth2TokenService.removeAccessToken(accessTokenDO.getAccessToken());
262   - assertPojoEquals(accessTokenDO, result, "createTime", "updateTime", "deleted",
  262 + assertPojoEquals(accessTokenDO, result, "expiresTime", "createTime", "updateTime", "deleted",
263 263 "creator", "updater");
264 264 // 断言数据
265 265 assertNull(oauth2AccessTokenMapper.selectByAccessToken(accessTokenDO.getAccessToken()));
... ... @@ -297,7 +297,7 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
297 297 // 断言
298 298 assertEquals(1, pageResult.getTotal());
299 299 assertEquals(1, pageResult.getList().size());
300   - assertPojoEquals(dbAccessToken, pageResult.getList().get(0));
  300 + assertPojoEquals(dbAccessToken, pageResult.getList().get(0), "expiresTime");
301 301 }
302 302  
303 303 }
... ...