BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1d3ca8a990603071f9be8ac882cf9a8bdb7008d3

Authored by YunaiV
1 parent 83003021

完善 TenantServiceImpl 单元测试

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
  View file @1d3ca8a
@@ -138,7 +138,7 @@ public class TenantServiceImpl implements TenantService { @@ -138,7 +138,7 @@ public class TenantServiceImpl implements TenantService {
138 @Transactional(rollbackFor = Exception.class) 138 @Transactional(rollbackFor = Exception.class)
139 public void updateTenant(TenantUpdateReqVO updateReqVO) { 139 public void updateTenant(TenantUpdateReqVO updateReqVO) {
140 // 校验存在 140 // 校验存在
141 - TenantDO tenant = checkUpdateTenant(updateReqVO.getId()); 141 + TenantDO tenant = validateUpdateTenant(updateReqVO.getId());
142 // 校验套餐被禁用 142 // 校验套餐被禁用
143 TenantPackageDO tenantPackage = tenantPackageService.validTenantPackage(updateReqVO.getPackageId()); 143 TenantPackageDO tenantPackage = tenantPackageService.validTenantPackage(updateReqVO.getPackageId());
144 144
@@ -179,12 +179,12 @@ public class TenantServiceImpl implements TenantService { @@ -179,12 +179,12 @@ public class TenantServiceImpl implements TenantService {
179 @Override 179 @Override
180 public void deleteTenant(Long id) { 180 public void deleteTenant(Long id) {
181 // 校验存在 181 // 校验存在
182 - checkUpdateTenant(id); 182 + validateUpdateTenant(id);
183 // 删除 183 // 删除
184 tenantMapper.deleteById(id); 184 tenantMapper.deleteById(id);
185 } 185 }
186 186
187 - private TenantDO checkUpdateTenant(Long id) { 187 + private TenantDO validateUpdateTenant(Long id) {
188 TenantDO tenant = tenantMapper.selectById(id); 188 TenantDO tenant = tenantMapper.selectById(id);
189 if (tenant == null) { 189 if (tenant == null) {
190 throw exception(TENANT_NOT_EXISTS); 190 throw exception(TENANT_NOT_EXISTS);
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
  View file @1d3ca8a
@@ -196,7 +196,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest { @@ -196,7 +196,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
196 role100.setTenantId(dbTenant.getId()); 196 role100.setTenantId(dbTenant.getId());
197 RoleDO role101 = randomPojo(RoleDO.class, o -> o.setId(101L)); 197 RoleDO role101 = randomPojo(RoleDO.class, o -> o.setId(101L));
198 role101.setTenantId(dbTenant.getId()); 198 role101.setTenantId(dbTenant.getId());
199 - when(roleService.getRoleList(isNull())).thenReturn(asList(role100, role101)); 199 + when(roleService.getRoleListByStatus(isNull())).thenReturn(asList(role100, role101));
200 // mock 每个角色的权限 200 // mock 每个角色的权限
201 when(permissionService.getRoleMenuIds(eq(101L))).thenReturn(asSet(201L, 202L)); 201 when(permissionService.getRoleMenuIds(eq(101L))).thenReturn(asSet(201L, 202L));
202 202