diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java index ca273fe86759c61bd56a0d8e058fd8129d36d6c2..836f435ea988d6c77738d0fdaa6981c6f3ccd92f 100644 --- a/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java +++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/ViewAllPreregisteredPatientsTest.java @@ -14,6 +14,7 @@ public class ViewAllPreregisteredPatientsTest extends iTrustSeleniumTest { public void setUp() throws Exception { super.setUp(); gen.standardData(); + gen.patient92(); driver = new HtmlUnitDriver(); driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS); } @@ -28,7 +29,7 @@ public class ViewAllPreregisteredPatientsTest extends iTrustSeleniumTest { // Make sure we were able to log in assertEquals("iTrust - HCP Home", driver.getTitle()); driver.findElement(By.cssSelector("h2.panel-title")).click(); - driver.findElement(By.linkText("All Patients")).click(); + driver.findElement(By.linkText("View Pre-Registered Patients")).click(); String text = driver.findElement(By.cssSelector("table.fTable")).getText(); assertTrue("Text not found!", text.contains("10/10/2008")); assertTrue("Text not found!", text.contains("09/14/2009")); diff --git a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java index 839bff1e0997563dfd777e59011179c22c0f8210..17770be20720c11978038d3e4ae6c4db8b978b6c 100644 --- a/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java +++ b/iTrust/test/edu/ncsu/csc/itrust/unit/action/ViewPreRegisteredPatientListActionTest.java @@ -20,17 +20,21 @@ public class ViewPreRegisteredPatientListActionTest extends TestCase { protected void setUp() throws Exception { gen = new TestDataGenerator(); gen.clearAllTables(); - gen.patient4(); - gen.hcp3(); } public void testViewPatients() throws Exception { action = new ViewPreRegisteredPatientListAction(factory); List<PatientBean> pb = action.getPreRegisteredPatients(); - assertEquals(pb.get(0).getMID(), 4); + assertEquals(0, pb.size()); + gen.patient92(); + gen.patient4(); + pb = action.getPreRegisteredPatients(); + assertEquals(1, pb.size()); + assertEquals(492, pb.get(0).getMID()); } public void testNoPersonnel() throws Exception { + gen.patient92(); action = new ViewPreRegisteredPatientListAction(factory); List<PatientBean> pb = action.getPreRegisteredPatients(); for (PatientBean p : pb) {