Holly committed final test case changes

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

@@ -319,11 +319,6 @@
 	<td>New Primate Students Workshop</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=2</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primate History Library</td>
@@ -334,6 +329,11 @@
 	<td>Primate History Library Library</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=2</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primate Memorial Building</td>

utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html

@@ -275,6 +275,11 @@
 	<td>link=Return to Profile Page</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>
@@ -347,6 +352,11 @@
 	<td>link=Return to Profile Page</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>

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

@@ -572,7 +572,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=(GraphML File)</td>
+	<td>link=GraphML file</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -3117,6 +3117,81 @@
 	<td>Index of Contents</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=County</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>County</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>
+	<td>waitForPageToLoad</td>
+	<td>10000</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>
 <!--Verify deletions and remainders-->
 <tr>
 	<td>pause</td>
@@ -3168,13 +3243,18 @@
 	<td>organizations</td>
 	<td></td>
 </tr>
-<!--Had to remove following code because of Research menu-->
+<tr>
-<!--verifyTextNotPresent research-->
+	<td>verifyTextNotPresent</td>
+	<td>County (1)</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>locations</td>
 	<td></td>
 </tr>
+<!--Had to remove following code because of Research menu-->
+<!--verifyTextNotPresent research-->
 <!--Logout-->
 <tr>
 	<td>clickAndWait</td>

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

@@ -731,9 +731,14 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.edit-freetextKeyword &gt; img.edit-individual</td>
+	<td>css=a.add-freetextKeyword &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html

@@ -303,12 +303,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.7-rc1</td>
+	<td>Version rel-1.7-rc3</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.7-rc1</td>
+	<td>link=rel-1.7-rc3</td>
 	<td></td>
 </tr>
 <tr>
@@ -532,7 +532,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.7-rc1</td>
+	<td>Version rel-1.7-rc3</td>
 	<td></td>
 </tr>
 <!--Set site information back to default-->
@@ -639,12 +639,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.7-rc1</td>
+	<td>Version rel-1.7-rc3</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.7-rc1</td>
+	<td>link=rel-1.7-rc3</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html

@@ -108,8 +108,8 @@
 </tr>
 <!--Pause allows time to get the N#### for the next step-->
 <tr>
-	<td>pause 10000</td>
+	<td>pause</td>
-	<td></td>
+	<td>20000</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt

@@ -1,3 +1,3 @@
- <http://vivo.mydomain.edu/individual/n5442> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 1" .
+ <http://vivo.mydomain.edu/individual/n6027> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 1" .
- <http://vivo.mydomain.edu/individual/n5442> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 2" .
+ <http://vivo.mydomain.edu/individual/n6027> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 2" .
  

utilities/acceptance-tests/suites/OpenSocialGadgets/AddTestFaculty.html

@@ -106,6 +106,67 @@
 	<td>Furter, Frank</td>
 	<td></td>
 </tr>
+<!--Verify creation-->
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Faculty Member (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Person</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Person (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty Member</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Furter, Frank</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Furter, Frank</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Furter, Frank</td>
+	<td></td>
+</tr>
 <!--Logout-->
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt

@@ -1,3 +1,3 @@
-<http://vivo.mydomain.edu/individual/n603>
+<http://vivo.mydomain.edu/individual/n3761>
 <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#searchBoostAnnot>
 2000.0 .

utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html

@@ -113,9 +113,10 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<!--Make sure Foxtrot is in middle of search results-->
 <tr>
-	<td>pause 100000</td>
+	<td>pause</td>
-	<td></td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <!--Change range of Echo Foxtrot-->
@@ -215,9 +216,10 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<!--Foxtrot should now be first-->
 <tr>
-	<td>pause 100000</td>
+	<td>pause</td>
-	<td></td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <!--Now remove individual boosting-->
@@ -322,9 +324,10 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<!--Foxtrot should be back in the middle-->
 <tr>
-	<td>pause 100000</td>
+	<td>pause</td>
-	<td></td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <!--Logout-->