Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

2014-06-17 14:33:55 -04:00 · 2014-06-17 14:33:55 -04:00 · e811b4bd9c
commit e811b4bd9c
parent 6279d4f770 cd51566bff
31 changed files with 154 additions and 190 deletions
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@ -231,7 +231,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Research Laboratory</td>
+	<td>label=Primate Research Laboratory (Laboratory)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -291,7 +291,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Colleges of the World</td>
+	<td>label=Primate Colleges of the World (Consortium)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -696,7 +696,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Info</td>
+	<td>label=Primate Info (Database)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@ -361,7 +361,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -436,7 +436,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health and Fitness</td>
+	<td>label=Primate Health and Fitness (Invited Talk)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -557,7 +557,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Happenings</td>
+	<td>label=Primate Happenings (Blog Posting)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@ -181,7 +181,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Research Laboratory</td>
+	<td>label=Primate Research Laboratory (Laboratory)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -299,7 +299,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Heart Health</td>
+	<td>label=Primate Heart Health (Service)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -324,7 +324,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate University of America</td>
+	<td>label=Primate University of America (University)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -349,7 +349,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@ -536,7 +536,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -662,7 +662,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health and Fitness</td>
+	<td>label=Primate Health and Fitness (Invited Talk)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -707,7 +707,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Happenings</td>
+	<td>label=Primate Happenings (Blog Posting)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@ -288,7 +288,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Heart Health</td>
+	<td>label=Primate Heart Health (Service)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -313,7 +313,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate University of America</td>
+	<td>label=Primate University of America (University)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -338,7 +338,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@ -211,7 +211,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=B.S. Bachelor of Science</td>
+	<td>label=B.S. Bachelor of Science (Academic Degree)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -637,7 +637,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primates-r-us</td>
+	<td>label=Primates-r-us (Company)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@ -1349,7 +1349,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Happenings</td>
+	<td>label=Primate Happenings (Blog Posting)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@ -319,6 +319,11 @@
 	<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>
@ -329,11 +334,6 @@
 	<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>
--- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
+++ b/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>
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@ -1027,6 +1027,11 @@
 	<td>//div[@id='wrapper-content']/ul/li[10]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>10000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Prototype New Ape Home</td>
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@ -253,77 +253,6 @@
 	<td>Please select an existing value or enter a new value in the Name field.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Please enter a new value in the Role field. </td>
 	<td></td>
 </tr>
 <!--Start to add presentation again, but enter only first required field-->
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Create presentation entry for Librarian, Lily</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Presentation Type</td>
 	<td></td>
 </tr>
 <tr>
 	<td>select</td>
 	<td>typeSelector</td>
 	<td>label=Presentation</td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Presentation Name</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Role in Presentation</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Presented At</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Years of Participation</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Start Year</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>End Year</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>id=presentation</td>
 	<td>Researching Primates</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>css=input.submit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Please enter a new value in the Role field. </td>
 	<td></td>
 </tr>
 <!--Add presentation correctly-->
 <tr>
 	<td>verifyTextPresent</td>
--- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
+++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
@ -194,7 +194,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>click</td>
 	<td>xpath=(//input[@type='checkbox'])[6]</td>
 	<td></td>
 </tr>
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
@ -131,11 +131,6 @@
 	<td>link=Site information</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Startup status</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=User accounts</td>
@ -236,6 +231,11 @@
 	<td>link=Recompute inferences</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Startup status</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Restrict logins</td>
@ -1074,11 +1074,6 @@
 	<td>Ingest Menu</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Connect DB</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Manage Jena Models</td>
@ -1154,6 +1149,11 @@
 	<td>link=Execute Workflow</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Dump or Restore the knowledge base</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help.</td>
@ -1231,7 +1231,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Format for SELECT query results:</td>
+	<td>Format for SELECT and ASK query results:</td>
 	<td></td>
 </tr>
 <tr>
@ -1481,13 +1481,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>verifyTextNotPresent</td>
-	<td>id=developerPanelClickText</td>
+	<td>We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>id=developerEnabled</td>
+	<td>id=developerPanelClickMe</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
 	<td>id=developer_enabled</td>
 	<td></td>
 </tr>
 <tr>
@ -1495,11 +1500,6 @@
 	<td>id=developerPanelSaveButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help.</td>
 	<td></td>
 </tr>
 <!--log out-->
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
@ -196,11 +196,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=returnLink</td>
@ -346,7 +341,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=(GraphML File)</td>
+	<td>link=GraphML file</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html
@ -836,13 +836,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyElementPresent</td>
+	<td>selectWindow</td>
-	<td>link=(GraphML File)</td>
+	<td>null</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=(GraphML File)</td>
+	<td>link=GraphML file</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
@ -691,11 +691,6 @@
 	<td>//div[@id='leftUpper']/div/select</td>
 	<td>label=by Grants</td>
 </tr>
 <tr>
 	<td>pause 10000</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Child Development - Temporal Graph Visualization</td>
@ -920,7 +915,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Child Development</td>
+	<td>label=Child Development (Department)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
@ -691,7 +691,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Reactions</td>
+	<td>label=Primate Reactions (Case Study)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
@ -1160,7 +1160,7 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<!--Veirfy Index stuff-->
+<!--Verify Index stuff-->
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Index</td>
@ -1238,7 +1238,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Organization (2)</td>
+	<td>Organization (1)</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@ -256,11 +256,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>selectWindow</td>
 	<td>null</td>
 	<td></td>
 </tr>
 <tr>
 	<td>select</td>
 	<td>id=typeOfNew</td>
--- a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
@ -236,6 +236,11 @@
 	<td></td>
 </tr>
 <!--Add all people as Susie's collaborators-->
 <tr>
 	<td>click</td>
 	<td>//div[@id='wrapper-content']/ul/li[18]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>css=a.add-hasCollaborator &gt; img.add-individual</td>
@ -374,17 +379,17 @@
 <!--Verify order is ascending-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>css=#hasCollaboratorList &gt; li</td>
+	<td>css=#hasCollaborator-Person-List &gt; li</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>//ul[@id='hasCollaboratorList']/li[2]</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[2]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>//ul[@id='hasCollaboratorList']/li[3]</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[3]</td>
 	<td></td>
 </tr>
 <!--Turn on verbose & update object property-->
@ -459,11 +464,6 @@
 	<td>link=Booth, Susie</td>
 	<td></td>
 </tr>
 <tr>
 	<td>selectWindow</td>
 	<td>null</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=verbosePropertySwitch</td>
@ -475,23 +475,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
+	<td>verifyElementPresent</td>
-	<td>Booth, Susie</td>
+	<td>css=#hasCollaborator-Person-List &gt; li</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>css=#hasCollaboratorList &gt; li</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[2]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>//ul[@id='hasCollaboratorList']/li[2]</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[3]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>//ul[@id='hasCollaboratorList']/li[3]</td>
 	<td></td>
 </tr>
 <!--Change order back to ascending-->
@ -583,17 +578,17 @@
 <!--Verify order is ascending again-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>css=#hasCollaboratorList &gt; li</td>
+	<td>css=#hasCollaborator-Person-List &gt; li</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>//ul[@id='hasCollaboratorList']/li[2]</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[2]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>//ul[@id='hasCollaboratorList']/li[3]</td>
+	<td>//ul[@id='hasCollaborator-Person-List']/li[3]</td>
 	<td></td>
 </tr>
 <!--Delete test people-->
--- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
@ -397,6 +397,16 @@
 	<td>css=img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertConfirmation</td>
 	<td>Are you sure you want to delete this photo?</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
 	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Germany</td>
--- a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html
@ -124,7 +124,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>20000</td>
+	<td>50000</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html
@ -120,7 +120,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>20000</td>
+	<td>50000</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html
@ -110,7 +110,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>20000</td>
+	<td>50000</td>
 	<td></td>
 </tr>
 <tr>
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
@ -303,12 +303,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.6.1-rc4</td>
+	<td>Version rel-1.7-rc1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.6.1-rc4</td>
+	<td>link=rel-1.7-rc1</td>
 	<td></td>
 </tr>
 <tr>
@ -532,7 +532,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.6.1-rc4</td>
+	<td>Version rel-1.7-rc1</td>
 	<td></td>
 </tr>
 <!--Set site information back to default-->
@ -639,12 +639,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Version rel-1.6.1-rc4</td>
+	<td>Version rel-1.7-rc1</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rel-1.6.1-rc4</td>
+	<td>link=rel-1.7-rc1</td>
 	<td></td>
 </tr>
 <!--Logout-->
--- a/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
+++ b/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>
--- a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
+++ b/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" .
--- a/utilities/acceptance-tests/suites/OntologyManagement/Suite.html
+++ b/utilities/acceptance-tests/suites/OntologyManagement/Suite.html
@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
+<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
+  <title>Test Suite</title>
-</head>
+</head>
-<body>
+<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
+<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="RebuildSearchIndex.html">RebuildSearchIndex</a></td></tr>
+<tr><td><a href="RebuildSearchIndex.html">RebuildSearchIndex</a></td></tr>
-<tr><td><a href="AddOntology.html">AddOntology</a></td></tr>
+<tr><td><a href="AddOntology.html">AddOntology</a></td></tr>
-<tr><td><a href="DeleteOntology.html">DeleteOntology</a></td></tr>
+<tr><td><a href="DeleteOntology.html">DeleteOntology</a></td></tr>
-</tbody></table>
+</tbody></table>
-</body>
+</body>
-</html>
+</html>
--- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
@ -360,6 +360,11 @@
 	<td>id=ui-active-menuitem</td>
 	<td></td>
 </tr>
 <tr>
 	<td>pause</td>
 	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Remove selection</td>
--- a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
+++ b/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 .
--- a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html
+++ b/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>
--- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
+++ b/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>
`@ -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" .`