litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to the Selenium WebDriver tests.

Browse source
This commit is contained in:
Graham Triggs 2016-01-15 21:32:58 +00:00
parent b66df2453d
commit addfd09a61
2 changed files with 56 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
selenium/src/test/java/org/vivoweb/vivo/selenium/tests/AbstractVIVOSeleniumTest.java
View file

@ -27,19 +27,21 @@ public class AbstractVIVOSeleniumTest extends AbstractSeleniumTest {
while (autoComplete == null) {
element.sendKeys(text);
try {
int findElementCount = 0;
while (autoComplete == null && findElementCount < 6) {
Thread.sleep(250);
autoComplete = driver.findElement(By.className("ui-autocomplete"));
if (autoComplete != null && !autoComplete.isDisplayed()) {
autoComplete = null;
}
int findElementCount = 0;
while (autoComplete == null && findElementCount < 6) {
try {
Thread.sleep(250);
autoComplete = driver.findElement(By.className("ui-autocomplete"));
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (NoSuchElementException nse) {
System.out.println("Failure number: " + count);
}
if (autoComplete != null && !autoComplete.isDisplayed()) {
autoComplete = null;
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (NoSuchElementException nse) {
System.out.println("Failure number: " + count);
}
if (autoComplete == null) {
@ -80,6 +82,25 @@ public class AbstractVIVOSeleniumTest extends AbstractSeleniumTest {
clickAndWait(By.linkText(category));
assertTitle(category);
WebElement individualLink = null;
int pageCount = 1;
do {
try {
individualLink = driver.findElement(By.linkText(individual));
} catch (NoSuchElementException nse) {
}
if (individualLink == null) {
pageCount++;
try {
clickAndWait(By.linkText(Integer.toString(pageCount, 10)));
} catch (NoSuchElementException nse) {
break;
}
}
} while (individualLink == null);
clickAndWait(By.linkText(individual));
assertTitle(individual);

245
selenium/src/test/java/org/vivoweb/vivo/selenium/tests/DeleteLocations.java
View file

@ -19,236 +19,37 @@ public class DeleteLocations extends AbstractVIVOSeleniumTest {
vivoDeleteIndividual("Building", "Primate Memorial Building");
/* */
/* from CreateEquipment */
clickAndWait(By.linkText("Index"));
assertTitle("Index of Contents");
vivoDeleteIndividual("Facility", "Primate Research Lab Room 123");
/* */
/* from CreateEvent */
clickAndWait(By.linkText("Index"));
assertTitle("Index of Contents");
vivoDeleteIndividual("Facility", "State Fair Park");
/* */
/* from CreateLocation */
clickAndWait(By.linkText("Index"));
assertTitle("Index of Contents");
vivoDeleteIndividual("Building", "Jane Memorial Building");
clickAndWait(By.linkText("Index"));
assertTitle("Index of Contents");
vivoDeleteIndividual("Facility", "Lab Admin Office");
clickAndWait(By.linkText("Index"));
assertTitle("Index of Contents");
vivoDeleteIndividual("Geographic Location", "Primate Quad");
/* */
vivoLogOut();
}
}
/*
<!--Delete Locations-->
<tr>
<td>clickAndWait</td>
<td>link=Index</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Index of Contents</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Facility</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Facility</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Lab Admin Office</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Lab Admin Office</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Edit this individual</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Control Panel</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@value='Edit This Individual']</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Editing Form</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>name=_delete</td>
<td></td>
</tr>
<tr>
<td>assertConfirmation</td>
<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Index</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Index of Contents</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Facility</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Facility</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Primate Research Lab Room 123</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Primate Research Lab Room 123</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Edit this individual</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Control Panel</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@value='Edit This Individual']</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Editing Form</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>name=_delete</td>
<td></td>
</tr>
<tr>
<td>assertConfirmation</td>
<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Index</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Index of Contents</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Facility</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Facility</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=State Fair Park</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>State Fair Park</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Edit this individual</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Control Panel</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@value='Edit This Individual']</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Editing Form</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>name=_delete</td>
<td></td>
</tr>
<tr>
<td>assertConfirmation</td>
<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Index</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Index of Contents</td>
<td></td>
</tr>
Primate Quad
*/