Skip to content
Snippets Groups Projects
Commit 74c07b21 authored by ahmada4's avatar ahmada4
Browse files

Merge branch 'ResolvingGivenFailingTests' into 'master' 

Fixed failing unit tests and selenium tests

See merge request !1
parents 05c5ba76 57e4a5fe
No related branches found
No related tags found
1 merge request!1Fixed failing unit tests and selenium tests
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 364 additions and 251 deletions
iTrust/WebRoot/auth/admin/importNDCodes.jsp
+ 0
− 1
View file @ 74c07b21
<%@page import="com.sun.xml.internal.messaging.saaj.packaging.mime.MultipartDataSource"%>
<%@page import="java.net.URLEncoder" %> <%@page import="java.net.URLEncoder" %>
<%@page import="java.net.URLDecoder" %> <%@page import="java.net.URLDecoder" %>
......
iTrust/WebRoot/auth/admin/uploadCDCMetrics.jsp
+ 0
− 1
View file @ 74c07b21
<%@page import="com.sun.xml.internal.messaging.saaj.packaging.mime.MultipartDataSource"%>
<%@page import="java.net.URLEncoder" %> <%@page import="java.net.URLEncoder" %>
<%@page import="java.net.URLDecoder" %> <%@page import="java.net.URLDecoder" %>
......
iTrust/iTrust.iml 0 → 100644
+ 115
− 0
View file @ 74c07b21
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-android-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.1.2" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.9" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.5" level="project" />
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.1.2" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-iphone-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.25.0" level="project" />
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.6" level="project" />
<orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.james:apache-mime4j:0.6" level="project" />
<orderEntry type="library" name="Maven: bsh:bsh:1.3.0" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-jxpath:commons-jxpath:1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: cssparser:cssparser:0.9.4" level="project" />
<orderEntry type="library" name="Maven: findbugs:findbugs:1.0.0" level="project" />
<orderEntry type="library" name="Maven: findbugs:annotations:1.0.0" level="project" />
<orderEntry type="library" name="Maven: bcel:bcel:5.1" level="project" />
<orderEntry type="library" name="Maven: regexp:regexp:1.2" level="project" />
<orderEntry type="library" name="Maven: findbugs:coreplugin:1.0.0" level="project" />
<orderEntry type="library" name="Maven: findbugs:findbugs-ant:1.0.0" level="project" />
<orderEntry type="library" name="Maven: findbugs:findbugsGUI:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:site:18.0" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.2" level="project" />
<orderEntry type="library" name="Maven: com.beust:jcommander:1.29" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.aggregate:jetty-websocket:8.1.8.v20121106" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.0.0" level="project" />
<orderEntry type="library" name="Maven: junit-addons:junit-addons:1.4" level="project" />
<orderEntry type="library" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.5" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.21" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty:3.5.7.Final" level="project" />
<orderEntry type="library" name="Maven: com.opera:operadriver:1.5" level="project" />
<orderEntry type="library" name="Maven: com.opera:operalaunchers:1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0" level="project" />
<orderEntry type="library" name="Maven: com.codeborne:phantomjsdriver:1.2.1" level="project" />
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.44.0" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.4.1" level="project" />
<orderEntry type="library" name="Maven: milyn:sac:1.3" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.birt.runtime.3_7_1:org.apache.xml.serializer:2.7.1" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.birt.runtime.3_7_1:Tidy:1" level="project" />
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xmlParserAPIs:2.0.2" level="project" />
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.6" level="project" />
<orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: org.jfree:jfreechart:1.0.19" level="project" />
<orderEntry type="library" name="Maven: org.jfree:jcommon:1.0.23" level="project" />
<orderEntry type="module-library">
<library name="Maven: org.cewolf:cewolf:1.1">
<CLASSES>
<root url="jar://$MODULE_DIR$/WebRoot/WEB-INF/lib/cewolf-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
<orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
<orderEntry type="library" name="Maven: httpunit:httpunit:1.7" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.3" level="project" />
<orderEntry type="library" name="Maven: jtidy:jtidy:4aug2000r7-dev" level="project" />
<orderEntry type="library" name="Maven: org.easymock:easymock:2.5.2" level="project" />
<orderEntry type="library" name="Maven: org.easymock:easymockclassextension:2.5.2" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util:8.0.28" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.28" level="project" />
<orderEntry type="library" name="Maven: tomcat:jasper-runtime:5.5.23" level="project" />
<orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat:dbcp:6.0.44" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.37" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3" level="project" />
<orderEntry type="library" name="Maven: net.tanesha.recaptcha4j:recaptcha4j:0.0.7" level="project" />
</component>
</module>
\ No newline at end of file
iTrust/test/edu/ncsu/csc/itrust/selenium/EmergencyUseCaseTest.java
+ 4
− 4
View file @ 74c07b21
...@@ -51,8 +51,8 @@ public class EmergencyUseCaseTest extends iTrustSeleniumTest { ...@@ -51,8 +51,8 @@ public class EmergencyUseCaseTest extends iTrustSeleniumTest {
assertEquals("Blood Type: O-", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[6]")).getText()); assertEquals("Blood Type: O-", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[6]")).getText());
assertEquals("Pollen 06/05/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li")).getText()); assertEquals("Pollen 06/05/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li")).getText());
assertEquals("Penicillin 06/04/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li[2]")).getText()); assertEquals("Penicillin 06/04/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li[2]")).getText());
assertEquals("647641512 Prioglitazone", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[8]/ul/li")).getText()); assertEquals("Prescriptions: No current prescriptions on record", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[8]")).getText());
assertEquals("no immunizations on record", driver.findElement(By.cssSelector("strong")).getText()); assertEquals("no immunizations on record", driver.findElements(By.cssSelector("strong")).get(1).getText());
assertLogged(TransactionType.EMERGENCY_REPORT_VIEW, 9000000006L, 2L, ""); assertLogged(TransactionType.EMERGENCY_REPORT_VIEW, 9000000006L, 2L, "");
} }
...@@ -78,8 +78,8 @@ public class EmergencyUseCaseTest extends iTrustSeleniumTest { ...@@ -78,8 +78,8 @@ public class EmergencyUseCaseTest extends iTrustSeleniumTest {
assertEquals("Blood Type: O-", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[6]")).getText()); assertEquals("Blood Type: O-", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[6]")).getText());
assertEquals("Pollen 06/05/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li")).getText()); assertEquals("Pollen 06/05/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li")).getText());
assertEquals("Penicillin 06/04/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li[2]")).getText()); assertEquals("Penicillin 06/04/2007", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[5]/ul/li[2]")).getText());
assertEquals("647641512 Prioglitazone", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[8]/ul/li")).getText()); assertEquals("Prescriptions: No current prescriptions on record", driver.findElement(By.xpath("//div[@id='iTrustContent']/ul/li[8]")).getText());
assertEquals("no immunizations on record", driver.findElement(By.cssSelector("strong")).getText()); assertEquals("no immunizations on record", driver.findElements(By.cssSelector("strong")).get(1).getText());
assertLogged(TransactionType.EMERGENCY_REPORT_VIEW, 9000000000L, 2L, ""); assertLogged(TransactionType.EMERGENCY_REPORT_VIEW, 9000000000L, 2L, "");
} }
......
iTrust/test/edu/ncsu/csc/itrust/selenium/PrescriptionInstructionsTest.java
+ 1
− 1
View file @ 74c07b21
...@@ -185,7 +185,7 @@ public class PrescriptionInstructionsTest extends iTrustSeleniumTest { ...@@ -185,7 +185,7 @@ public class PrescriptionInstructionsTest extends iTrustSeleniumTest {
driver.findElement(By.linkText("My Expired Prescription Reports")).click(); driver.findElement(By.linkText("My Expired Prescription Reports")).click();
// Select the Tetracycline prescription // Select the Tetracycline prescription
assertEquals("Tetracycline", driver.findElement(By.xpath("//div[@id='iTrustContent']/div/table/tbody/tr[3]/td[2]")).getText()); assertEquals("Tetracycline", driver.findElement(By.xpath("//div[@id='iTrustContent']/div/table/tbody/tr[4]/td[2]")).getText());
driver.findElement(By.linkText("00904-2407")).click(); driver.findElement(By.linkText("00904-2407")).click();
// Check the values in the prescription table // Check the values in the prescription table
......
iTrust/test/edu/ncsu/csc/itrust/selenium/ViewDiagnosisStatisticsTest.java
+ 2
− 2
View file @ 74c07b21
...@@ -332,7 +332,7 @@ public class ViewDiagnosisStatisticsTest extends iTrustSeleniumTest { ...@@ -332,7 +332,7 @@ public class ViewDiagnosisStatisticsTest extends iTrustSeleniumTest {
assertLogged(TransactionType.DIAGNOSIS_TRENDS_VIEW, 9000000008L, 0L, ""); assertLogged(TransactionType.DIAGNOSIS_TRENDS_VIEW, 9000000008L, 0L, "");
WebElement table = driver.findElement(By.id("diagnosisStatisticsTable")); WebElement table = driver.findElement(By.id("diagnosisStatisticsTable"));
long region1 = Long.parseLong(table.findElements(By.tagName("td")).get(3).getText()); long region1 = Long.parseLong(table.findElements(By.tagName("td")).get(2).getText());
new Select(driver.findElement(By.name("icdCode"))).selectByVisibleText("84.50 - Malaria"); new Select(driver.findElement(By.name("icdCode"))).selectByVisibleText("84.50 - Malaria");
driver.findElement(By.name("zipCode")).clear(); driver.findElement(By.name("zipCode")).clear();
...@@ -344,7 +344,7 @@ public class ViewDiagnosisStatisticsTest extends iTrustSeleniumTest { ...@@ -344,7 +344,7 @@ public class ViewDiagnosisStatisticsTest extends iTrustSeleniumTest {
assertTrue(driver.getCurrentUrl().equals(ADDRESS + "auth/hcp-pha/viewDiagnosisStatistics.jsp")); assertTrue(driver.getCurrentUrl().equals(ADDRESS + "auth/hcp-pha/viewDiagnosisStatistics.jsp"));
assertLogged(TransactionType.DIAGNOSIS_TRENDS_VIEW, 9000000008L, 0L, ""); assertLogged(TransactionType.DIAGNOSIS_TRENDS_VIEW, 9000000008L, 0L, "");
WebElement table2 = driver.findElement(By.id("diagnosisStatisticsTable")); WebElement table2 = driver.findElement(By.id("diagnosisStatisticsTable"));
long region2 = Long.parseLong(table2.findElements(By.tagName("td")).get(3).getText()); long region2 = Long.parseLong(table2.findElements(By.tagName("td")).get(2).getText());
assertEquals(region1, region2); assertEquals(region1, region2);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment