Create action tests, create deactivate tests

iTrust/test/edu/ncsu/csc/itrust/unit/action/ActivatePatientActionTest.java

+package edu.ncsu.csc.itrust.unit.action;
+
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+public class ActivatePatientActionTest extends TestCase {
+
+    private TestDataGenerator gen = new TestDataGenerator();
+    private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+    @Override
+    protected void setUp() throws Exception {
+        gen.clearAllTables();
+        gen.patient92();
+        gen.patient4();
+    }
+
+    public void testActivateAlreadyActivated() throws Exception {
+        long pid = 4;
+        assertEquals("patient", patientDAO.getRole(pid));
+        EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+        action.activate();
+        assertEquals("patient", patientDAO.getRole(pid));
+        assertEquals("", patientDAO.getPatient(pid).getDateOfDeactivationStr());
+    }
+
+    public void testActivatePreregisteredPatient() throws Exception {
+        long pid = 92;
+        assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+        EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+        action.activate();
+        assertEquals("patient", patientDAO.getRole(pid));
+        assertEquals("", patientDAO.getPatient(pid).getDateOfDeactivationStr());
+    }
+}

iTrust/test/edu/ncsu/csc/itrust/unit/action/DeactivatePatientActionTest.java

+package edu.ncsu.csc.itrust.unit.action;
+
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+import junit.framework.TestCase;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public class DeactivatePatientActionTest extends TestCase {
+
+    private TestDataGenerator gen = new TestDataGenerator();
+    private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+    @Override
+    protected void setUp() throws Exception {
+        gen.clearAllTables();
+        gen.patient92();
+        gen.patient4();
+    }
+
+    public void testDeactivateActivatedPatient() throws Exception {
+        long pid = 4;
+        assertEquals("patient", patientDAO.getRole(pid));
+        EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+        action.deactivate();
+        assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+        assertEquals(new SimpleDateFormat("MM/dd/yyyy").format(Calendar.getInstance().getTime()), patientDAO.getPatient(pid).getDateOfDeactivationStr());
+    }
+
+    public void testDeactivatePreregisteredPatient() throws Exception {
+        long pid = 92;
+        assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+        EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
+        action.deactivate();
+        assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+        assertEquals(new SimpleDateFormat("MM/dd/yyyy").format(Calendar.getInstance().getTime()), patientDAO.getPatient(pid).getDateOfDeactivationStr());
+    }
+}

iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/ActivatePatientTest.java

@@ -31,13 +31,4 @@ public class ActivatePatientTest extends TestCase {
 		action.activate();
 		assertEquals("patient", patientDAO.getRole(pid));
 	}
-
-	public void testActivateAlreadyActivated() throws Exception {
-		long pid = 4;
-		assertEquals("patient", patientDAO.getRole(pid));
-		EditPatientAction action = new EditPatientAction(TestDAOFactory.getTestInstance(), pid, Long.toString(pid));
-		action.activate();
-		assertEquals("patient", patientDAO.getRole(pid));
-		assertEquals("", patientDAO.getPatient(pid).getDateOfDeactivationStr());
-	}
 }

iTrust/test/edu/ncsu/csc/itrust/unit/dao/patient/DeactivatePatientTest.java

+package edu.ncsu.csc.itrust.unit.dao.patient;
+
+import edu.ncsu.csc.itrust.action.EditPatientAction;
+import junit.framework.TestCase;
+import edu.ncsu.csc.itrust.dao.mysql.PatientDAO;
+import edu.ncsu.csc.itrust.unit.datagenerators.TestDataGenerator;
+import edu.ncsu.csc.itrust.unit.testutils.TestDAOFactory;
+
+public class DeactivatePatientTest extends TestCase {
+
+    private TestDataGenerator gen = new TestDataGenerator();
+    private PatientDAO patientDAO = TestDAOFactory.getTestInstance().getPatientDAO();
+
+    @Override
+    protected void setUp() throws Exception {
+        gen.clearAllTables();
+        gen.patient92();
+        gen.patient4();
+    }
+
+    public void testDeactivateActivatedPatient() throws Exception {
+        long pid = 4;
+        assertEquals("patient", patientDAO.getRole(pid));
+        patientDAO.deactivatePatient(pid);
+        assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+    }
+
+    public void testDeactivatePreregisteredPatient() throws Exception {
+        long pid = 92;
+        assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+        patientDAO.deactivatePatient(pid);
+        assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+    }
+
+    public void testDeactivateThenActivatePatient() throws Exception {
+        long pid = 92;
+        assertEquals("preRegisteredPatient", patientDAO.getRole(pid));
+        patientDAO.ConvertPreRegisteredPatientsToPatient(pid);
+        assertEquals("patient", patientDAO.getRole(pid));
+        patientDAO.deactivatePatient(pid);
+        assertEquals("deactivatedPatient", patientDAO.getRole(pid));
+    }
+}