Updates to the Selenium WebDriver tests.
This commit is contained in:
Graham Triggs
parent
b66df2453d
commit
addfd09a61
2 changed files with 56 additions and 234 deletions
|
|
@ -27,21 +27,23 @@ public class AbstractVIVOSeleniumTest extends AbstractSeleniumTest {
|
||||||
while (autoComplete == null) {
|
while (autoComplete == null) {
|
||||||
element.sendKeys(text);
|
element.sendKeys(text);
|
||||||
|
|
||||||
try {
|
|
||||||
int findElementCount = 0;
|
int findElementCount = 0;
|
||||||
while (autoComplete == null && findElementCount < 6) {
|
while (autoComplete == null && findElementCount < 6) {
|
||||||
|
try {
|
||||||
Thread.sleep(250);
|
Thread.sleep(250);
|
||||||
|
|
||||||
autoComplete = driver.findElement(By.className("ui-autocomplete"));
|
autoComplete = driver.findElement(By.className("ui-autocomplete"));
|
||||||
if (autoComplete != null && !autoComplete.isDisplayed()) {
|
|
||||||
autoComplete = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
} catch (NoSuchElementException nse) {
|
} catch (NoSuchElementException nse) {
|
||||||
System.out.println("Failure number: " + count);
|
System.out.println("Failure number: " + count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (autoComplete != null && !autoComplete.isDisplayed()) {
|
||||||
|
autoComplete = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (autoComplete == null) {
|
if (autoComplete == null) {
|
||||||
element.clear();
|
element.clear();
|
||||||
if (count > 3) {
|
if (count > 3) {
|
||||||
|
|
@ -80,6 +82,25 @@ public class AbstractVIVOSeleniumTest extends AbstractSeleniumTest {
|
||||||
clickAndWait(By.linkText(category));
|
clickAndWait(By.linkText(category));
|
||||||
assertTitle(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));
|
clickAndWait(By.linkText(individual));
|
||||||
assertTitle(individual);
|
assertTitle(individual);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,236 +19,37 @@ public class DeleteLocations extends AbstractVIVOSeleniumTest {
|
||||||
|
|
||||||
vivoDeleteIndividual("Building", "Primate Memorial Building");
|
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 */
|
/* from CreateLocation */
|
||||||
clickAndWait(By.linkText("Index"));
|
clickAndWait(By.linkText("Index"));
|
||||||
assertTitle("Index of Contents");
|
assertTitle("Index of Contents");
|
||||||
|
|
||||||
vivoDeleteIndividual("Building", "Jane Memorial Building");
|
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();
|
vivoLogOut();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
<!--Delete Locations-->
|
Primate Quad
|
||||||
<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>
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
Loading…
Add table
Reference in a new issue