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

TSK-1149: fixed test so that the build will also run on macos

This commit is contained in:
Sascha Frevel 2020-03-05 09:47:12 +01:00 committed by Mustapha Zorgati
parent 697a5ba015
commit 446eb3a1c9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -57,3 +57,6 @@ e2e/*.map
# System Files # System Files
.DS_Store .DS_Store
Thumbs.db Thumbs.db
# jenv on mac
/.java-version

9
lib/taskana-core/src/test/java/acceptance/task/SetPlannedAccTest.java
View File

@ -14,13 +14,13 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import pro.taskana.classification.api.ClassificationService;
import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.BulkOperationResults;
import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.ConcurrencyException;
import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.api.exceptions.TaskanaException;
import pro.taskana.common.internal.util.DaysToWorkingDaysConverter;
import pro.taskana.security.JaasExtension; import pro.taskana.security.JaasExtension;
import pro.taskana.security.WithAccessId; import pro.taskana.security.WithAccessId;
import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskService;
@ -34,12 +34,11 @@ import pro.taskana.task.api.models.Task;
@SuppressWarnings({"checkstyle:LineLength"}) @SuppressWarnings({"checkstyle:LineLength"})
public class SetPlannedAccTest extends AbstractAccTest { public class SetPlannedAccTest extends AbstractAccTest {
private TaskService taskService; private TaskService taskService;
private ClassificationService classificationService;
@BeforeEach @BeforeEach
void setup() throws SQLException { void setup() throws SQLException {
DaysToWorkingDaysConverter.setGermanPublicHolidaysEnabled(true);
taskService = taskanaEngine.getTaskService(); taskService = taskanaEngine.getTaskService();
classificationService = taskanaEngine.getClassificationService();
resetDb(false); resetDb(false);
} }
@ -241,9 +240,9 @@ public class SetPlannedAccTest extends AbstractAccTest {
Instant dueBulk3 = taskService.getTask(tkId3).getDue(); Instant dueBulk3 = taskService.getTask(tkId3).getDue();
Instant dueBulk4 = taskService.getTask(tkId4).getDue(); Instant dueBulk4 = taskService.getTask(tkId4).getDue();
assertThat(dueBulk1).isEqualTo(getInstant("2020-05-14T07:00:00")); assertThat(dueBulk1).isEqualTo(getInstant("2020-05-14T07:00:00"));
assertThat(dueBulk2).isEqualTo(getInstant("2020-05-21T07:00:00")); assertThat(dueBulk2).isEqualTo(getInstant("2020-05-22T07:00:00"));
assertThat(dueBulk3).isEqualTo(getInstant("2020-05-14T07:00:00")); assertThat(dueBulk3).isEqualTo(getInstant("2020-05-14T07:00:00"));
assertThat(dueBulk4).isEqualTo(getInstant("2020-05-21T07:00:00")); assertThat(dueBulk4).isEqualTo(getInstant("2020-05-22T07:00:00"));
} }
@WithAccessId( @WithAccessId(