Update unit tests

src/main/java/org/smartregister/pathevaluator/PathEvaluatorLibrary.java

@@ -54,8 +54,7 @@ private PathEvaluatorLibrary(LocationDao locationDao, ClientDao clientDao, TaskD
 		eventProvider = new EventProvider(eventDao);
 	}
 
-	public static void init(LocationDao locationDao, ClientDao clientDao, TaskDao taskDao, EventDao eventDao,
-	        String userName) {
+	public static void init(LocationDao locationDao, ClientDao clientDao, TaskDao taskDao, EventDao eventDao) {
 		instance = new PathEvaluatorLibrary(locationDao, clientDao, taskDao, eventDao);
 	}
 

src/test/java/org/smartregister/converters/ClientConverterTest.java

@@ -43,7 +43,7 @@ public void testConvertToPatientResource() {
 		assertEquals(client.getBirthdate().toString("YYYY-MM-DD"), patient.getBirthDate().getValue().toString());
 		assertEquals(client.getDeathdate().toString("yyyy-MM-dd'T'HH:mm'Z'"),
 				patient.getDeceased().as(com.ibm.fhir.model.type.DateTime.class).getValue().toString());
-		PathEvaluatorLibrary.init(null, null, null,null,"testUser");
+		PathEvaluatorLibrary.init(null, null, null,null);
 		FHIRPathElementNode node = PathEvaluatorLibrary.getInstance().evaluateElementExpression(patient, "Patient.identifier.where(system='opensrp_id')");
 		Identifier identifierNode = node.element().as(Identifier.class);
 		assertEquals("20366639", identifierNode.getValue().getValue());

src/test/java/org/smartregister/converters/EventConverterTest.java

@@ -1,26 +1,20 @@
 package org.smartregister.converters;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.ibm.fhir.model.resource.QuestionnaireResponse;
-import com.ibm.fhir.model.type.Integer;
-import com.ibm.fhir.path.FHIRPathElementNode;
-import com.ibm.fhir.path.FHIRPathNode;
-import com.ibm.fhir.path.FHIRPathResourceNode;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import java.lang.String;
-import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.smartregister.domain.Event;
 import org.smartregister.pathevaluator.PathEvaluatorLibrary;
 import org.smartregister.utils.TaskDateTimeTypeConverter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.ibm.fhir.model.resource.QuestionnaireResponse;
+import com.ibm.fhir.path.FHIRPathElementNode;
 
 public class EventConverterTest {
 
@@ -107,7 +101,7 @@ public void testConvertEventToQuestionnaireResponseWithMultipleValuesOfObs() {
 				questionnaireResponse.getItem().get(3).getAnswer().get(0).getValue().as(com.ibm.fhir.model.type.String.class)
 						.getValue());
 
-		PathEvaluatorLibrary.init(null, null, null, null, "testUser");
+		PathEvaluatorLibrary.init(null, null, null, null);
 		FHIRPathElementNode node = PathEvaluatorLibrary.getInstance().evaluateElementExpression(questionnaireResponse, "QuestionnaireResponse.item.where(linkId='totPopulation')");
 		QuestionnaireResponse.Item totPopulation = node.element().as(QuestionnaireResponse.Item.class);
 		assertEquals(1,totPopulation.getAnswer().size());

src/test/java/org/smartregister/pathevaluator/PathEvaluatorLibraryTest.java

@@ -27,7 +27,7 @@ public class PathEvaluatorLibraryTest {
 
 	@Before
 	public void startUp() {
-		PathEvaluatorLibrary.init(null, null, null, null, null);
+		PathEvaluatorLibrary.init(null, null, null, null);
 		pathEvaluatorLibrary = PathEvaluatorLibrary.getInstance();
 		patient = Patient.builder().id("12345").birthDate(Date.of("1990-12-19"))
 		        .identifier(Identifier.builder().id("1234").value(of("1212313")).build())

src/test/java/org/smartregister/pathevaluator/action/ActionHelperTest.java

@@ -88,7 +88,7 @@ public class ActionHelperTest {
 
 	@Before
 	public void setUp() {
-		PathEvaluatorLibrary.init(locationDao, clientDao, taskDao, eventDao,"testUser");
+		PathEvaluatorLibrary.init(locationDao, clientDao, taskDao, eventDao);
 		PathEvaluatorLibrary instance = PathEvaluatorLibrary.getInstance();
 		Whitebox.setInternalState(instance, "locationProvider", locationProvider);
 		Whitebox.setInternalState(instance, "clientProvider", clientProvider);

src/test/java/org/smartregister/pathevaluator/condition/ConditionHelperTest.java

@@ -54,7 +54,7 @@ public class ConditionHelperTest {
 
 	@BeforeClass
 	public static void bootstrap() {
-		PathEvaluatorLibrary.init(null,null,null, null,null);
+		PathEvaluatorLibrary.init(null,null,null, null);
 	}
 
 	@Before

src/test/java/org/smartregister/pathevaluator/plan/PlanEvaluatorTest.java

@@ -56,9 +56,11 @@ public class PlanEvaluatorTest {
 
 	private String plan = UUID.randomUUID().toString();
 
+	private String username = UUID.randomUUID().toString();
+
 	@Before
 	public void setUp() {
-		planEvaluator = new PlanEvaluator();
+		planEvaluator = new PlanEvaluator(username);
 		Whitebox.setInternalState(planEvaluator, "actionHelper", actionHelper);
 		Whitebox.setInternalState(planEvaluator, "conditionHelper", conditionHelper);
 		Whitebox.setInternalState(planEvaluator, "taskHelper", taskHelper);
@@ -100,7 +102,7 @@ public List<Patient> answer(InvocationOnMock invocation) throws Throwable {
 
 		verify(conditionHelper).evaluateActionConditions(patients.get(0), action, plan);
 
-		verify(taskHelper).generateTask(patients.get(0), action, planDefinition.getIdentifier(), jurisdiction.getCode());
+		verify(taskHelper).generateTask(patients.get(0), action, planDefinition.getIdentifier(), jurisdiction.getCode(),username);
 	}
 
 }

src/test/java/org/smartregister/pathevaluator/task/TaskHelperTest.java

@@ -19,39 +19,39 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class TaskHelperTest {
-
+	
 	private TaskHelper taskHelper;
-
+	
 	@Mock
 	private LocationDao locationDao;
-
+	
 	@Mock
 	private ClientDao clientDao;
-
+	
 	@Mock
 	private TaskDao taskDao;
-
+	
 	@Mock
 	private EventDao eventDao;
-
+	
 	@Mock
 	private Action action;
-
+	
 	private Patient patient;
-
+	
 	@Before
 	public void setUp() {
-		PathEvaluatorLibrary.init(locationDao, clientDao, taskDao, eventDao, "testUser");
+		PathEvaluatorLibrary.init(locationDao, clientDao, taskDao, eventDao);
 		PathEvaluatorLibrary instance = PathEvaluatorLibrary.getInstance();
 		taskHelper = new TaskHelper();
 		patient = TestData.createPatient();
 	}
-
-	@Test(expected = Test.None.class)
+	
+	@Test
 	public void testGenerateTask() {
 		String planIdentifier = UUID.randomUUID().toString();
 		String jurisdiction = "12123";
 		Mockito.doNothing().when(taskDao).saveTask(any(Task.class));
-		taskHelper.generateTask(patient,action, planIdentifier,jurisdiction);
+		taskHelper.generateTask(patient, action, planIdentifier, jurisdiction, "testUser");
 	}
 }

src/test/java/org/smartregister/pathevaluator/trigger/TriggerHelperTest.java

@@ -60,7 +60,7 @@ public class TriggerHelperTest {
 
 	@Before
 	public void setUp() {
-		PathEvaluatorLibrary.init(null, null, null, null,null);
+		PathEvaluatorLibrary.init(null, null, null, null);
 		triggerHelper = new TriggerHelper(actionHelper);
 		trigger = Trigger.builder().name(TriggerType.PLAN_ACTIVATION.value()).build();
 	}