SORMAS-Foundation#2724 fix tests

Author: [email protected]

sormas-backend/src/main/java/de/symeda/sormas/backend/task/TaskService.java

@@ -324,7 +324,7 @@ public User getTaskAssignee(Contact contact) throws TaskCreationException {
 			if (supervisors.isEmpty() && contact.getPerson().getAddress().getRegion() != null) {
 				supervisors = userService.getAllByRegionAndUserRoles(contact.getPerson().getAddress().getRegion(), UserRole.CONTACT_SUPERVISOR);
 			}
-			if (supervisors.isEmpty()) {
+			if (supervisors.isEmpty() && contact.getCaze() != null && contact.getCaze().getDistrict() != null) {
 				supervisors = userService.getAllByRegionAndUserRoles(contact.getCaze().getRegion(), UserRole.CONTACT_SUPERVISOR);
 			}
 			if (!supervisors.isEmpty()) {

sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java

@@ -35,6 +35,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Assert;
@@ -217,7 +218,9 @@ public void testGenerateContactFollowUpTasks() {
 		getContactFacade().generateContactFollowUpTasks();
 
 		// task should have been generated
-		List<TaskDto> tasks = getTaskFacade().getAllByContact(contact.toReference());
+		List<TaskDto> tasks = getTaskFacade().getAllByContact(contact.toReference()).stream()
+				.filter(t -> t.getTaskType() == TaskType.CONTACT_FOLLOW_UP)
+				.collect(Collectors.toList());
 		assertEquals(1, tasks.size());
 		TaskDto task = tasks.get(0);
 		assertEquals(TaskType.CONTACT_FOLLOW_UP, task.getTaskType());
@@ -227,7 +230,9 @@ public void testGenerateContactFollowUpTasks() {
 
 		// task should not be generated multiple times 
 		getContactFacade().generateContactFollowUpTasks();
-		tasks = getTaskFacade().getAllByContact(contact.toReference());
+		tasks = getTaskFacade().getAllByContact(contact.toReference()).stream()
+				.filter(t -> t.getTaskType() == TaskType.CONTACT_FOLLOW_UP)
+				.collect(Collectors.toList());
 		assertEquals(1, tasks.size());
 	}
 

sormas-backend/src/test/java/de/symeda/sormas/backend/task/TaskFacadeEjbTest.java

@@ -159,9 +159,9 @@ public void testArchivedTaskNotGettingTransfered() {
 			event.toReference(),
 			DateHelper.addDays(new Date(), 1),
 			user.toReference());
-		// getAllActiveTasks and getAllUuids should return length 4+1 (case investigation)
-		assertEquals(5, getTaskFacade().getAllActiveTasksAfter(null).size());
-		assertEquals(5, getTaskFacade().getAllActiveUuids().size());
+		// getAllActiveTasks and getAllUuids should return length 4+1+1 (case investigation & contact investigation)
+		assertEquals(6, getTaskFacade().getAllActiveTasksAfter(null).size());
+		assertEquals(6, getTaskFacade().getAllActiveUuids().size());
 
 		getCaseFacade().archiveOrDearchiveCase(caze.getUuid(), true);
 		getEventFacade().archiveOrDearchiveEvent(event.getUuid(), true);
@@ -173,9 +173,9 @@ public void testArchivedTaskNotGettingTransfered() {
 		getCaseFacade().archiveOrDearchiveCase(caze.getUuid(), false);
 		getEventFacade().archiveOrDearchiveEvent(event.getUuid(), false);
 
-		// getAllActiveTasks and getAllUuids should return length 4
-		assertEquals(5, getTaskFacade().getAllActiveTasksAfter(null).size());
-		assertEquals(5, getTaskFacade().getAllActiveUuids().size());
+		// getAllActiveTasks and getAllUuids should return length 5 + 1 (contact investigation)
+		assertEquals(6, getTaskFacade().getAllActiveTasksAfter(null).size());
+		assertEquals(6, getTaskFacade().getAllActiveUuids().size());
 	}
 
 	@Test