More test case changes from Holly.

utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html

@@ -81,7 +81,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Events (2)</td>
+	<td>link=Events (4)</td>
 	<td></td>
 </tr>
 <tr>
@@ -96,7 +96,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Research (10)</td>
+	<td>link=Research (11)</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Events (2)</td>
+	<td>link=Events (4)</td>
 	<td></td>
 </tr>
 <tr>
@@ -256,7 +256,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Research (10)</td>
+	<td>link=Research (11)</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html

@@ -114,6 +114,16 @@
 	<td>link=locations</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primates-r-us Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Health Subject Area</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Diet Subject Area</td>
@@ -121,12 +131,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate History Library Library</td>
+	<td>Primate Feeder Equipment</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primates-r-us Organization</td>
+	<td>Primate Info Database</td>
 	<td></td>
 </tr>
 <tr>
@@ -139,6 +149,11 @@
 	<td>Primate Student of the Year Award or Honor</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Elderly Care Grant</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Health Check Event</td>
@@ -146,22 +161,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Feeder Equipment</td>
+	<td>Primate Health Conference Conference</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory Campus</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Heart Health Clinic Service</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Introduction to Primate Health Course</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Health Subject Area</td>
+	<td>Introduction to Primate Health Course</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Research Laboratory Laboratory</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Portable Primate Habitat Equipment</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Habitat Research Grant Grant</td>
 	<td></td>
 </tr>
 <tr>
@@ -186,37 +201,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Animal Health Subject Area</td>
+	<td>Primate History Library Library</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Portable Primate Habitat Equipment</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Elderly Care Grant</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Elderly Care Subject Area</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Jane Memorial Building Building</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Info Database</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Research Lab Room 123 Facility</td>
 	<td></td>
 </tr>
 <tr>
@@ -226,32 +211,22 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Show Me the Primates! Event</td>
+	<td>Primate Heart Health Clinic Service</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Health Conference Conference</td>
+	<td>Primate Research Laboratory Campus</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory Laboratory</td>
+	<td>Primate Research Lab Room 123 Facility</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Best Primate College Award or Honor</td>
+	<td>Animal Health Subject Area</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Next</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>primates - VIVO Search Results</td>
 	<td></td>
 </tr>
 <tr>
@@ -261,7 +236,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Librarian, Lily Assistant Librarian</td>
+	<td>Elderly Care Subject Area</td>
 	<td></td>
 </tr>
 <tr>
@@ -269,11 +244,46 @@
 	<td>1234 Northern African Nation Address</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=2</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>primates - VIVO Search Results</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>PHC Proceedings Proceedings</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Librarian, Lily Assistant Librarian</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Jane Memorial Building Building</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Liberia Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Kenya Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>the Congo Country</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>northern Africa</td>
@@ -284,26 +294,6 @@
 	<td>Africa</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Liberia</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Kenya</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>the Congo</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td>All done</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Home</td>

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

@@ -944,21 +944,6 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=a.add-assigneeFor &gt; img.add-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Faculty, Jane</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify all fields added</td>