|
@@ -3,6 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.iocoder.dashboard.BaseDbUnitTest;
|
|
|
+import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
|
|
|
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
|
|
|
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
|
|
|
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
|
|
@@ -52,18 +53,20 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
SysMenuDO menuDO2 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L);
|
|
|
menuMapper.insert(menuDO2);
|
|
|
|
|
|
- //调用
|
|
|
+ // 调用
|
|
|
sysMenuService.initLocalCache();
|
|
|
|
|
|
// 获取代理对象
|
|
|
SysMenuServiceImpl target = (SysMenuServiceImpl) AopTargetUtils.getTarget(sysMenuService);
|
|
|
|
|
|
- Map<Long, SysMenuDO> menuCache = (Map<Long, SysMenuDO>) BeanUtil.getFieldValue(target, "menuCache");
|
|
|
+ Map<Long, SysMenuDO> menuCache =
|
|
|
+ (Map<Long, SysMenuDO>) BeanUtil.getFieldValue(target, "menuCache");
|
|
|
Assert.isTrue(menuCache.size() == 2);
|
|
|
assertPojoEquals(menuDO1, menuCache.get(menuDO1.getId()));
|
|
|
assertPojoEquals(menuDO2, menuCache.get(menuDO2.getId()));
|
|
|
|
|
|
- Multimap<String, SysMenuDO> permissionMenuCache = (Multimap<String, SysMenuDO>) BeanUtil.getFieldValue(target, "permissionMenuCache");
|
|
|
+ Multimap<String, SysMenuDO> permissionMenuCache =
|
|
|
+ (Multimap<String, SysMenuDO>) BeanUtil.getFieldValue(target, "permissionMenuCache");
|
|
|
Assert.isTrue(permissionMenuCache.size() == 2);
|
|
|
assertPojoEquals(menuDO1, permissionMenuCache.get(menuDO1.getPermission()));
|
|
|
assertPojoEquals(menuDO2, permissionMenuCache.get(menuDO2.getPermission()));
|
|
@@ -184,10 +187,9 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
|
|
|
//断言
|
|
|
Assert.isTrue(menuDOS.size() == idMenuMap.size());
|
|
|
- menuDOS.stream().forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
+ menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
@Test
|
|
|
public void testGetMenusReqVo_success() {
|
|
|
Map<Long, SysMenuDO> idMenuMap = new HashMap<>();
|
|
@@ -218,7 +220,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
|
|
|
//断言
|
|
|
Assert.isTrue(menuDOS.size() == idMenuMap.size());
|
|
|
- menuDOS.stream().forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
+ menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
}
|
|
|
|
|
|
@Test
|
|
@@ -244,12 +246,12 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
menuDO = createMenuDO(4L, MenuTypeEnum.MENU, "name", 0L, 2);
|
|
|
mockCacheMap.put(menuDO.getId(), menuDO);
|
|
|
|
|
|
- List<SysMenuDO> menuDOS = sysMenuService.listMenusFromCache(Arrays.asList(MenuTypeEnum.MENU.getType()), Arrays.asList(1));
|
|
|
+ List<SysMenuDO> menuDOS = sysMenuService.listMenusFromCache(Collections.singletonList(MenuTypeEnum.MENU.getType()),
|
|
|
+ Collections.singletonList(CommonStatusEnum.DISABLE.getStatus()));
|
|
|
Assert.isTrue(menuDOS.size() == idMenuMap.size());
|
|
|
- menuDOS.stream().forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
+ menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
@Test
|
|
|
public void testListMenusFromCache2_success() throws Exception {
|
|
|
Map<Long, SysMenuDO> mockCacheMap = new HashMap<>();
|
|
@@ -306,14 +308,14 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
- public void testCheckResource_success(){
|
|
|
- SysMenuDO sonMenu=initParentAndSonMenuDO();
|
|
|
- Long parentId=sonMenu.getParentId();
|
|
|
+ public void testCheckResource_success() {
|
|
|
+ SysMenuDO sonMenu = initParentAndSonMenuDO();
|
|
|
+ Long parentId = sonMenu.getParentId();
|
|
|
|
|
|
- Long otherSonMenuId=randomLongId();
|
|
|
- String otherSonMenuName=randomString();
|
|
|
+ Long otherSonMenuId = randomLongId();
|
|
|
+ String otherSonMenuName = randomString();
|
|
|
|
|
|
- sysMenuService.checkResource(parentId,otherSonMenuName,otherSonMenuId);
|
|
|
+ sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
@@ -324,7 +326,7 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
Long otherSonMenuId=randomLongId();
|
|
|
String otherSonMenuName=sonMenu.getName(); //相同名称
|
|
|
|
|
|
- assertServiceException(()->sysMenuService.checkResource(parentId,otherSonMenuName,otherSonMenuId), MENU_NAME_DUPLICATE);
|
|
|
+ assertServiceException(() -> sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId), MENU_NAME_DUPLICATE);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -361,5 +363,4 @@ public class SysMenuServiceTest extends BaseDbUnitTest {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|