Holly committed final changes to test cases for rc-1.

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

@@ -951,7 +951,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Mouse, Minnie</td>
+	<td>label=Mouse, Minnie (Person)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -1938,7 +1938,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Nintendo: Good or Bad for Kids?</td>
+	<td>label=Nintendo: Good or Bad for Kids? (Book)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -2004,7 +2004,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Kids Now Conference Proceedings</td>
+	<td>label=Kids Now Conference Proceedings (Chapter)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -2383,7 +2383,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Focus on Kids!</td>
+	<td>label=Focus on Kids! (Conference)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

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

@@ -132,6 +132,16 @@
 	<td>link=Remove</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you wish to delete this label?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>Furter, Frank Edit Remove</td>
@@ -173,6 +183,16 @@
 	<td>link=Remove</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you wish to delete this label?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>Furter, Frank Edit Remove</td>

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

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

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

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

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

@@ -113,6 +113,11 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause 100000</td>
+	<td></td>
+	<td></td>
+</tr>
 <!--Change range of Echo Foxtrot-->
 <tr>
 	<td>clickAndWait</td>
@@ -210,6 +215,11 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause 100000</td>
+	<td></td>
+	<td></td>
+</tr>
 <!--Now remove individual boosting-->
 <tr>
 	<td>clickAndWait</td>
@@ -312,6 +322,11 @@
 	<td>Jenkins, Iris Faculty Member Emeritus</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause 100000</td>
+	<td></td>
+	<td></td>
+</tr>
 <!--Logout-->
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html

@@ -302,7 +302,7 @@
 <tr>
 	<td>sendKeys</td>
 	<td>id=activity</td>
-	<td>Depart</td>
+	<td>Department B</td>
 </tr>
 <tr>
 	<td>pause</td>