Skip to content

Commit

Permalink
[UPDATE] 修复单元测试的问题
Browse files Browse the repository at this point in the history 
Signed-off-by: Alan Yeh <[email protected]>
  • Loading branch information
@alan-yeh
alan-yeh committed Jan 4, 2025
1 parent fc67a62 commit aedd6c6
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions ...al-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void case1() {
assertEquals(insert.getModifierId(), findById.getModifierId());

// test countBy
var count = this.provider.countBy(Conditions.of(Menu.class).like(Menu::getCode, "test%"), tenant.getCode());
var count = this.provider.countBy(Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), tenant.getCode());
assertEquals(1, count);

// test update
Expand Down Expand Up @@ -179,7 +179,7 @@ public void case1() {
count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode());
assertEquals(1, count);

count = this.persistence.countBy(Conditions.of(MenuEntity.class).like(MenuEntity::getCode, "test%"), tenant.getCode());
count = this.persistence.countBy(Conditions.of(MenuEntity.class).eq(MenuEntity::getApplicationId, application.getId()).like(MenuEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}

Expand Down Expand Up @@ -231,7 +231,7 @@ public void case2() {
assertTrue(insertBatch.stream().noneMatch(it -> it.getParent() != null));

// test findBy
var findBy = this.provider.findBy(null, null, Conditions.of(Menu.class).like(Menu::getCode, "test%"), null, tenant.getCode());
var findBy = this.provider.findBy(null, null, Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), null, tenant.getCode());
assertNotNull(findBy);
assertEquals(2, findBy.size());
assertTrue(findBy.stream().anyMatch(it -> it.getCode().equals("test")));
Expand All @@ -247,7 +247,7 @@ public void case2() {
this.provider.updateBatch(List.of(child.toInput().parentId(parent.getId()).build()), "syssa", tenant.getCode());

// test pageBy
var pageBy = this.provider.pageBy(1L, 10L, Conditions.of(Menu.class).like(Menu::getCode, "test%"), null, tenant.getCode());
var pageBy = this.provider.pageBy(1L, 10L, Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), null, tenant.getCode());
assertNotNull(pageBy);
assertEquals(1, pageBy.getPager().getPageIndex());
assertEquals(10, pageBy.getPager().getPageSize());
Expand All @@ -265,10 +265,10 @@ public void case2() {
assertEquals(parent.getId(), child.getParent().getId());

// test deleteBy
var count = this.provider.deleteBy(Conditions.of(Menu.class).like(Menu::getCode, "test%"), tenant.getCode());
var count = this.provider.deleteBy(Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), tenant.getCode());
assertEquals(2, count);

count = this.persistence.countBy(Conditions.of(MenuEntity.class).like(MenuEntity::getCode, "test%"), tenant.getCode());
count = this.persistence.countBy(Conditions.of(MenuEntity.class).eq(MenuEntity::getApplicationId, application.getId()).like(MenuEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}
}
32 changes: 16 additions & 16 deletions ...vider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public void case1() {
var input = PermissionInput.builder()
.applicationId(application.getId())
.menuId(menu.getId())
.code("add")
.name("添加")
.code("test")
.name("测试权限")
.build();

// test insert
Expand Down Expand Up @@ -156,11 +156,11 @@ public void case1() {
assertEquals(insert.getModifierId(), findById.getModifierId());

// test countBy
var count = this.provider.countBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), tenant.getCode());
var count = this.provider.countBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), tenant.getCode());
assertEquals(1, count);

// test update
this.provider.update(insert.toInput().code("add2").name("添加2").build(), "syssa", tenant.getCode());
this.provider.update(insert.toInput().code("test2").name("测试权限2").build(), "syssa", tenant.getCode());

// test findByIds
var findByIds = this.provider.findByIds(List.of(insert.getId()), tenant.getCode());
Expand All @@ -174,8 +174,8 @@ public void case1() {
assertEquals(insert.getApplication().getId(), fetched.getApplication().getId());
assertEquals(insert.getMenuId(), fetched.getMenuId());
assertEquals(insert.getMenu().getId(), fetched.getMenu().getId());
assertEquals("add2", fetched.getCode());
assertEquals("添加2", fetched.getName());
assertEquals("test2", fetched.getCode());
assertEquals("测试权限2", fetched.getName());
assertEquals(insert.getCreatorId(), fetched.getCreatorId());
assertEquals(insert.getModifierId(), fetched.getModifierId());
assertNotEquals(fetched.getCreateDate(), fetched.getModifyDate()); // 修改日期不同
Expand All @@ -184,7 +184,7 @@ public void case1() {
count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode());
assertEquals(1, count);

count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()), tenant.getCode());
count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()).like(PermissionEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}

Expand Down Expand Up @@ -216,8 +216,8 @@ public void case2() {
var input = PermissionInput.builder()
.applicationId(application.getId())
.menuId(menu.getId())
.code("add")
.name("添加")
.code("test")
.name("测试权限")
.build();

// test insertBatch
Expand All @@ -240,7 +240,7 @@ public void case2() {
assertNotNull(entity);

// test findBy
var findBy = this.provider.findBy(null, null, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), null, tenant.getCode());
var findBy = this.provider.findBy(null, null, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), null, tenant.getCode());
assertNotNull(findBy);
assertEquals(1, findBy.size());

Expand All @@ -257,10 +257,10 @@ public void case2() {
assertEquals(insert.getModifierId(), fetched.getModifierId());

// test updateBatch
this.provider.updateBatch(List.of(insert.toInput().code("add2").name("添加2").build()), "syssa", tenant.getCode());
this.provider.updateBatch(List.of(insert.toInput().code("test2").name("测试权限2").build()), "syssa", tenant.getCode());

// test pageBy
var pageBy = this.provider.pageBy(1, 10, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), null, tenant.getCode());
var pageBy = this.provider.pageBy(1, 10, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), null, tenant.getCode());
assertNotNull(pageBy);
assertEquals(1, pageBy.getPager().getPageIndex());
assertEquals(10, pageBy.getPager().getPageSize());
Expand All @@ -275,17 +275,17 @@ public void case2() {
assertEquals(insert.getApplication().getId(), fetched.getApplication().getId());
assertEquals(insert.getMenuId(), fetched.getMenuId());
assertEquals(insert.getMenu().getId(), fetched.getMenu().getId());
assertEquals("add2", fetched.getCode());
assertEquals("添加2", fetched.getName());
assertEquals("test2", fetched.getCode());
assertEquals("测试权限2", fetched.getName());
assertEquals(insert.getCreatorId(), fetched.getCreatorId());
assertEquals(insert.getModifierId(), fetched.getModifierId());
assertNotEquals(fetched.getCreateDate(), fetched.getModifyDate());

// test deleteBy
var count = this.provider.deleteBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), tenant.getCode());
var count = this.provider.deleteBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), tenant.getCode());
assertEquals(1, count);

count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()), tenant.getCode());
count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()).like(PermissionEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}
}
12 changes: 6 additions & 6 deletions ...al-provider/src/test/java/central/studio/provider/graphql/authority/TestRoleProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void case1() {
assertEquals(insert.getRemark(), findById.getRemark());

// test countBy
var count = this.provider.countBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), tenant.getCode());
var count = this.provider.countBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), tenant.getCode());
assertEquals(1, count);

// test update
Expand All @@ -208,7 +208,7 @@ public void case1() {
count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode());
assertEquals(1, count);

count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()), tenant.getCode());
count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()).like(RoleEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}

Expand Down Expand Up @@ -255,7 +255,7 @@ public void case2() {
assertNotNull(entity);

// test findBy
var findBy = this.provider.findBy(null, null, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), null, tenant.getCode());
var findBy = this.provider.findBy(null, null, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), null, tenant.getCode());
assertNotNull(findBy);
assertEquals(1, findBy.size());

Expand All @@ -275,7 +275,7 @@ public void case2() {
this.provider.updateBatch(List.of(fetched.toInput().code("test2").enabled(Boolean.FALSE).build()), "syssa", tenant.getCode());

// test pageBy
var pageBy = this.provider.pageBy(1, 10, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), null, tenant.getCode());
var pageBy = this.provider.pageBy(1, 10, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), null, tenant.getCode());
assertNotNull(pageBy);
assertEquals(1, pageBy.getPager().getPageIndex());
assertEquals(10, pageBy.getPager().getPageSize());
Expand All @@ -296,10 +296,10 @@ public void case2() {
assertEquals(insert.getRemark(), fetched.getRemark());

// test deleteBy
var count = this.provider.deleteBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), tenant.getCode());
var count = this.provider.deleteBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), tenant.getCode());
assertEquals(1, count);

count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()), tenant.getCode());
count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()).like(RoleEntity::getCode, "test%"), tenant.getCode());
assertEquals(0, count);
}
}

0 comments on commit aedd6c6

Please sign in to comment.