diff --git a/iTrust/test/edu/ncsu/csc/itrust/selenium/CauseOfDeathTrendsReportSeleniumTest.java b/iTrust/test/edu/ncsu/csc/itrust/selenium/CauseOfDeathTrendsReportSeleniumTest.java
index 10ca3d1e8f91533b0d0b444ffcc75cb7d0c54df6..4943ee556af19cafc00870f8b12b0ab46ac5a946 100644
--- a/iTrust/test/edu/ncsu/csc/itrust/selenium/CauseOfDeathTrendsReportSeleniumTest.java
+++ b/iTrust/test/edu/ncsu/csc/itrust/selenium/CauseOfDeathTrendsReportSeleniumTest.java
@@ -18,7 +18,7 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
}
public void testViewCODTrendsReports_AllPatientsAllGenders() throws Exception {
- driver = (HtmlUnitDriver)login("9000000003", "pw");
+ driver = (HtmlUnitDriver)login("9000000000", "pw");
// Click Diagnosis Trends
driver.findElement(By.cssSelector("h2.panel-title")).click();
@@ -32,7 +32,7 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
driver.findElement(By.name("endDate")).sendKeys("12/31/2020");
driver.findElement(By.id("view_report")).click();
assertTrue(driver.getCurrentUrl().equals(ADDRESS + "auth/hcp/causeOfDeathTrendsReport.jsp"));
- assertLogged(TransactionType.DEATH_TRENDS_VIEW, 9000000003L, 0L,
+ assertLogged(TransactionType.DEATH_TRENDS_VIEW, 9000000000L, 0L,
"View cause-of-death trends report");
WebElement table = driver.findElement(By.id("causeOfDeathTrendsTable"));
@@ -42,19 +42,19 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
assertEquals(cause1, "Influenza");
assertEquals(code1, 487.00);
- assertEquals(deaths1, 5);
+ assertEquals(deaths1, 4);
String cause2 = table.findElements(By.tagName("td")).get(3).getText();
double code2 = Double.parseDouble(table.findElements(By.tagName("td")).get(4).getText());
int deaths2 = Integer.parseInt(table.findElements(By.tagName("td")).get(5).getText());
- assertEquals(cause2, "Tuberculosis of the lung");
- assertEquals(code2, 11.40);
- assertEquals(deaths2, 3);
+ assertEquals(cause2, "Diabetes with ketoacidosis");
+ assertEquals(code2, 250.10);
+ assertEquals(deaths2, 1);
}
public void testViewCODTrendsReports_AllPatientsOnlyMale() throws Exception {
- driver = (HtmlUnitDriver)login("9000000003", "pw");
+ driver = (HtmlUnitDriver)login("9000000000", "pw");
// Click Diagnosis Trends
driver.findElement(By.cssSelector("h2.panel-title")).click();
@@ -69,7 +69,7 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
driver.findElement(By.name("endDate")).sendKeys("12/31/2020");
driver.findElement(By.id("view_report")).click();
assertTrue(driver.getCurrentUrl().equals(ADDRESS + "auth/hcp/causeOfDeathTrendsReport.jsp"));
- assertLogged(TransactionType.DEATH_TRENDS_VIEW, 9000000003L, 0L,
+ assertLogged(TransactionType.DEATH_TRENDS_VIEW, 9000000000L, 0L,
"View cause-of-death trends report");
WebElement table = driver.findElement(By.id("causeOfDeathTrendsTable"));
@@ -79,15 +79,15 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
assertEquals(cause1, "Influenza");
assertEquals(code1, 487.00);
- assertEquals(deaths1, 3);
+ assertEquals(deaths1, 2);
String cause2 = table.findElements(By.tagName("td")).get(3).getText();
double code2 = Double.parseDouble(table.findElements(By.tagName("td")).get(4).getText());
int deaths2 = Integer.parseInt(table.findElements(By.tagName("td")).get(5).getText());
- assertEquals(cause2, "Malaria");
- assertEquals(code2, 84.50);
- assertEquals(deaths2, 2);
+ assertEquals(cause2, "Diabetes with ketoacidosis");
+ assertEquals(code2, 250.10);
+ assertEquals(deaths2, 1);
}
public void testViewCODTrendsReports_AllPatientsOnlyFemale() throws Exception {
@@ -117,14 +117,6 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
assertEquals(cause1, "Influenza");
assertEquals(code1, 487.00);
assertEquals(deaths1, 2);
-
- String cause2 = table.findElements(By.tagName("td")).get(3).getText();
- double code2 = Double.parseDouble(table.findElements(By.tagName("td")).get(4).getText());
- int deaths2 = Integer.parseInt(table.findElements(By.tagName("td")).get(5).getText());
-
- assertEquals(cause2, "Tuberculosis of the lung");
- assertEquals(code2, 11.40);
- assertEquals(deaths2, 1);
}
public void testViewCODTrendsReports_MyPatientsAllGenders() throws Exception {
@@ -151,9 +143,17 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
double code1 = Double.parseDouble(table.findElements(By.tagName("td")).get(1).getText());
int deaths1 = Integer.parseInt(table.findElements(By.tagName("td")).get(2).getText());
- assertEquals(cause1, "Diabetes with ketoacidosis");
- assertEquals(code1, 250.10);
- assertEquals(deaths1, 1);
+ assertEquals(cause1, "Influenza");
+ assertEquals(code1, 487.00);
+ assertEquals(deaths1, 4);
+
+ String cause2 = table.findElements(By.tagName("td")).get(3).getText();
+ double code2 = Double.parseDouble(table.findElements(By.tagName("td")).get(4).getText());
+ int deaths2 = Integer.parseInt(table.findElements(By.tagName("td")).get(5).getText());
+
+ assertEquals(cause2, "Diabetes with ketoacidosis");
+ assertEquals(code2, 250.10);
+ assertEquals(deaths2, 1);
}
public void testViewCODTrendsReports_MyPatientsOnlyMale() throws Exception {
@@ -181,9 +181,17 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
double code1 = Double.parseDouble(table.findElements(By.tagName("td")).get(1).getText());
int deaths1 = Integer.parseInt(table.findElements(By.tagName("td")).get(2).getText());
- assertEquals(cause1, "Diabetes with ketoacidosis");
- assertEquals(code1, 250.10);
- assertEquals(deaths1, 1);
+ assertEquals(cause1, "Influenza");
+ assertEquals(code1, 487.00);
+ assertEquals(deaths1, 2);
+
+ String cause2 = table.findElements(By.tagName("td")).get(3).getText();
+ double code2 = Double.parseDouble(table.findElements(By.tagName("td")).get(4).getText());
+ int deaths2 = Integer.parseInt(table.findElements(By.tagName("td")).get(5).getText());
+
+ assertEquals(cause2, "Diabetes with ketoacidosis");
+ assertEquals(code2, 250.10);
+ assertEquals(deaths2, 1);
}
public void testViewCODTrendsReports_MyPatientsOnlyFemale() throws Exception {
@@ -206,7 +214,14 @@ public class CauseOfDeathTrendsReportSeleniumTest extends iTrustSeleniumTest {
assertLogged(TransactionType.DEATH_TRENDS_VIEW, 9000000003L, 0L,
"View cause-of-death trends report");
- assertTrue(driver.getPageSource().contains("No results returned"));
+ WebElement table = driver.findElement(By.id("causeOfDeathTrendsTable"));
+ String cause1 = table.findElements(By.tagName("td")).get(0).getText();
+ double code1 = Double.parseDouble(table.findElements(By.tagName("td")).get(1).getText());
+ int deaths1 = Integer.parseInt(table.findElements(By.tagName("td")).get(2).getText());
+
+ assertEquals(cause1, "Influenza");
+ assertEquals(code1, 487.00);
+ assertEquals(deaths1, 2);
}
public void testViewCODTrendsReports_EmptyDates() throws Exception {