RC1 test case changes by Holly

.gitignore

@@ -8,3 +8,4 @@
 /runtime.properties
 /ontology/public/catalog-v0001.xml
 
+rdf/auth/firsttime/test-user-model.owl

utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html

@@ -80,6 +80,11 @@
 	<td>User accounts</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>5 accounts</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@value='Add new account']</td>
@@ -161,6 +166,11 @@
 	<td>10000</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>6 accounts</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=RickRookie@cornell.edu</td>

utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html

@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this account?</td>
+	<td>Are you sure you want to delete this account??</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html

@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this account?</td>
+	<td>Are you sure you want to delete this account??</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html

@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>assertConfirmation</td>
-	<td>Are you sure you want to delete this account?</td>
+	<td>Are you sure you want to delete this account??</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateAccounts/FirstTimeSelfEditorLogin.html

@@ -32,7 +32,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-<!--Must not be logged in already-->
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log in</td>
@@ -43,6 +42,7 @@
 	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
+<!--Must not be logged in already-->
 <!--Try logging in with wrong password-->
 <tr>
 	<td>type</td>

utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html

@@ -109,7 +109,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Classgroup Editing Form</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <!--Verify Times class group was created properly-->

utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html

@@ -83,13 +83,13 @@
 <!--Verify the Hours class exists-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <!--Link to Class Hours-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -107,6 +107,11 @@
 	<td>Individuals in Class Hours</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>No individuals to display</td>
+	<td></td>
+</tr>
 <!--Verify Daytime hours does not exist-->
 <tr>
 	<td>verifyTextNotPresent</td>
@@ -147,12 +152,12 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,8 +176,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyElementPresent</td>
-	<td>Daytime hours</td>
+	<td>link=Daytime hours</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html

@@ -117,11 +117,6 @@
 	<td>GroupURI</td>
 	<td>label=Times</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>Namespace</td>
-	<td>label=VIVO core</td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>LocalName</td>
@@ -140,7 +135,7 @@
 <!--Verify new Times sub-class Hours added-->
 <tr>
 	<td>verifyTextPresent</td>
-	<td>vivo:Hours</td>
+	<td>Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -148,6 +143,16 @@
 	<td>Times</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>(not identified)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>hours</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>site administrator</td>
@@ -155,7 +160,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>exact:http://vivoweb.org/ontology/core#hours</td>
+	<td>-1</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>(unspecified)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>http://vivo.mydomain.edu/individual/hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -170,7 +185,17 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Times</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>http://vivo.mydomain.edu/individual/</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html

@@ -117,11 +117,6 @@
 	<td>GroupURI</td>
 	<td>label=Times</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>Namespace</td>
-	<td>label=VIVO core</td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>LocalName</td>
@@ -140,7 +135,7 @@
 <!--Verify new sub-class Minutes added properly-->
 <tr>
 	<td>verifyTextPresent</td>
-	<td>vivo:Minutes</td>
+	<td>Minutes</td>
 	<td></td>
 </tr>
 <tr>
@@ -148,6 +143,16 @@
 	<td>Times</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>(not identified)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>minutes</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>editor, curator, site administrator</td>
@@ -155,7 +160,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>exact:http://vivoweb.org/ontology/core#minutes</td>
+	<td>-1</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>(unspecified)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>http://vivo.mydomain.edu/individual/minutes</td>
 	<td></td>
 </tr>
 <tr>
@@ -170,7 +185,17 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Minutes</td>
+	<td>link=Minutes</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Times</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>http://vivo.mydomain.edu/individual/</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html

@@ -83,7 +83,7 @@
 <!--Select Class Hours-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -162,7 +162,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -180,6 +180,11 @@
 	<td>Individuals in Class Hours</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>No individuals to display</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>Daytime hours</td>

utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html

@@ -83,13 +83,13 @@
 <!--Make sure sub-class Hours actually exists-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <!--Select to edit sub-class Hours-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -131,7 +131,7 @@
 <!--Verify sub-class Hours no longer exists-->
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html

@@ -83,13 +83,13 @@
 <!--Make sure sub-class Minutes actually exists-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=vivo:Minutes</td>
+	<td>link=Minutes</td>
 	<td></td>
 </tr>
 <!--Select to edit sub-class Minutes-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Minutes</td>
+	<td>link=Minutes</td>
 	<td></td>
 </tr>
 <tr>
@@ -131,7 +131,7 @@
 <!--Verify sub-class Minutes no longer exists-->
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=vivo:Minutes</td>
+	<td>link=Minutes</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html

@@ -82,8 +82,8 @@
 </tr>
 <!--Verify that core:Hour exists-->
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyElementPresent</td>
-	<td>exact:vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -103,13 +103,13 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>VIVO core</td>
+	<td>http://vivo.mydomain.edu/individual/</td>
 	<td></td>
 </tr>
 <!--Navigate to core:Hours-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -130,7 +130,7 @@
 <!--Verify core:Hours info is correct-->
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=exact:vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -150,12 +150,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>VIVO core</td>
+	<td>http://vivo.mydomain.edu/individual/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=exact:vivo:Hours</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>
@@ -163,26 +163,6 @@
 	<td>Class Control Panel</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Class groups</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
 <!--View class groups-->
 <tr>
 	<td>clickAndWait</td>

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

@@ -111,9 +111,14 @@
 	<td></td>
 </tr>
 <!--Make Jane Faculty an Assistant Professor-->
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -121,14 +126,9 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>id=preferredTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html

@@ -98,73 +98,78 @@
 </tr>
 <!--Add visiting hours-->
 <tr>
-	<td>select</td>
+	<td>selectWindow</td>
-	<td>ParentURI</td>
+	<td>null</td>
-	<td>label=dateTimeInterval (vivo)</td>
+	<td></td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>GroupURI</td>
+	<td>name=ParentURI</td>
+	<td>label=date/time interval (vivo)</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=GroupURI</td>
 	<td>label=Place</td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
+	<td>name=Namespace</td>
-	<td>label=editor, curator, site administrator</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
-	<td>label=site administrator</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>Namespace</td>
 	<td>label=Bibontology</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>LocalName</td>
+	<td>name=LocalName</td>
 	<td>visitingHours</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>DomainPublic</td>
+	<td>name=DomainPublic</td>
 	<td>visiting hours</td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>NamespaceInverse</td>
+	<td>name=NamespaceInverse</td>
 	<td>label=Bibontology</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>DomainVClassURI</td>
-	<td>label=vivo:Museum</td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>LocalNameInverse</td>
+	<td>name=LocalNameInverse</td>
 	<td>visitingHoursFor</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>RangePublic</td>
+	<td>name=RangePublic</td>
 	<td>visiting hours for</td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>RangeVClassURI</td>
+	<td>name=DomainVClassURI</td>
-	<td>label=vivo:Date/Time Interval</td>
+	<td>label=Museum (vivo)</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=RangeVClassURI</td>
+	<td>label=Date/Time Interval (vivo)</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=HiddenFromDisplayBelowRoleLevelUsingRoleUri</td>
+	<td>label=editor, curator, site administrator</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=ProhibitedFromUpdateBelowRoleLevelUsingRoleUri</td>
+	<td>label=site administrator</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>DomainDisplayTier</td>
+	<td>name=DomainDisplayTier</td>
 	<td>100</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>OfferCreateNewOption</td>
+	<td>name=OfferCreateNewOption</td>
 	<td></td>
 </tr>
 <tr>
@@ -180,12 +185,12 @@
 <!--Verify visiting hours has been properly added-->
 <tr>
 	<td>verifyTextPresent</td>
-	<td>bibo:visitingHours</td>
+	<td>visiting hours (bibo)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=exact:vivo:dateTimeInterval</td>
+	<td>link=date/time interval (vivo)</td>
 	<td></td>
 </tr>
 <tr>
@@ -204,13 +209,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyElementPresent</td>
+	<td>verifyTextPresent</td>
-	<td>link=exact:vivo:Museum</td>
+	<td>visiting hours</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=exact:vivo:Date/Time Interval</td>
+	<td>link=Museum (vivo)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Date/Time Interval (vivo)</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html

@@ -88,7 +88,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Classgroup Editing Form</td>
+	<td>Property Group Editing Form</td>
 	<td></td>
 </tr>
 <!--Change Display Rank for place from 5 to 2-->
@@ -108,9 +108,19 @@
 	<td></td>
 </tr>
 <!--Verify change has taken place-->
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Place</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Place</td>
+	<td>Display Rank:</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>2</td>
 	<td></td>
 </tr>
 <!--Logout-->

utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html

@@ -83,7 +83,7 @@
 <!--Select to open visiting hours-->
 <tr>
 	<td>clickAndWait</td>
-	<td>link=visiting hours</td>
+	<td>link=visiting hours (bibo)</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html

@@ -86,9 +86,14 @@
 	<td></td>
 </tr>
 <!--Select advises editing-->
+<tr>
+	<td>click</td>
+	<td>//div[@id='wrapper-content']/ul/li[8]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-advisorIn &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[23]</td>
 	<td></td>
 </tr>
 <tr>
@@ -98,7 +103,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create advising relationship entry for Faculty, Jane</td>
+	<td>Create advisor relationship entry for Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -108,12 +113,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Advisee: Last Name</td>
+	<td>Advisee: Last name</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>First Name</td>
+	<td>First name</td>
 	<td></td>
 </tr>
 <tr>
@@ -133,12 +138,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Start
<br />Year </td>
+	<td>Start Year </td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>End
<br />Year</td>
+	<td>End Year</td>
 	<td></td>
 </tr>
 <!--Cancel without adding anything-->
@@ -149,7 +154,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-advisorIn &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[23]</td>
 	<td></td>
 </tr>
 <tr>
@@ -270,7 +275,7 @@
 <!--Add a second advises, including all fields-->
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-advisorIn &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[23]</td>
 	<td></td>
 </tr>
 <tr>
@@ -352,7 +357,7 @@
 <!--Add a third advises, exluding degree and end date-->
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-advisorIn &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[23]</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomAdvisesForm/CreateTestFacultyMember.html

@@ -116,9 +116,14 @@
 	<td>Faculty Member</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,24 +131,14 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Add new entry for: preferred title</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>id=preferredTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html

@@ -86,9 +86,14 @@
 	<td></td>
 </tr>
 <!--Select awards editing-->
+<tr>
+	<td>click</td>
+	<td>//div[@id='wrapper-content']/ul/li[12]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-awardOrHonor &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[33]</td>
 	<td></td>
 </tr>
 <tr>
@@ -108,9 +113,14 @@
 	<td></td>
 </tr>
 <!--Add only organization name, which results in error-->
+<tr>
+	<td>click</td>
+	<td>//div[@id='wrapper-content']/ul/li[12]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-awardOrHonor &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[33]</td>
 	<td></td>
 </tr>
 <tr>
@@ -188,7 +198,7 @@
 <!--Add second award using same organization-->
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-awardOrHonor &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[33]</td>
 	<td></td>
 </tr>
 <tr>
@@ -270,7 +280,7 @@
 <!--Add third award using new organization-->
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-awardOrHonor &gt; img.add-individual</td>
+	<td>xpath=(//img[@alt='add'])[33]</td>
 	<td></td>
 </tr>
 <tr>
@@ -565,6 +575,11 @@
 	<td>Primate Expert</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>//div[@id='wrapper-content']/ul/li[6]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primates-R-Us</td>

utilities/acceptance-tests/suites/CustomAwardsForm/CreateTestFacultyMember.html

@@ -11,6 +11,26 @@
 <thead>
 <tr><td rowspan="1" colspan="3">CreateTestFacultyMember</td></tr>
 </thead><tbody>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &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>
 <!--Add test Faculty member named Jane Faculty-->
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -118,7 +138,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,24 +146,14 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Add new entry for: preferred title</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>id=preferredTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html

@@ -85,9 +85,14 @@
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>//div[@id='wrapper-content']/ul/li[12]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//h3[@id='educationalTraining']/a/img</td>
+	<td>css=a.add-RO_0000056 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -108,7 +113,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//h3[@id='educationalTraining']/a/img</td>
+	<td>css=a.add-RO_0000056 &gt; img.add-individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <!--Verify entering no fields results in error-->
@@ -197,7 +207,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degree</td>
+	<td>id=degreeUri</td>
 	<td>label=B.S. Bachelor of Science</td>
 </tr>
 <tr>
@@ -261,9 +271,10 @@
 	<td>link=Carroll College</td>
 	<td></td>
 </tr>
+<!--Add degree from another new organization-->
 <tr>
 	<td>clickAndWait</td>
-	<td>//h3[@id='educationalTraining']/a/img</td>
+	<td>css=a.add-RO_0000056 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -271,32 +282,6 @@
 	<td>Edit</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>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<!--Add degree from another new organization-->
 <tr>
 	<td>select</td>
 	<td>id=typeSelector</td>
@@ -319,7 +304,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degree</td>
+	<td>id=degreeUri</td>
 	<td>label=M.B.A. Master of Business Administration</td>
 </tr>
 <tr>
@@ -342,6 +327,31 @@
 	<td>submit</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>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <!--Verify both degrees appear-->
 <tr>
 	<td>assertTitle</td>
@@ -371,7 +381,12 @@
 <!--Add third degree from new organization-->
 <tr>
 	<td>clickAndWait</td>
-	<td>//h3[@id='educationalTraining']/a/img</td>
+	<td>css=a.add-RO_0000056 &gt; img.add-individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
@@ -379,11 +394,6 @@
 	<td>id=typeSelector</td>
 	<td>label=University</td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>relatedIndLabel</td>
@@ -396,7 +406,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degree</td>
+	<td>id=degreeUri</td>
 	<td>label=M.Ed. Master of Education</td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html

@@ -80,12 +80,12 @@
 	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
+<!--Verify all 3 degree entries exist-->
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
-<!--Verify all 3 degree entries exist-->
 <tr>
 	<td>verifyTextPresent</td>
 	<td>B.S. in Business Administration, Carroll College 1980</td>
@@ -104,7 +104,7 @@
 <!--Change department, year, and supplemental info for B.S. degree-->
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/section[7]/article[3]/ul/li[3]/a[2]/img</td>
+	<td>xpath=(//img[@alt='edit this entry'])[4]</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,7 +191,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='wrapper-content']/section[7]/article[3]/ul/li[2]/a[2]/img</td>
+	<td>xpath=(//img[@alt='edit this entry'])[3]</td>
 	<td></td>
 </tr>
 <tr>
@@ -258,7 +258,7 @@
 <!--Change M.Ed. to add department and delete supplemental info-->
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.edit-educationalTraining &gt; img.edit-individual</td>
+	<td>css=a.edit-RO_0000056 &gt; img.edit-individual</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html

@@ -116,9 +116,14 @@
 	<td>Faculty Member</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,24 +131,14 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Add new entry for: preferred title</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>id=preferredTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html

@@ -107,9 +107,14 @@
 	<td></td>
 </tr>
 <!--Delete degrees-->
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
+	<td>css=a.delete-RO_0000056 &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -119,7 +124,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -129,7 +134,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
+	<td>css=a.delete-RO_0000056 &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -139,7 +144,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -149,7 +154,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
+	<td>css=a.delete-RO_0000056 &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -159,7 +164,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html

@@ -47,11 +47,21 @@
 	<td>carroll - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Carroll College College</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Carroll College</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Carroll University University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Carroll University</td>
@@ -77,11 +87,21 @@
 	<td>wisconsin - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University of Wisconsin University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=University of Wisconsin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Wisconsin State or Province</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Wisconsin</td>

utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html

@@ -116,9 +116,14 @@
 	<td>Faculty Member</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
+	<td>css=header &gt; #ARG_2000028 &gt; a.add-ARG_2000028 &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,24 +131,14 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Add new entry for: preferred title</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>id=preferredTitle</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html

@@ -80,6 +80,21 @@
 	<td>Ontologies</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Ontology</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Namespace</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Prefix</td>
+	<td></td>
+</tr>
 <!--Make sure SWRC does not already exist-->
 <tr>
 	<td>verifyTextNotPresent</td>