nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup of assertJ

This commit is contained in:
Mustapha Zorgati 2020-04-26 01:52:06 +02:00
parent 35705ddb02
commit d316ab251e
6 changed files with 100 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java
View File

@ -10,11 +10,11 @@ public interface CheckedFunction<T, E> {
return t -> {
try {
return checkedFunction.accept(t);
} catch (Exception e) {
} catch (Throwable e) {
throw new SystemException("Caught exception", e);
}
};
}
E accept(T t) throws Exception;
E accept(T t) throws Throwable;
}

94
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java
View File

@ -73,18 +73,19 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.inWorkingDays()
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(11);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000021")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000022")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000023")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000024")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000026")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000027")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000028")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000031")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000032")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000021",
"TKI:000000000000000000000000000000000022",
"TKI:000000000000000000000000000000000023",
"TKI:000000000000000000000000000000000024",
"TKI:000000000000000000000000000000000026",
"TKI:000000000000000000000000000000000027",
"TKI:000000000000000000000000000000000028",
"TKI:000000000000000000000000000000000031",
"TKI:000000000000000000000000000000000032");
}
@WithAccessId(userName = "monitor")
@ -125,11 +126,12 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.workbasketIdIn(workbasketIds)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(4);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000026")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000031")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000026",
"TKI:000000000000000000000000000000000031");
}
@WithAccessId(userName = "monitor")
@ -169,18 +171,19 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.stateIn(states)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(11);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000021")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000022")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000023")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000024")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000026")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000027")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000028")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000031")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000032")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000021",
"TKI:000000000000000000000000000000000022",
"TKI:000000000000000000000000000000000023",
"TKI:000000000000000000000000000000000024",
"TKI:000000000000000000000000000000000026",
"TKI:000000000000000000000000000000000027",
"TKI:000000000000000000000000000000000028",
"TKI:000000000000000000000000000000000031",
"TKI:000000000000000000000000000000000032");
}
@WithAccessId(userName = "monitor")
@ -214,10 +217,11 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.categoryIn(categories)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(3);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000031")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000032")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000031",
"TKI:000000000000000000000000000000000032");
}
@WithAccessId(userName = "monitor")
@ -257,11 +261,12 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.domainIn(domains)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(4);
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000021")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000022")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000028")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000021",
"TKI:000000000000000000000000000000000022",
"TKI:000000000000000000000000000000000028");
}
@WithAccessId(userName = "monitor")
@ -302,12 +307,13 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
.customAttributeFilterIn(customAttributeFilter)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(5);
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000024")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000027")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000031")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000032")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000024",
"TKI:000000000000000000000000000000000027",
"TKI:000000000000000000000000000000000031",
"TKI:000000000000000000000000000000000032");
}
@WithAccessId(userName = "monitor")

30
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java
View File

@ -89,13 +89,14 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
.inWorkingDays()
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(6);
assertThat(ids.contains("TKI:000000000000000000000000000000000001")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000004")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000007")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000010")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000033")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000001",
"TKI:000000000000000000000000000000000004",
"TKI:000000000000000000000000000000000007",
"TKI:000000000000000000000000000000000010",
"TKI:000000000000000000000000000000000033",
"TKI:000000000000000000000000000000000006");
}
@WithAccessId(userName = "monitor")
@ -135,9 +136,9 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
.inWorkingDays()
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(2);
assertThat(ids.contains("TKI:000000000000000000000000000000000001")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000033")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000001", "TKI:000000000000000000000000000000000033");
}
@WithAccessId(userName = "monitor")
@ -180,10 +181,11 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
.domainIn(domains)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(3);
assertThat(ids.contains("TKI:000000000000000000000000000000000001")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000004")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000001",
"TKI:000000000000000000000000000000000004",
"TKI:000000000000000000000000000000000006");
}
private List<TimeIntervalColumnHeader> getListOfColumnHeaders() {

9
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java
View File

@ -127,10 +127,11 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
.workbasketIdIn(workbasketIds)
.listTaskIdsForSelectedItems(selectedItems);
assertThat(ids).hasSize(3);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000009")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids)
.containsOnly(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000009",
"TKI:000000000000000000000000000000000020");
}
@WithAccessId(userName = "monitor")

19
lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java
View File

@ -26,10 +26,7 @@ class TaskEngineAccTest extends AbstractAccTest {
void testUnauthenticated() {
assertThat(taskanaEngine.isUserInRole(TaskanaRole.BUSINESS_ADMIN)).isFalse();
assertThat(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)).isFalse();
ThrowingCallable call =
() -> {
taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN);
};
ThrowingCallable call = () -> taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN);
assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class);
}
@ -43,23 +40,17 @@ class TaskEngineAccTest extends AbstractAccTest {
new TaskanaEngineProxyForTest(taskanaEngine)
.getEngine()
.runAsAdmin(
() -> {
assertThat(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)).isTrue();
return true;
});
.runAsAdmin(() -> assertThat(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)).isTrue());
assertThat(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)).isFalse();
}
@WithAccessId(userName = "user_1_1") // , groupNames = {"businessadmin"})
@Test
void testUser() throws NotAuthorizedException {
void testUser() {
assertThat(taskanaEngine.isUserInRole(TaskanaRole.BUSINESS_ADMIN)).isFalse();
assertThat(taskanaEngine.isUserInRole(TaskanaRole.ADMIN)).isFalse();
ThrowingCallable call =
() -> {
taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN);
};
ThrowingCallable call = () -> taskanaEngine.checkRoleMembership(TaskanaRole.BUSINESS_ADMIN);
assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class);
}

52
lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java
View File

@ -8,6 +8,7 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
@ -39,22 +40,19 @@ class DistributionTargetsAccTest extends AbstractAccTest {
WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
WorkbasketSummary workbasketSummary =
workbasketService.createWorkbasketQuery().keyIn("GPK_KSC").single();
List<String> expectedTargetIds =
Arrays.asList(
"WBI:100000000000000000000000000000000002",
"WBI:100000000000000000000000000000000003",
"WBI:100000000000000000000000000000000004",
"WBI:100000000000000000000000000000000005");
List<WorkbasketSummary> retrievedDistributionTargets =
workbasketService.getDistributionTargets(workbasketSummary.getId());
assertThat(retrievedDistributionTargets).hasSize(4);
List<String> expectedTargetIds =
new ArrayList<>(
Arrays.asList(
"WBI:100000000000000000000000000000000002",
"WBI:100000000000000000000000000000000003",
"WBI:100000000000000000000000000000000004",
"WBI:100000000000000000000000000000000005"));
for (WorkbasketSummary wbSummary : retrievedDistributionTargets) {
assertThat(expectedTargetIds.contains(wbSummary.getId())).isTrue();
}
assertThat(retrievedDistributionTargets)
.extracting(WorkbasketSummary::getId)
.containsExactlyInAnyOrderElementsOf(expectedTargetIds);
}
@WithAccessId(
@ -66,23 +64,20 @@ class DistributionTargetsAccTest extends AbstractAccTest {
WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
WorkbasketSummary workbasketSummary =
workbasketService.createWorkbasketQuery().keyIn("GPK_KSC").single();
List<String> expectedTargetIds =
Arrays.asList(
"WBI:100000000000000000000000000000000002",
"WBI:100000000000000000000000000000000003",
"WBI:100000000000000000000000000000000004",
"WBI:100000000000000000000000000000000005");
List<WorkbasketSummary> retrievedDistributionTargets =
workbasketService.getDistributionTargets(
workbasketSummary.getKey(), workbasketSummary.getDomain());
assertThat(retrievedDistributionTargets).hasSize(4);
List<String> expectedTargetIds =
new ArrayList<>(
Arrays.asList(
"WBI:100000000000000000000000000000000002",
"WBI:100000000000000000000000000000000003",
"WBI:100000000000000000000000000000000004",
"WBI:100000000000000000000000000000000005"));
for (WorkbasketSummary wbSummary : retrievedDistributionTargets) {
assertThat(expectedTargetIds.contains(wbSummary.getId())).isTrue();
}
assertThat(retrievedDistributionTargets)
.extracting(WorkbasketSummary::getId)
.containsExactlyInAnyOrderElementsOf(expectedTargetIds);
}
@WithAccessId(
@ -104,14 +99,11 @@ class DistributionTargetsAccTest extends AbstractAccTest {
call =
() -> {
workbasketService.setDistributionTargets(
existingWb, new ArrayList<>(Arrays.asList(nonExistingWb)));
existingWb, Collections.singletonList(nonExistingWb));
};
assertThatThrownBy(call).isInstanceOf(WorkbasketNotFoundException.class);
call =
() -> {
workbasketService.addDistributionTarget(existingWb, nonExistingWb);
};
call = () -> workbasketService.addDistributionTarget(existingWb, nonExistingWb);
assertThatThrownBy(call).isInstanceOf(WorkbasketNotFoundException.class);
int beforeCount = workbasketService.getDistributionTargets(existingWb).size();
@ -138,7 +130,7 @@ class DistributionTargetsAccTest extends AbstractAccTest {
call =
() -> {
workbasketService.setDistributionTargets(
existingWb, Arrays.asList("WBI:100000000000000000000000000000000002"));
existingWb, Collections.singletonList("WBI:100000000000000000000000000000000002"));
};
assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class);