Final test case tweaks by Holly...

utilities/acceptance-tests/suites/AddPublications/ValidateFields.html

@@ -1054,6 +1054,11 @@
 	<td>link=Cancel</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Nintendo O.K. for Kids</td>
@@ -1989,6 +1994,11 @@
 	<td>link=Cancel</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Nintendo O.K. for Kids</td>

utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html

@@ -329,6 +329,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeOfNew</td>
+	<td>label=Journal (bibo)</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=submit</td>
@@ -844,6 +849,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeOfNew</td>
+	<td>label=Journal (bibo)</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
@@ -1109,6 +1119,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeOfNew</td>
+	<td>label=Journal (bibo)</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
@@ -1231,7 +1246,7 @@
 </tr>
 <tr>
 	<td>pause</td>
-	<td>100000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications2.html

@@ -359,6 +359,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeOfNew</td>
+	<td>label=Journal (bibo)</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@id='submit' and @value='Add a new item of this type']</td>

utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html

@@ -446,7 +446,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html

@@ -1135,7 +1135,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>selectAndWait</td>
+	<td>select</td>
 	<td>//div[@id='leftUpper']/div/select</td>
 	<td>label=by Grants</td>
 </tr>

utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html

@@ -766,7 +766,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Mozambique</td>
+	<td>link=Mozamia</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html

@@ -1191,7 +1191,7 @@
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Mozambique</td>
+	<td>link=Mozamia</td>
 	<td></td>
 </tr>
 <tr>
@@ -2224,9 +2224,79 @@
 	<td>Index of Contents</td>
 	<td></td>
 </tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Delete country added</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>Index of Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=5</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Mozamia</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Mozamia</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>

utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html

@@ -140,12 +140,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>click</td>
 	<td>link=Remove</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>click</td>
 	<td>id=showAddFormButton</td>
 	<td></td>
 </tr>
@@ -342,7 +342,7 @@
 <tr>
 	<td>type</td>
 	<td>name</td>
-	<td>Mozambique</td>
+	<td>Mozamia</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -1071,7 +1071,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Mozambique</td>
+	<td>link=Mozamia</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html

@@ -151,7 +151,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Mozambique</td>
+	<td>link=Mozamia</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html

@@ -272,7 +272,7 @@
 <tr>
 	<td>type</td>
 	<td>querytext</td>
-	<td>mozambique</td>
+	<td>mozamia</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -281,7 +281,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>mozambique - VIVO Search Results</td>
+	<td>mozamia - VIVO Search Results</td>
 	<td></td>
 </tr>
 <tr>
@@ -296,12 +296,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Mozambique</td>
+	<td>link=Mozamia</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Africa</td>
 	<td></td>
 </tr>
 <tr>