diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 2b45e864..8f30b4c9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -160,27 +160,7 @@
click
- //div[@id='wrapper-content']/ul/li[14]
-
-
-
- assertTitle
- Primate Elderly Care
-
-
-
- verifyTextPresent
- Select an existing Organization for Primate Elderly Care
-
-
-
- select
- objectVar
- label=Primate Colleges of the World
-
-
- clickAndWait
- submit
+ //div[@id='wrapper-content']/ul/li[6]
@@ -190,7 +170,37 @@
clickAndWait
- //h3[@id='grantAwardedBy']/a/img
+ css=a.add-relates > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=organization
+ primate colleges of the
+
+
+ click
+ id=ui-active-menuitem
+
+
+
+ clickAndWait
+ css=input.submit
+
+
+
+ assertTitle
+ Primate Elderly Care
+
+
+
+ clickAndWait
+ css=a.add-assignedBy > img.add-individual
@@ -544,7 +554,7 @@
clickAndWait
- link=exact:Can't find the concept you want? Create your own.
+ link=Can't find the concept you want? Create your own.
@@ -578,16 +588,6 @@
-
- verifyTextPresent
- Primate Colleges of the World
-
-
-
- verifyTextPresent
- Primate Research Laboratory
-
-
verifyTextPresent
Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age.
@@ -595,7 +595,37 @@
verifyTextPresent
- Primate Colleges of the World
+ September 1, 2010 - August 31, 2012
+
+
+
+ verifyElementPresent
+ link=Elderly Care
+
+
+
+ verifyElementPresent
+ link=Primate Colleges of the World
+
+
+
+ verifyElementPresent
+ link=Primate Colleges of the World
+
+
+
+ verifyElementPresent
+ link=Africa
+
+
+
+ verifyElementPresent
+ link=Elderly Care
+
+
+
+ verifyElementPresent
+ link=Primate Health Check
@@ -608,31 +638,21 @@
$999,999
+
+ verifyElementPresent
+ xpath=(//a[contains(text(),'Africa')])[2]
+
+
verifyTextPresent
1234-5678
-
- verifyTextPresent
- September 1, 2010 - August 31, 2012
-
-
verifyTextPresent
P999-1234
-
- verifyElementPresent
- link=Primate Health Check
-
-
-
- verifyTextPresent
- Elderly Care
-
-
clickAndWait
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 662f02aa..97115bf5 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -200,7 +200,7 @@
clickAndWait
- //h3[@id='courseOfferedBy']/a/img
+ css=a.add-offeredBy > img.add-individual
@@ -317,7 +317,7 @@
clickAndWait
- //h3[@id='hasGeographicLocation']/a/img
+ xpath=(//img[@alt='add'])[14]
@@ -460,7 +460,7 @@
clickAndWait
- //h3[@id='includesEvent']/a/img
+ css=a.add-BFO_0000051 > img.add-individual
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
index 1da75396..b8e91221 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@@ -138,7 +138,7 @@
verifyTextPresent
- Please enter a value in the name field.
+ Please enter a value in the Name field.
@@ -196,7 +196,7 @@
clickAndWait
- //h3[@id='equipmentInFacility']/a/img
+ css=a.add-RO_0001025 > img.add-individual
@@ -226,7 +226,7 @@
verifyTextPresent
- Create "in facility" entry for Primate Feeder
+ Create "housed in facility" entry for Primate Feeder
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index a674935f..77ce6cd6 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -160,7 +160,7 @@
click
- //div[@id='wrapper-content']/ul/li[10]
+ //div[@id='wrapper-content']/ul/li[8]
@@ -327,7 +327,7 @@
clickAndWait
- css=a.add-RO_0001025 > img.add-individual
+ xpath=(//h3[@id='RO_0001025']/a)[2]
@@ -337,12 +337,12 @@
verifyTextPresent
- Add an entry to: located in
+ Select an existing Geographic Location for Primate Health Conference
verifyTextPresent
- Located In Nam
+ Geographic Location Name
@@ -365,6 +365,32 @@
Primate Health Conference
+
+ clickAndWait
+ css=a.add-RO_0001025 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ verifyTextPresent
+ Select an existing Facility for Primate Health Conference
+
+
+
+
+
+
+
+
+
+
+
+
+
clickAndWait
@@ -445,7 +471,7 @@
clickAndWait
- //h3[@id='includesEvent']/a/img
+ css=a.add-BFO_0000051 > img.add-individual
@@ -455,7 +481,7 @@
verifyTextPresent
- Select an existing Event for Primate Health Conference
+ Add an entry to: includes event
@@ -490,7 +516,7 @@
clickAndWait
- link=exact:Can't find the concept you want? Create your own.
+ link=Can't find the concept you want? Create your own.
@@ -561,7 +587,7 @@
verifyTextPresent
- Primate Health Conference
+ PrimHConf
@@ -571,7 +597,32 @@
verifyTextPresent
- PHC Proceedings
+ January 5, 2011 - January 9, 2011
+
+
+
+ verifyElementPresent
+ link=Primate Health Check
+
+
+
+ verifyElementPresent
+ link=Animal Health
+
+
+
+ verifyElementPresent
+ link=PHC Proceedings
+
+
+
+ verifyElementPresent
+ link=Kenya
+
+
+
+ verifyElementPresent
+ link=http://primatehealthintro.cornell.edu
@@ -580,38 +631,8 @@
- verifyTextPresent
- Kenya
-
-
-
- verifyTextPresent
- Congo
-
-
-
- verifyTextPresent
- January 5, 2011 - January 9, 2011
-
-
-
- verifyTextPresent
- http://primatehealthintro.cornell.edu
-
-
-
- verifyTextPresent
- Primate Health Check
-
-
-
- verifyTextPresent
- Animal Health
-
-
-
- verifyTextPresent
- PrimHConf
+ verifyElementPresent
+ link=Congo
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index 74aabac3..c3255de2 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -198,9 +198,14 @@
Primate College of America
+
+ selectWindow
+ null
+
+
click
- //div[@id='wrapper-content']/ul/li[14]
+ css=li.nonSelectedGroupTab.clickable
@@ -228,6 +233,21 @@
Primate College of America
+
+ click
+ //div[@id='wrapper-content']/ul/li[12]
+
+
+
+ clickAndWait
+ css=a.add-hasPredecessorOrganization > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
clickAndWait
//h3[@id='hasPredecessorOrganization']/a/img
@@ -238,9 +258,29 @@
Edit
+
+ select
+ id=typeOfNew
+ label=College (vivo)
+
clickAndWait
- submit
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Primate College of New York
+
+
+ clickAndWait
+ id=submit
@@ -248,9 +288,14 @@
Primate College of America
+
+ click
+ //div[@id='wrapper-content']/ul/li[8]
+
+
clickAndWait
- //h3[@id='awardsGrant']/a/img
+ css=a.add-assigns > img.add-individual
@@ -283,9 +328,14 @@
Primate College of America
+
+ click
+ css=li.nonSelectedGroupTab.clickable
+
+
clickAndWait
- //h3[@id='sponsors']/a/img
+ css=a.add-sponsors > img.add-individual
@@ -320,17 +370,7 @@
clickAndWait
- //h3[@id='awardConferred']/a/img
-
-
-
- assertTitle
- Edit
-
-
-
- clickAndWait
- id=offerCreate
+ css=a.add-relatedBy > img.add-individual
@@ -340,12 +380,12 @@
type
- name
+ id=award
Best Primate College
clickAndWait
- submit
+ css=input.submit
@@ -353,9 +393,14 @@
Primate College of America
+
+ click
+ //div[@id='wrapper-content']/ul/li[14]
+
+
clickAndWait
- //h3[@id='hasEquipment']/a/img
+ css=a.add-hasEquipment > img.add-individual
@@ -388,9 +433,14 @@
Primate College of America
+
+ click
+ //div[@id='wrapper-content']/ul/li[8]
+
+
clickAndWait
- //h3[@id='subcontractsGrant']/a/img
+ css=a.add-subcontractsGrant > img.add-individual
@@ -424,9 +474,14 @@
+
+ click
+ //div[@id='wrapper-content']/ul/li[4]
+
+
clickAndWait
- //h3[@id='hasSubOrganization']/a/img
+ css=a.add-BFO_0000051 > img.add-individual
@@ -466,7 +521,7 @@
clickAndWait
- //h3[@id='subOrganizationWithin']/a/img
+ css=a.add-BFO_0000051 > img.add-individual
@@ -499,6 +554,11 @@
submit
+
+ clickAndWait
+ link=Cancel
+
+
assertTitle
Primate College of America
@@ -506,7 +566,7 @@
clickAndWait
- //h3[@id='organizationForPosition']/a/img
+ css=#relatedBy-Position > a.add-relatedBy > img.add-individual
@@ -524,11 +584,6 @@
positionType
label=Faculty Administrative Position
-
- type
- startField-year
- 1999
-
type
id=person
@@ -539,6 +594,11 @@
id=firstName
Polly
+
+ type
+ startField-year
+ 1999
+
clickAndWait
submit
@@ -551,7 +611,7 @@
clickAndWait
- //h3[@id='hasLeaderRole']/a/img
+ css=a.add-RO_0000053 > img.add-individual
@@ -561,8 +621,8 @@
select
- typeSelector
- label=Organization
+ id=typeSelector
+ label=Company
type
@@ -591,7 +651,7 @@
clickAndWait
- //h3[@id='affiliatedOrganization']/a/img
+ css=a.add-affiliatedOrganization > img.add-individual
@@ -616,7 +676,7 @@
clickAndWait
- //h3[@id='hasMemberRole']/a/img
+ xpath=(//img[@alt='add'])[13]
@@ -656,7 +716,7 @@
clickAndWait
- //h3[@id='hasCollaborator']/a/img
+ css=a.add-hasCollaborator > img.add-individual
@@ -686,7 +746,7 @@
clickAndWait
- //h3[@id='hasClinicalRole']/a/img
+ xpath=(//img[@alt='add'])[14]
@@ -725,9 +785,14 @@
+
+ click
+ //div[@id='wrapper-content']/ul/li[6]
+
+
clickAndWait
- //h3[@id='authorInAuthorship']/a/img
+ css=a.add-publisherOf > img.add-individual
@@ -737,8 +802,18 @@
select
- typeSelector
- label=Database
+ id=typeOfNew
+ label=Database (vivo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
type
@@ -757,7 +832,7 @@
clickAndWait
- //h3[@id='hasPresenterRole']/a
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
@@ -796,9 +871,14 @@
+
+ click
+ //div[@id='wrapper-content']/ul/li[10]
+
+
clickAndWait
- //h3[@id='hasOutreachProviderRole']/a/img
+ css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
@@ -842,6 +922,21 @@
+
+ click
+ //div[@id='wrapper-content']/ul/li[12]
+
+
+
+ clickAndWait
+ css=a.add-RO_0001025 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
clickAndWait
//h3[@id='hasGeographicLocation']/a/img
@@ -875,7 +970,7 @@
clickAndWait
- //h3[@id='email']/a/img
+ xpath=(//img[@alt='add'])[33]
@@ -883,19 +978,14 @@
Edit
-
- waitForElementPresent
- tinymce
-
-
type
- tinymce
+ id=emailAddress
info@primates.edu
clickAndWait
- submit
+ id=submit
@@ -905,7 +995,7 @@
clickAndWait
- css=a.add-primaryEmail > img.add-individual
+ css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
@@ -913,49 +1003,14 @@
Edit
-
- waitForElementPresent
- tinymce
-
-
type
- tinymce
- info@primates.edu
-
-
- clickAndWait
- submit
-
-
-
- assertTitle
- Primate College of America
-
-
-
- clickAndWait
- //h3[@id='phoneNumber']/a/img
-
-
-
- assertTitle
- Edit
-
-
-
- waitForElementPresent
- tinymce
-
-
-
- type
- tinymce
+ id=telephoneNumber
555-555-5555
clickAndWait
- submit
+ id=submit
@@ -965,7 +1020,7 @@
clickAndWait
- //h3[@id='faxNumber']/a/img
+ xpath=(//h3[@id='ARG_2000028']/a)[2]
@@ -973,19 +1028,14 @@
Edit
-
- waitForElementPresent
- tinymce
-
-
type
- tinymce
+ id=telephoneNumber
555-555-5554
clickAndWait
- submit
+ id=submit
@@ -995,7 +1045,7 @@
clickAndWait
- //h3[@id='mailingAddress']/a/img
+ xpath=(//img[@alt='add'])[34]
@@ -1003,14 +1053,9 @@
Edit
-
- select
- id=country
- label=Morocco
-
type
- id=addrLineOne
+ id=streetAddressOne
1234 Northern African Nation
@@ -1023,6 +1068,11 @@
id=postalCode
1234567890
+
+ type
+ id=countryEditMode
+ Morocco
+
clickAndWait
id=submit
@@ -1034,9 +1084,14 @@
+
+ click
+ css=li.nonSelectedGroupTab.clickable
+
+
clickAndWait
- //h3[@id='dateTimeInterval']/a/img
+ css=a.add-dateTimeInterval > img.add-individual
@@ -1090,6 +1145,11 @@
Primate College of America
+
+ click
+ //div[@id='wrapper-content']/ul/li[8]
+
+
clickAndWait
//h3[@id='freetextKeyword']/a/img
@@ -1120,60 +1180,454 @@
Primate College of America
+
+
+ click
+ css=li.nonSelectedGroupTab.clickable
+
+
+
+ clickAndWait
+ xpath=(//img[@alt='add'])[14]
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Workshop
+
+
+ type
+ id=activity
+ New Primate Students
+
+
+ type
+ id=startField-year
+ 2003
+
+
+ type
+ id=endField-year
+ 2006
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ xpath=(//img[@alt='add'])[15]
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Performance
+
+
+ type
+ id=activity
+ Primates in the Wild
+
+
+ type
+ id=startField-year
+ 1997
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[6]
+
+
+
+ clickAndWait
+ css=a.add-featuredIn > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeOfNew
+ label=Blog (vivo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Primate Happenings
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ css=a.add-assigneeFor > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ USA222333444555
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ css=a.add-translatorOf > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=objectVar
+ label=Primate Heart Health
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[8]
+
+
+
+ clickAndWait
+ css=#researchGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=grant
+ primate hab
+
+
+ click
+ id=ui-active-menuitem
+
+
+
+ clickAndWait
+ css=input.submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ css=a.add-ERO_0001520 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[10]
+
+
+
+ clickAndWait
+ css=a.add-ERO_0000037 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeOfNew
+ label=Transport Service (obo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Gorilla Moving Company
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ css=#serviceGroup > article.property > #offers > a.add-offers > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Introduction to Primates
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[12]
+
+
+
+ clickAndWait
+ css=a.add-hasSuccessorOrganization > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeOfNew
+ label=University (vivo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Primate University of America
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
+ clickAndWait
+ css=a.add-governingAuthorityFor > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=object
+ primate colleges of
+
+
+ click
+ id=ui-active-menuitem
+
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Primate College of America
+
+
+
- verifyTextPresent
- The Primate College of America is a privately-funded college for the study of primates.
+ click
+ css=li.nonSelectedGroupTab.clickable
verifyTextPresent
- B.S. Bachelor of Science
+ PCoA
verifyTextPresent
- Primate College of America
+ 1959 -
+
+
+
+ verifyElementPresent
+ link=B.S. Bachelor of Science
+
+
+
+ verifyElementPresent
+ link=Primate Student of the Year
+
+
+
+ verifyElementPresent
+ link=Best Primate College
+
+
+
+
+ click
+ css=li.nonSelectedGroupTab.clickable
verifyTextPresent
- Primate College of America
+ faculty administrative position
- verifyTextPresent
- Primate Habitat Research Grant
-
-
-
- verifyTextPresent
- Primate Survival Planning Grant
-
-
-
- verifyTextPresent
- Primate Student of the Year
-
-
-
- verifyTextPresent
- Best Primate College
-
-
-
- verifyTextPresent
- Portable Primate Habitat
-
-
-
- verifyTextPresent
- Primate Research Laboratory
-
-
-
- verifyTextPresent
- Primate History Library
+ verifyElementPresent
+ link=Person, Polly
@@ -1181,14 +1635,54 @@
Person, Polly, Dr. 1999 -
+
+ verifyElementPresent
+ link=Primate Research Laboratory
+
+
+
+ verifyTextPresent
+ Primate Research Laboratory Laboratory
+
+
+
+ verifyElementPresent
+ link=Primate History Library
+
+
+
+ verifyTextPresent
+ Primate History Library Library
+
+
+
+ verifyElementPresent
+ link=Primates-r-us
+
+
verifyTextPresent
Primates-r-us Founder 2010 -
+
+ verifyElementPresent
+ link=Primate History Library
+
+
verifyTextPresent
- Primates-r-us
+ Primate History Library Library
+
+
+
+ verifyElementPresent
+ link=Primates-r-us
+
+
+
+ verifyElementPresent
+ link=Primate Colleges of the World
@@ -1197,8 +1691,8 @@
- verifyTextPresent
- Primate History Library
+ verifyElementPresent
+ link=Primate Heart Health
@@ -1207,13 +1701,49 @@
- verifyTextPresent
- database
+ verifyElementPresent
+ link=New Primate Students
verifyTextPresent
- Primate Info
+ New Primate Students 2003 - 2006
+
+
+
+ verifyElementPresent
+ link=Primates in the Wild
+
+
+
+ verifyTextPresent
+ Primates in the Wild 1997 -
+
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[6]
+
+
+
+ verifyElementPresent
+ link=Primate Info
+
+
+
+ verifyTextPresent
+ Primate Info Database
+
+
+
+ verifyTextPresent
+ invited talk
+
+
+
+ verifyElementPresent
+ link=Primate Health and Fitness
@@ -1221,19 +1751,88 @@
Primate Health and Fitness, Organizer 2008
+
+ verifyElementPresent
+ link=Primate Happenings
+
+
+
+ verifyElementPresent
+ link=USA222333444555
+
+
+
+ verifyElementPresent
+ link=Primate Heart Health
+
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[8]
+
+
+
+ verifyElementPresent
+ link=Primate Habitat Research Grant
+
+
+
+ verifyElementPresent
+ link=Primate Habitat Research Grant
+
+
+
+ verifyElementPresent
+ link=Primate Survival Planning Grant
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ verifyTextPresent
+ Gorillas
+
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[10]
+
+
+
+ verifyElementPresent
+ link=Gorilla Moving Company
+
+
+
+ verifyElementPresent
+ link=Primate Health Check
+
+
+
+ verifyElementPresent
+ link=Introduction to Primates
+
+
verifyTextPresent
Primate Health Check Sponsor 2008 - 2010
+
- verifyTextPresent
- northern Africa
-
-
-
- verifyTextPresent
- info@primates.edu
+ click
+ //div[@id='wrapper-content']/ul/li[12]
@@ -1247,8 +1846,13 @@
- verifyElementPresent
- link=1234 Northern African Nation
+ verifyTextPresent
+ info@primates.edu
+
+
+
+ verifyTextPresent
+ 1234 Northern African Nation
@@ -1267,18 +1871,51 @@
- verifyTextPresent
- 1959
+ verifyElementPresent
+ link=northern Africa
+
+
+
+ verifyElementPresent
+ link=Primate College of New York
+
+
+
+ verifyElementPresent
+ link=Primate University of America
+
+
+
+ verifyElementPresent
+ link=Primate Colleges of the World
+
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[14]
+
+
+
+ verifyElementPresent
+ link=Portable Primate Habitat
verifyTextPresent
- PCoA
+ Portable Primate Habitat
+
+
+
+
+
+
+
- verifyTextPresent
- Gorillas
+
+
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
index b3e8a506..8a076f8c 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
@@ -138,7 +138,7 @@
verifyTextPresent
- Please enter a value in the name field.
+ Please enter a value in the Name field.
@@ -286,18 +286,18 @@
- verifyTextPresent
- Animal Health
+ verifyElementPresent
+ link=Animal Health
- verifyTextPresent
- Primate Diet
+ verifyElementPresent
+ link=Primate Diet
- verifyTextPresent
- Ape Health
+ verifyElementPresent
+ link=Ape Health
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
index 28c3d8a2..734e3f87 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
@@ -179,6 +179,11 @@
Furter, Frank
+
+ click
+ //div[@id='wrapper-content']/ul/li[4]
+
+
verifyTextPresent
academic article
@@ -634,6 +639,11 @@
Furter, Frank
+
+ click
+ //div[@id='wrapper-content']/ul/li[4]
+
+
verifyTextPresent
academic article
@@ -662,7 +672,7 @@
click
- //div[@id='wrapper-content']/ul/li[16]
+ //div[@id='wrapper-content']/ul/li[12]
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/utilities/acceptance-tests/suites/AddPublications/AddBook.html
index e554c6b0..2c893fe5 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddBook.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddBook.html
@@ -582,7 +582,7 @@
click
- //div[@id='wrapper-content']/ul/li[16]
+ //div[@id='wrapper-content']/ul/li[12]
diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
index 7ceaad18..c209f16e 100644
--- a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html
@@ -215,7 +215,7 @@
click
- //div[@id='wrapper-content']/ul/li[8]
+ //div[@id='wrapper-content']/ul/li[6]
@@ -223,11 +223,6 @@
link=Furter, Frank
-
- verifyElementPresent
- link=Games and Child Development
-
-
verifyTextPresent
2010
@@ -239,8 +234,8 @@
- verifyTextPresent
- Games
+ verifyElementPresent
+ link=Games and Child Development
@@ -248,6 +243,11 @@
Children
+
+ verifyTextPresent
+ Games
+
+
clickAndWait
@@ -271,7 +271,7 @@
click
- //div[@id='wrapper-content']/ul/li[12]
+ //div[@id='wrapper-content']/ul/li[10]
@@ -347,7 +347,7 @@
click
- //div[@id='wrapper-content']/ul/li[12]
+ //div[@id='wrapper-content']/ul/li[10]
@@ -425,6 +425,162 @@
Games
+
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ verifyTextPresent
+ 1 Academic Articles
+
+
+
+ verifyTextPresent
+ 2 Books
+
+
+
+ verifyTextPresent
+ 1 Chapters
+
+
+
+ verifyTextPresent
+ 1 Conference Papers
+
+
+
+ clickAndWait
+ link=View all ...
+
+
+
+ assertTitle
+ Research
+
+
+
+ click
+ link=Academic Article (1)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Too Much Nintendo
+
+
+
+ click
+ link=Article (2)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Nintendo Case Studies
+
+
+
+ verifyTextPresent
+ Conference Paper
+
+
+
+ verifyElementPresent
+ link=Too Much Nintendo
+
+
+
+ verifyTextPresent
+ Academic Article
+
+
+
+ click
+ link=Book (2)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Kids in the 21st Century
+
+
+
+ verifyElementPresent
+ link=exact:Nintendo: Good or Bad for Kids?
+
+
+
+ click
+ link=Chapter (1)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Nintendo O.K. for Kids
+
+
+
+ click
+ link=Concept (1)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Child Development
+
+
+
+ verifyElementPresent
+ link=Conference Paper (1)
+
+
+
+ click
+ link=Journal (1)
+
+
+
+ pause
+ 5000
+
+
+
+ verifyElementPresent
+ link=Child Development
+
+
clickAndWait
diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
index c52eadf7..62ddaf8a 100644
--- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
+++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
@@ -177,11 +177,6 @@
-
- selectWindow
- null
-
-
clickAndWait
css=#relatedBy-Authorship > a.add-relatedBy > img.add-individual
@@ -410,11 +405,6 @@
link=Nintendo O.K. for Kids
-
- click
- //div[@id='wrapper-content']/ul/li[16]
-
-
clickAndWait
css=img.add-individual
@@ -708,7 +698,7 @@
type
- id=anchor
+ id=label
Company Homepage
@@ -716,6 +706,16 @@
submit
+
+ assertTitle
+ Edit
+
+
+
+ clickAndWait
+ id=returnToIndividual
+
+
assertTitle
Nintendo O.K. for Kids
@@ -893,16 +893,6 @@
-
- clickAndWait
- //h3[@id='chapter']/a/img
-
-
-
- assertTitle
- Edit
-
-
verifyTextPresent
Add new entry for: chapter
@@ -979,11 +969,6 @@
This relates an information resource to a person it features.
-
- verifyTextPresent
- Features Name
-
-
clickAndWait
link=Cancel
@@ -1015,19 +1000,9 @@
- verifyTextPresent
- Features Name
-
-
-
- type
- id=object
- Mouse
-
-
- click
- id=ui-active-menuitem
-
+ select
+ id=objectVar
+ label=Mouse, Minnie
clickAndWait
@@ -1128,17 +1103,12 @@
verifyTextPresent
- Relates a document to an event; for example, a paper to a conference.
+ There are no entries in the system from which to select.
verifyTextPresent
- Event Name
-
-
-
- verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
+ Please create a new entry.
@@ -1168,17 +1138,12 @@
verifyTextPresent
- Relates a document to an event; for example, a paper to a conference.
+ There are no entries in the system from which to select.
verifyTextPresent
- Event Name
-
-
-
- verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
+ Please create a new entry.
@@ -1198,7 +1163,7 @@
verifyTextPresent
- Create "presented at" entry for Nintendo O.K. for Kids
+ Create "presented at event" entry for Nintendo O.K. for Kids
@@ -1232,11 +1197,6 @@
Add an entry to: status
-
- verifyTextPresent
- Status Name
-
-
clickAndWait
link=Cancel
@@ -1263,9 +1223,9 @@
- verifyTextPresent
- Status Name
-
+ select
+ id=objectVar
+ label=published
clickAndWait
@@ -1315,12 +1275,12 @@
verifyTextPresent
- Add an entry to: has part
+ Select an existing Document Part for Nintendo O.K. for Kids
verifyTextPresent
- Has Part Name
+ If you don't find the appropriate entry on the selection list above:
@@ -1345,12 +1305,12 @@
verifyTextPresent
- Add an entry to: has part
+ Select an existing Document Part for Nintendo O.K. for Kids
verifyTextPresent
- Has Part Name
+ If you don't find the appropriate entry on the selection list above:
@@ -1399,11 +1359,6 @@
Add an entry to: part of
-
- verifyTextPresent
- Part Of Name
-
-
clickAndWait
link=Cancel
@@ -1424,30 +1379,10 @@
Edit
-
- verifyTextPresent
- Add an entry to: part of
-
-
-
- verifyTextPresent
- Part Of Name
-
-
select
- typeOfNew
- label=Book (bibo)
-
-
- clickAndWait
- id=offerCreate
-
-
-
- assertTitle
- Edit
-
+ id=objectVar
+ label=Nintendo O.K. for Kids
type
@@ -2039,12 +1974,12 @@
verifyTextPresent
- Add an entry to: reproduces
+ Select an existing Document for Nintendo O.K. for Kids
verifyTextPresent
- Reproduces Name
+ If you don't find the appropriate entry on the selection list above:
@@ -2069,12 +2004,12 @@
verifyTextPresent
- Add an entry to: reproduces
+ Select an existing Document for Nintendo O.K. for Kids
verifyTextPresent
- Reproduces Name
+ If you don't find the appropriate entry on the selection list above:
@@ -2104,18 +2039,18 @@
- click
- css=label
+ verifyTextPresent
+ Select an existing (Instrument or Service or Reagent or Research Project or Biological Specimen or Software or Database) for Nintendo O.K. for Kids
verifyTextPresent
- Add an entry to: documentation for
+ There are no entries in the system from which to select.
verifyTextPresent
- Documentation For Name *
+ Please create a new entry.
@@ -2143,9 +2078,39 @@
Edit
+
+ verifyTextPresent
+ Select an existing (Instrument or Service or Reagent or Research Project or Biological Specimen or Software or Database) for Nintendo O.K. for Kids
+
+
+
+ verifyTextPresent
+ There are no entries in the system from which to select.
+
+
+
+ verifyTextPresent
+ Please create a new entry.
+
+
+
+ select
+ id=typeOfNew
+ label=Service (obo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
type
- id=object
+ id=name
Kids
@@ -2181,12 +2146,12 @@
verifyTextPresent
- Global Citation Count Name
+ There are no entries in the system from which to select.
verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
+ Please create a new entry.
@@ -2214,16 +2179,6 @@
Edit
-
- clickAndWait
- id=offerCreate
-
-
-
- assertTitle
- Edit
-
-
verifyTextPresent
Select an existing Global Citation Count for Nintendo O.K. for Kids
@@ -2231,17 +2186,12 @@
verifyTextPresent
- Global Citation Count Name
+ There are no entries in the system from which to select.
verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
-
-
-
- verifyElementPresent
- link=Cancel
+ Please create a new entry.
@@ -2269,11 +2219,6 @@
Nintendo O.K. for Kids
-
- assertTitle
- Nintendo O.K. for Kids
-
-
clickAndWait
@@ -2292,17 +2237,12 @@
verifyTextPresent
- Relates a document to an event; for example, a paper to a conference.
+ There are no entries in the system from which to select.
verifyTextPresent
- Event Name
-
-
-
- verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
+ Please create a new entry.
@@ -2322,7 +2262,7 @@
verifyTextPresent
- Create "presented at" entry for Nintendo O.K. for Kids
+ Create "presented at event" entry for Nintendo O.K. for Kids
@@ -2357,17 +2297,12 @@
verifyTextPresent
- Relates a document to an event; for example, a paper to a conference.
+ There are no entries in the system from which to select.
verifyTextPresent
- Event Name
-
-
-
- verifyTextPresent
- If you don't find the appropriate entry on the selection list above:
+ Please create a new entry.
@@ -2387,7 +2322,7 @@
verifyTextPresent
- Create "presented at" entry for Nintendo O.K. for Kids
+ Create "presented at event" entry for Nintendo O.K. for Kids
@@ -2398,7 +2333,12 @@
type
id=name
- Kids Now Conference
+ Kids Now
+
+
+ click
+ id=ui-active-menuitem
+
clickAndWait
@@ -2426,11 +2366,6 @@
Add an entry to: part of
-
- verifyTextPresent
- Part Of Name
-
-
verifyTextPresent
If you don't find the appropriate entry on the selection list above:
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
index 32c14cab..48d11ff5 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
@@ -93,7 +93,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[18]
+ xpath=(//img[@alt='add'])[22]
@@ -139,7 +139,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[18]
+ xpath=(//img[@alt='add'])[22]
@@ -237,7 +237,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[18]
+ xpath=(//img[@alt='add'])[22]
@@ -345,7 +345,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[23]
@@ -391,7 +391,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[23]
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
index e87fb5e0..9d0082d4 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@@ -1024,7 +1024,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ css=li.nonSelectedGroupTab.clickable
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
index 4e07dcdc..e84eaa70 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html
@@ -91,14 +91,9 @@
-
- click
- //div[@id='wrapper-content']/ul/li[18]
-
-
clickAndWait
- css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[12]
@@ -129,7 +124,7 @@
clickAndWait
- css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[12]
@@ -160,7 +155,7 @@
clickAndWait
- css=#otherGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[12]
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
index e8a83e7a..74b39942 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@@ -93,7 +93,7 @@
clickAndWait
- css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[16]
@@ -124,7 +124,7 @@
clickAndWait
- css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[16]
@@ -185,7 +185,7 @@
clickAndWait
- css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[16]
@@ -419,7 +419,7 @@
clickAndWait
- css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+ xpath=(//img[@alt='add'])[16]
@@ -541,7 +541,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ css=li.nonSelectedGroupTab.clickable
@@ -582,7 +582,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[29]
+ xpath=(//img[@alt='add'])[33]
@@ -694,7 +694,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[29]
+ xpath=(//img[@alt='add'])[33]
@@ -832,7 +832,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[30]
+ xpath=(//img[@alt='add'])[34]
@@ -939,7 +939,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[30]
+ xpath=(//img[@alt='add'])[34]
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
index edf84d92..1a794b13 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html
@@ -112,7 +112,7 @@
verifyTextPresent
- Association (3)
+ Association (2)
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
index b51648be..cc721b86 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html
@@ -54,12 +54,12 @@
Faculty, Jane
+
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[8]
-
verifyTextPresent
clinical activities
@@ -244,7 +244,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[8]
@@ -314,7 +314,7 @@
verifyTextPresent
- service to the profession
+ professional service activities
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
index fc53a0e6..b90d153a 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
@@ -326,7 +326,7 @@
clickAndWait
- xpath=(//img[@alt='edit this entry'])[4]
+ xpath=(//img[@alt='edit this entry'])[5]
diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
index 740b5b70..75a7e161 100644
--- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
+++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html
@@ -89,7 +89,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[18]
diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
index 0221cb19..cfc8ecd2 100644
--- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
+++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
@@ -398,16 +398,6 @@
link=Animal Librarianship
-
- verifyTextPresent
- USAIN Conference Conference
-
-
-
- verifyElementPresent
- link=USAIN Conference
-
-
type
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
index 3b56df96..ac56e5d7 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLoginLogout.html
@@ -130,11 +130,6 @@
link=Menu ordering
-
- verifyElementPresent
- link=Restrict logins
-
-
verifyElementPresent
link=Site information
@@ -227,7 +222,7 @@
verifyTextPresent
- Refresh Content
+ Site Maintenance
@@ -245,6 +240,16 @@
link=Recompute inferences
+
+ verifyElementPresent
+ link=Restrict logins
+
+
+
+ verifyElementPresent
+ link=Activate developer panel
+
+
clickAndWait
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
index 678a560a..468685c0 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html
@@ -86,16 +86,6 @@
-
- clickAndWait
- link=Site Admin
-
-
-
- assertTitle
- VIVO Site Administration
-
-
verifyTextPresent
Site Administration
@@ -136,11 +126,6 @@
link=Menu ordering
-
- verifyElementPresent
- link=Restrict logins
-
-
verifyElementPresent
link=Site information
@@ -233,7 +218,7 @@
verifyTextPresent
- Refresh Content
+ Site Maintenance
@@ -251,6 +236,16 @@
link=Recompute inferences
+
+ verifyElementPresent
+ link=Restrict logins
+
+
+
+ verifyElementPresent
+ link=Activate developer panel
+
+
clickAndWait
@@ -462,51 +457,6 @@
link=Site Admin
-
- assertTitle
- VIVO Site Administration
-
-
-
- clickAndWait
- link=Restrict logins
-
-
-
- assertTitle
- Restrict Logins
-
-
-
- verifyTextPresent
- Restrict Logins
-
-
-
- verifyTextPresent
- Logins are open to all.
-
-
-
- verifyElementPresent
- link=Restrict Logins
-
-
-
- verifyTextNotPresent
- 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.
-
-
-
- clickAndWait
- link=Site Admin
-
-
-
- assertTitle
- VIVO Site Administration
-
-
clickAndWait
link=Site information
@@ -875,7 +825,7 @@
verifyElementPresent
- link=access provided by
+ link=access provided by (scires)
@@ -1129,6 +1079,76 @@
link=Connect DB
+
+ verifyElementPresent
+ link=Manage Jena Models
+
+
+
+ verifyElementPresent
+ link=Subtract One Model from Another
+
+
+
+ verifyElementPresent
+ link=Convert CSV to RDF
+
+
+
+ verifyElementPresent
+ link=Convert XML to RDF
+
+
+
+ verifyElementPresent
+ link=Execute SPARQL CONSTRUCT
+
+
+
+ verifyElementPresent
+ link=Generate TBox
+
+
+
+ verifyElementPresent
+ link=Name Blank Nodes
+
+
+
+ verifyElementPresent
+ link=Smush Resources
+
+
+
+ verifyElementPresent
+ link=Merge Resources
+
+
+
+ verifyElementPresent
+ link=Change Namespace of Resources
+
+
+
+ verifyElementPresent
+ link=Process Property Value Strings
+
+
+
+ verifyElementPresent
+ link=Split Property Value Strings into Multiple Property Values
+
+
+
+ verifyElementPresent
+ link=Harvest Person Data from CSV
+
+
+
+ verifyElementPresent
+ link=Harvest Grant Data from CSV
+
+
verifyElementPresent
link=Execute Workflow
@@ -1395,6 +1415,91 @@
name=submit
Recompute Inferences
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Restrict logins
+
+
+
+ assertTitle
+ Restrict Logins
+
+
+
+ verifyTextPresent
+ Restrict Logins
+
+
+
+ verifyTextPresent
+ Logins are open to all.
+
+
+
+ verifyElementPresent
+ link=Restrict Logins
+
+
+
+ verifyTextNotPresent
+ 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.
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ click
+ link=Activate developer panel
+
+
+
+ pause
+ 10000
+
+
+
+ verifyTextPresent
+ VIVO is running in developer mode. (click for Options)
+
+
+
+ click
+ id=developerPanelClickText
+
+
+
+ click
+ id=developerEnabled
+
+
+
+ click
+ id=developerPanelSaveButton
+
+
+
+ verifyTextNotPresent
+ 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.
+
+
clickAndWait
diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
index 929d35a8..f65cac1d 100644
--- a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
+++ b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html
@@ -1180,6 +1180,11 @@
link=Map of Science
+
+ pause 10000
+
+
+
assertTitle
Furter, Frank - Map of Science Visualization
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
index 1e5c1448..7759eeac 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
@@ -94,7 +94,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[23]
@@ -165,7 +165,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[23]
@@ -230,7 +230,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[23]
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
index f4d22825..6ad34060 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html
@@ -129,7 +129,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[19]
+ xpath=(//img[@alt='add'])[22]
@@ -160,7 +160,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[18]
+ xpath=(//img[@alt='add'])[23]
@@ -196,7 +196,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[18]
+ xpath=(//img[@alt='add'])[23]
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
index c74467ff..806f5541 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
@@ -103,12 +103,12 @@
click
- //div[@id='wrapper-content']/ul/li[14]
+ //div[@id='wrapper-content']/ul/li[16]
clickAndWait
- css=a.add-relatedBy > img.add-individual
+ css=#relatedBy-Position > a.add-relatedBy > img.add-individual
@@ -158,7 +158,12 @@
clickAndWait
- css=a.add-relatedBy > img.add-individual
+ css=#relatedBy-Position > a.add-relatedBy > img.add-individual
+
+
+
+ assertTitle
+ Edit
@@ -203,7 +208,12 @@
clickAndWait
- css=a.add-relatedBy > img.add-individual
+ css=#relatedBy-Position > a.add-relatedBy > img.add-individual
+
+
+
+ assertTitle
+ Edit
@@ -248,7 +258,12 @@
clickAndWait
- css=a.add-relatedBy > img.add-individual
+ css=#relatedBy-Position > a.add-relatedBy > img.add-individual
+
+
+
+ assertTitle
+ Edit
@@ -844,7 +859,7 @@
click
- //div[@id='wrapper-content']/ul/li[14]
+ //div[@id='wrapper-content']/ul/li[16]
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
index b1435405..e6be06f0 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
@@ -356,6 +356,16 @@
Faculty, Jane
+
+ selectWindow
+ null
+
+
+
+ click
+ //div[@id='wrapper-content']/ul/li[18]
+
+
clickAndWait
//h3[@id='hasCollaborator']/a/img
@@ -418,7 +428,7 @@
clickAndWait
- //h3[@id='geographicFocus']/a/img
+ css=a.add-geographicFocus > img.add-individual
@@ -446,19 +456,9 @@
Faculty, Jane
-
- click
- //div[@id='wrapper-content']/ul/li[20]
-
-
-
- assertTitle
- Faculty, Jane
-
-
clickAndWait
- xpath=(//img[@alt='add'])[22]
+ xpath=(//img[@alt='add'])[26]
@@ -558,7 +558,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[30]
+ xpath=(//img[@alt='add'])[36]
@@ -643,7 +643,7 @@
clickAndWait
- css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
+ xpath=(//img[@alt='add'])[39]
@@ -688,7 +688,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[33]
+ css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
@@ -1118,6 +1118,396 @@
Faculty, Jane
+
+ clickAndWait
+ xpath=(//img[@alt='add'])[11]
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Performance
+
+
+ type
+ id=activity
+ Apes on Parade
+
+
+ type
+ id=startField-year
+ 1991
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=#publicationsGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Newsletter
+
+
+ type
+ id=activity
+ Ape Week
+
+
+ type
+ id=startField-year
+ 1988
+
+
+ type
+ id=endField-year
+ 1990
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-featuredIn > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeOfNew
+ label=Case Study (vivo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Primate Reactions
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-translatorOf > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=objectVar
+ label=Ape Week
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Conference Poster
+
+
+ type
+ id=activity
+ Variety of Apes in Africa
+
+
+ type
+ id=startField-year
+ 1983
+
+
+ type
+ id=endField-year
+ 1983
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-ERO_0000037 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeOfNew
+ label=Training Service (obo)
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ Primate Feeding
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ xpath=(//img[@alt='add'])[28]
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=typeSelector
+ label=Exhibit
+
+
+ type
+ id=activity
+ Primates of East Africa
+
+
+ type
+ id=startField-year
+ 1984
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-ERO_0000397 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ JF Feeding
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-ERO_0000033 > img.add-individual
+
+
+
+ clickAndWait
+ id=offerCreate
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=name
+ JF Feeding Revised
+
+
+ clickAndWait
+ id=submit
+
+
+
+ clickAndWait
+ css=#backgroundGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ select
+ id=selector
+ label=Faculty Mentoring Relationship
+
+
+ type
+ id=advisor
+ Adams
+
+
+ type
+ id=firstName
+ Amy
+
+
+ type
+ id=SubjectArea
+ Primate Feeding
+
+
+ type
+ id=startField-year
+ 2013
+
+
+ clickAndWait
+ css=input.submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ css=a.add-ARG_0000197 > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ waitForElementPresent
+ tinymce
+
+
+
+ type
+ tinymce
+ 976976976976
+
+
+ clickAndWait
+ submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
clickAndWait
@@ -1169,6 +1559,11 @@
link=Primatia
+
+ verifyElementPresent
+ link=Africa
+
+
verifyElementPresent
link=mejane@africa.com
@@ -1205,7 +1600,47 @@
Librarian, Lily Lou Assistant Librarian
-
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade 1991 -
+
+
+
+
+ click
+ css=li.nonSelectedGroupTab.clickable
+
+
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week (Newsletter) 1988 - 1990
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyElementPresent
+ link=USABC123456789
+
+
+
+ verifyElementPresent
+ css=#translatorOf-IAO_0000030-List > li > a[title="name"]
+
+
click
@@ -1218,8 +1653,8 @@
- verifyElementPresent
- link=Africa
+ verifyTextPresent
+ Apes
@@ -1254,6 +1689,41 @@
I travel the country teaching monkeys in zoos how to communicate.
+
+ verifyElementPresent
+ link=Variety of Apes in Africa
+
+
+
+ verifyTextPresent
+ Variety of Apes in Africa (Conference Poster) 1983
+
+
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primates of East Africa
+
+
+
+ verifyTextPresent
+ Primates of East Africa 1984 -
+
+
+
+ verifyElementPresent
+ link=JF Feeding
+
+
+
+ verifyElementPresent
+ link=JF Feeding Revised
+
+
click
@@ -1262,12 +1732,12 @@
verifyElementPresent
- link=Primate Expert Association
+ link=Licensed Primate Expert
verifyElementPresent
- link=Licensed Primate Expert
+ link=Primate Expert Association
@@ -1286,11 +1756,6 @@
Ms. Jane Elizabeth Faculty, III
-
- verifyTextPresent
- 607-244-4444
-
-
verifyTextPresent
The Jungle
@@ -1316,6 +1781,11 @@
Democratic Republic of Congo
+
+ verifyTextPresent
+ 607-244-4444
+
+
click
@@ -1342,26 +1812,15 @@
link=5678
-
-
- click
- //div[@id='wrapper-content']/ul/li[18]
-
-
-
- verifyElementPresent
- link=USABC123456789
-
-
verifyTextPresent
- Apes
+ 976976976976
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[18]
@@ -1374,14 +1833,49 @@
Librarian, Lily Lou Assistant Librarian
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade 1991 -
+
+
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week (Newsletter) 1988 - 1990
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyElementPresent
+ link=USABC123456789
+
+
+
+ verifyElementPresent
+ css=#translatorOf-IAO_0000030-List > li > a[title="name"]
+
+
verifyTextPresent
I study monkeys, of course.
- verifyElementPresent
- link=Africa
+ verifyTextPresent
+ Apes
@@ -1406,7 +1900,37 @@
verifyElementPresent
- link=Primate Expert Association
+ link=Variety of Apes in Africa
+
+
+
+ verifyTextPresent
+ Variety of Apes in Africa (Conference Poster) 1983
+
+
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primates of East Africa
+
+
+
+ verifyTextPresent
+ Primates of East Africa 1984 -
+
+
+
+ verifyElementPresent
+ link=JF Feeding
+
+
+
+ verifyElementPresent
+ link=JF Feeding Revised
@@ -1414,6 +1938,11 @@
link=Licensed Primate Expert
+
+ verifyElementPresent
+ link=Primate Expert Association
+
+
verifyElementPresent
link=Monkey Trainer of the Year
@@ -1424,11 +1953,6 @@
Ms. Jane Elizabeth Faculty, III
-
- verifyTextPresent
- 607-244-4444
-
-
verifyTextPresent
The Jungle
@@ -1454,6 +1978,11 @@
Democratic Republic of Congo
+
+ verifyTextPresent
+ 607-244-4444
+
+
verifyElementPresent
link=exact:file:///C:/xampp/1234
@@ -1474,14 +2003,9 @@
link=5678
-
- verifyElementPresent
- link=USABC123456789
-
-
verifyTextPresent
- Apes
+ 976976976976
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
index 6cc329de..b1a74098 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html
@@ -193,7 +193,7 @@
clickAndWait
- //h3[@id='geographicFocus']/a/img
+ css=a.add-geographicFocus > img.add-individual
@@ -223,77 +223,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[20]
-
-
-
- assertTitle
- Edit
-
-
-
- clickAndWait
- //h3[@id='advisorIn']/a/img
-
-
-
- select
- id=selector
- label=Other
-
-
- type
- id=advisee
- SPCA
-
-
- type
- id=firstName
- The
-
-
- clickAndWait
- css=input.submit
-
-
-
- assertTitle
- Faculty, Jane
-
-
-
- clickAndWait
- //h3[@id='adviseeIn']/a/img
-
-
-
- clickAndWait
- id=offerCreate
-
-
-
- assertTitle
- Edit
-
-
-
- type
- name
- Humane Society of Africa
-
-
- clickAndWait
- submit
-
-
-
- assertTitle
- Faculty, Jane
-
-
-
- clickAndWait
- xpath=(//img[@alt='add'])[29]
+ xpath=(//img[@alt='add'])[36]
@@ -343,7 +273,7 @@
clickAndWait
- css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
+ xpath=(//img[@alt='add'])[39]
@@ -351,11 +281,6 @@
Edit
-
- clickAndWait
- //h3[@id='faxNumber']/a/img
-
-
type
id=telephoneNumber
@@ -381,16 +306,6 @@
Edit
-
- clickAndWait
- //h2[@id='email']/a/img
-
-
-
- assertTitle
- Edit
-
-
type
id=emailAddress
@@ -408,7 +323,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[32]
+ css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
@@ -416,14 +331,9 @@
Edit
-
- select
- id=country
- label=United States of America
-
type
- id=streetAddress
+ id=streetAddressOne
CIT Cornell University
@@ -468,7 +378,7 @@
type
- id=orcidId
+ id=orcidIdDisplay
454545
@@ -658,6 +568,16 @@
link=Primatia Africana
+
+ verifyElementPresent
+ link=Mozamia
+
+
+
+ verifyElementPresent
+ link=southern Africa
+
+
verifyElementPresent
link=mejane@primates-r-us.com
@@ -700,7 +620,42 @@
verifyTextPresent
- Librarian, Lily Lou Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
+
+
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade 1991 -
+
+
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week (Newsletter) 1988 - 1990
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyElementPresent
+ link=USA1234567890
+
+
+
+ verifyElementPresent
+ css=#translatorOf-IAO_0000030-List > li > a[title="name"]
@@ -709,13 +664,13 @@
- verifyElementPresent
- link=Mozamia
+ verifyTextPresent
+ African Apes
- verifyElementPresent
- link=southern Africa
+ verifyTextPresent
+ African Primates
@@ -733,11 +688,6 @@
link=Smith, Joe
-
- verifyElementPresent
- link=SPCA, The
-
-
verifyTextPresent
I travel the world teaching apes how to communicate with humans.
@@ -745,7 +695,37 @@
verifyElementPresent
- link=Primate Experts
+ link=Variety of Apes in Africa
+
+
+
+ verifyTextPresent
+ Variety of Apes in Africa (Conference Poster) 1983
+
+
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primates of East Africa
+
+
+
+ verifyTextPresent
+ Primates of East Africa 1984 -
+
+
+
+ verifyElementPresent
+ link=JF Feeding
+
+
+
+ verifyElementPresent
+ link=JF Feeding Revised
@@ -755,7 +735,7 @@
verifyElementPresent
- link=Ape Trainer of the Decade
+ link=Primate Experts
@@ -763,26 +743,31 @@
link=Chimp Lover for Life
+
+ verifyElementPresent
+ link=Ape Trainer of the Decade
+
+
+
+ verifyTextPresent
+ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association
+
+
verifyTextPresent
Mrs. Jane E. Faculty, Jr.
-
- verifyTextPresent
- 607-299-9999
-
-
-
- verifyTextPresent
- 607-277-7777
-
-
verifyTextPresent
Jungle 1234
+
+ verifyTextPresent
+ Tree 99
+
+
verifyTextPresent
Congo City
@@ -815,17 +800,22 @@
verifyTextPresent
- USA
+ United States of America
verifyTextPresent
- 11111
+ 607-299-9999
verifyTextPresent
- 454545
+ 607-277-7777
+
+
+
+ verifyElementPresent
+ link=exact:http://orcid.org/file:///C:/xampp/11111
@@ -849,38 +839,18 @@
- verifyTextPresent
- 3333333
-
-
-
- verifyTextPresent
- 987654321
+ verifyElementPresent
+ link=3333333
verifyElementPresent
- link=USA1234567890
+ link=987654321
verifyTextPresent
- African Apes
-
-
-
- verifyTextPresent
- African Primates
-
-
-
- verifyElementPresent
- link=Primates Unite
-
-
-
- verifyElementPresent
- link=Humane Society of Africa
+ 976976976976
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
index 9054ec7c..8f4a0b9b 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
@@ -121,10 +121,15 @@
+
+ selectWindow
+ null
+
+
select
name=SuperclassURI
- label=Facility Member (vivo)
+ label=Faculty Member (vivo)
select
@@ -142,6 +147,16 @@
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
refreshAndWait
10000
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
index f935554b..18c6ec33 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/CreateLibrarian.html
@@ -256,6 +256,11 @@
No research content found.
+
+ pause
+ 5000
+
+
verifyElementPresent
link=Faculty, Jane
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
index 3fe84825..a5c687c7 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyImage.html
@@ -94,42 +94,12 @@
clickAndWait
- //img[@alt='delete']
+ css=img.delete-individual
- assertConfirmation
- Are you sure you want to delete this photo?
-
-
-
- waitForPageToLoad
- 5000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
+ assertTitle
+ Faculty, Jane
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
index ebea399e..aa054c4d 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
@@ -82,7 +82,7 @@
clickAndWait
- link=exact:vivo:Librarian
+ link=Librarian (vivo)
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
index 48fd09c6..66b1279c 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibrarianImage.html
@@ -77,43 +77,18 @@
clickAndWait
- link=Librarian, Lily
+ link=Librarian, Lily Lou
clickAndWait
- //img[@alt='delete']
+ css=img.delete-individual
- assertConfirmation
- Are you sure you want to delete this photo?
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
-
-
-
- refreshAndWait
- 10000
+ assertTitle
+ Librarian, Lily Lou
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
index 64787b83..3615d517 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestPeople.html
@@ -196,12 +196,12 @@
clickAndWait
- link=Librarian, Lily
+ link=Librarian, Lily Lou
assertTitle
- Librarian, Lily
+ Librarian, Lily Lou
@@ -278,7 +278,7 @@
verifyTextNotPresent
- Librarian, Lily
+ Librarian, Lily Lou
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
index 95b3fcb7..4f3248c8 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@@ -116,6 +116,11 @@
id=showAddFormButton
+
+ assertTitle
+ Edit
+
+
clickAndWait
link=Create your own concept
@@ -296,11 +301,6 @@
css=a.edit-geographicFocus > img.edit-individual
-
- assertTitle
- Faculty, Jane
-
-
assertTitle
Edit
@@ -336,6 +336,26 @@
Faculty, Jane
+
+ clickAndWait
+ css=a.delete-geographicFocus > img.delete-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
clickAndWait
css=a.edit-teachingOverview > img.edit-individual
@@ -598,12 +618,27 @@
clickAndWait
- css=a.edit-researcherId > img.edit-individual
+ css=a.edit-orcidId > img.edit-individual
assertTitle
- VIVO
+ Edit
+
+
+
+ type
+ id=orcidIdDisplay
+ file:///C:/xampp/11111
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
@@ -616,6 +651,16 @@
Edit
+
+ waitForElementPresent
+ tinymce
+
+
+
+ type
+ tinymce
+ 222222
+
clickAndWait
id=submit
@@ -631,6 +676,16 @@
css=a.edit-scopusId > img.edit-individual
+
+ waitForElementPresent
+ tinymce
+
+
+
+ type
+ tinymce
+ 3333333
+
assertTitle
Edit
@@ -651,26 +706,11 @@
css=a.edit-freetextKeyword > img.edit-individual
-
- assertTitle
- VIVO
-
-
-
- clickAndWait
- css=a.edit-freetextKeyword > img.edit-individual
-
-
assertTitle
Edit
-
- assertTitle
- Faculty, Jane
-
-
waitForElementPresent
tinymce
@@ -849,7 +889,7 @@
clickAndWait
- xpath=(//img[@alt='delete this entry'])[23]
+ xpath=(//img[@alt='delete this entry'])[13]
@@ -918,6 +958,11 @@
link=Primatia Africana
+
+ verifyElementPresent
+ link=Mozamia
+
+
verifyElementPresent
link=mejane@primates-r-us.com
@@ -945,7 +990,42 @@
verifyTextPresent
- Librarian, Lily Lou Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
+
+
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade 1991 -
+
+
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week (Newsletter) 1988 - 1990
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyElementPresent
+ link=USA1234567890
+
+
+
+ verifyElementPresent
+ css=#translatorOf-IAO_0000030-List > li > a[title="name"]
@@ -954,8 +1034,8 @@
- verifyElementPresent
- link=Mozamia
+ verifyTextPresent
+ African Apes
@@ -980,7 +1060,37 @@
verifyElementPresent
- link=Primates Unite
+ link=Variety of Apes in Africa
+
+
+
+ verifyTextPresent
+ Variety of Apes in Africa (Conference Poster) 1983
+
+
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primates of East Africa
+
+
+
+ verifyTextPresent
+ Primates of East Africa 1984 -
+
+
+
+ verifyElementPresent
+ link=JF Feeding
+
+
+
+ verifyElementPresent
+ link=JF Feeding Revised
@@ -988,6 +1098,11 @@
link=Licensed Primate Instructor
+
+ verifyElementPresent
+ link=Primate Experts
+
+
verifyElementPresent
link=Ape Trainer of the Decade
@@ -995,12 +1110,17 @@
verifyTextPresent
- Mrs. Jane E. Faculty, Jr.
+ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association
+
+
+
+ verifyElementPresent
+ link=Professional Ape Trainer Association
verifyTextPresent
- 607-277-7777
+ Mrs. Jane E. Faculty, Jr.
@@ -1035,12 +1155,7 @@
verifyTextPresent
- Mrs.
-
-
-
- verifyTextPresent
- Jr.
+ 607-277-7777
@@ -1063,19 +1178,9 @@
link=3333333
-
- verifyElementPresent
- link=USA1234567890
-
-
verifyTextPresent
- African Apes
-
-
-
- verifyElementPresent
- link=Primate Experts
+ 976976976976
diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
index df684590..e4175003 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html
@@ -103,7 +103,7 @@
verifyTextPresent
- I am named after Jane in the Tarzan stories. Yes, my last name really is faculty.
+ I am named after Jane in the Tarzan stories. Yes, my last name really is faculty.
@@ -116,6 +116,16 @@
link=Primatia Africana
+
+ verifyElementPresent
+ link=Mozamia
+
+
+
+ verifyElementPresent
+ link=southern Africa
+
+
verifyElementPresent
link=mejane@primates-r-us.com
@@ -133,17 +143,12 @@
verifyTextPresent
- 607-266-6666
+ 607-266-6666
verifyTextPresent
- 607-288-8888
-
-
-
- verifyElementPresent
- link=CIT Homepage
+ 607-288-8888
@@ -151,6 +156,11 @@
link=CUL Homepage
+
+ verifyElementPresent
+ link=CIT Homepage
+
+
verifyElementPresent
link=Librarian, Lily Lou
@@ -158,7 +168,42 @@
verifyTextPresent
- Librarian, Lily Lou Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
+
+
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade 1991 -
+
+
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week (Newsletter) 1988 - 1990
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyElementPresent
+ link=USA1234567890
+
+
+
+ verifyElementPresent
+ css=#translatorOf-IAO_0000030-List > li > a[title="name"]
@@ -167,13 +212,13 @@
- verifyElementPresent
- link=Mozamia
+ verifyTextPresent
+ African Apes
- verifyElementPresent
- link=southern Africa
+ verifyTextPresent
+ African Primates
@@ -191,11 +236,6 @@
link=Smith, Joe
-
- verifyElementPresent
- link=SPCA, The
-
-
verifyTextPresent
I travel the world teaching apes how to communicate with humans.
@@ -203,7 +243,37 @@
verifyElementPresent
- link=Primate Experts
+ link=Variety of Apes in Africa
+
+
+
+ verifyTextPresent
+ Variety of Apes in Africa (Conference Poster) 1983
+
+
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primates of East Africa
+
+
+
+ verifyTextPresent
+ Primates of East Africa 1984 -
+
+
+
+ verifyElementPresent
+ link=JF Feeding
+
+
+
+ verifyElementPresent
+ link=JF Feeding Revised
@@ -213,7 +283,7 @@
verifyElementPresent
- link=Monkey Trainer of the Year
+ link=Primate Experts
@@ -226,26 +296,26 @@
link=Ape Trainer of the Decade
+
+ verifyTextPresent
+ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association
+
+
verifyTextPresent
Mrs. Jane E. Faculty, Jr.
-
- verifyTextPresent
- 607-299-9999
-
-
-
- verifyTextPresent
- 607-277-7777
-
-
verifyTextPresent
Jungle 1234
+
+ verifyTextPresent
+ Tree 99
+
+
verifyTextPresent
Congo City
@@ -283,72 +353,52 @@
verifyTextPresent
- 11111
+ 607-299-9999
verifyTextPresent
- 454545
+ 607-277-7777
+
+
+
+ verifyElementNotPresent
+ link=exact:http://orcid.org/file:///C:/xampp/11111
verifyTextPresent
- ABC121212
+ ABC121212
verifyTextPresent
- ABC123987
+ ABC123987
- verifyTextPresent
+ verifyTextNotPresent
222222
- verifyTextPresent
+ verifyTextNotPresent
67676767
- verifyTextPresent
- 3333333
+ verifyElementNotPresent
+ link=3333333
+
+
+
+ verifyElementNotPresent
+ link=987654321
verifyTextPresent
- 987654321
-
-
-
- verifyElementPresent
- link=USA1234567890
-
-
-
- verifyTextPresent
- African Apes
-
-
-
- verifyTextPresent
- African Primates
-
-
-
- verifyElementPresent
- link=Humane Society of Africa
-
-
-
- verifyElementPresent
- link=Primates Foundation of America
-
-
-
- verifyElementPresent
- link=Primates Unite
+ 976976976976
diff --git a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html b/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
index fb7053de..97768017 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html
@@ -355,7 +355,7 @@
clickAndWait
- link=exact:vivo:hasCollaborator
+ link=vivo:hasCollaborator
@@ -414,6 +414,21 @@
link=Booth, Susie
+
+ selectWindow
+ null
+
+
+
+ clickAndWait
+ id=verbosePropertySwitch
+
+
+
+ assertTitle
+ Booth, Susie
+
+
assertTitle
Booth, Susie
@@ -437,7 +452,17 @@
clickAndWait
- link=exact:vivo:hasCollaborator
+ id=verbosePropertySwitch
+
+
+
+ assertTitle
+ Booth, Susie
+
+
+
+ clickAndWait
+ link=vivo:hasCollaborator
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
index 343270aa..fdfb5bb3 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
@@ -55,6 +55,11 @@
link=people
+
+ verifyElementPresent
+ link=events
+
+
verifyElementPresent
link=organizations
@@ -65,6 +70,26 @@
link=research
+
+ verifyElementPresent
+ link=Ape Week
+
+
+
+ verifyTextPresent
+ Ape Week Newsletter
+
+
+
+ verifyElementPresent
+ link=Apes on Parade
+
+
+
+ verifyTextPresent
+ Apes on Parade Performance
+
+
verifyElementPresent
link=Ape Trainer of the Decade
@@ -72,17 +97,27 @@
verifyTextPresent
- Ape Trainer of the Decade Organization
+ Ape Trainer of the Decade Award or Honor
verifyElementPresent
- link=Monkey Trainer of the Year
+ link=Variety of Apes in Africa
verifyTextPresent
- Monkey Trainer of the Year Award or Honor
+ Variety of Apes in Africa Conference Poster
+
+
+
+ verifyElementPresent
+ link=Professional Ape Trainer Association
+
+
+
+ verifyTextPresent
+ Professional Ape Trainer Association Organization
@@ -118,7 +153,7 @@
verifyElementPresent
- link=activities
+ link=events
@@ -136,6 +171,21 @@
Primate Experts License
+
+ verifyElementPresent
+ link=Primate Feeding
+
+
+
+ verifyElementPresent
+ link=Primate Reactions
+
+
+
+ verifyTextPresent
+ Primate Reactions Case Study
+
+
verifyElementPresent
link=African Primates
@@ -153,7 +203,7 @@
verifyTextPresent
- Licensed Primate Expert Licensure
+ Licensed Primate Expert License
@@ -163,7 +213,7 @@
verifyTextPresent
- Licensed Primate Instructor Licensure
+ Licensed Primate Instructor License
@@ -173,27 +223,17 @@
verifyTextPresent
- Primate Expert Association Certificate
+ Primate Expert Association Credential
verifyElementPresent
- link=Primate Foundation of Africa
+ link=Primates of East Africa
verifyTextPresent
- Primate Foundation of Africa Concept
-
-
-
- verifyElementPresent
- link=Primate Foundation of Africa
-
-
-
- verifyTextPresent
- Primates-R-Us Fellowship Concept
+ Primates of East Africa Exhibit
@@ -201,6 +241,11 @@
link=Primates-R-Us Fellowship
+
+ verifyTextPresent
+ Primates-R-Us Fellowship Concept
+
+
verifyElementPresent
link=Faculty, Jane
@@ -227,11 +272,6 @@
chimp - VIVO Search Results
-
- verifyElementPresent
- link=people
-
-
verifyElementPresent
link=research
@@ -247,16 +287,6 @@
Chimp Lover for Life Award or Honor
-
- verifyElementPresent
- link=Faculty, Jane
-
-
-
- verifyTextPresent
- Faculty, Jane Assistant Professor
-
-
type
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
index 09757b87..73034dcf 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/SearchPeople.html
@@ -132,12 +132,12 @@
verifyElementPresent
- link=Librarian, Lily
+ link=Librarian, Lily Lou
verifyTextPresent
- Librarian, Lily Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
@@ -163,12 +163,12 @@
verifyElementPresent
- link=Librarian, Lily
+ link=Librarian, Lily Lou
verifyTextPresent
- Librarian, Lily Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
@@ -194,12 +194,12 @@
verifyElementPresent
- link=Librarian, Lily
+ link=Librarian, Lily Lou
verifyTextPresent
- Librarian, Lily Assistant Librarian
+ Librarian, Lily Lou Assistant Librarian
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
index c71d9438..1708bbcf 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
@@ -182,7 +182,7 @@
assertTitle
- Crop Photo for Germany
+ Crop image for Germany
@@ -218,7 +218,7 @@
assertTitle
- Crop Photo for Germany
+ Crop image for Germany
@@ -242,9 +242,14 @@
/vivo/file/*/thumbnail_germany1.jpg
+
+ assertTitle
+ Germany
+
+
clickAndWait
- //img[@alt='edit']
+ css=img.edit-individual
@@ -296,7 +301,7 @@
clickAndWait
- //img[@alt='edit']
+ css=img.edit-individual
@@ -316,7 +321,7 @@
assertTitle
- Crop Photo for Germany
+ Crop image for Germany
@@ -342,7 +347,7 @@
clickAndWait
- //img[@alt='edit']
+ css=img.edit-individual
@@ -362,7 +367,7 @@
assertTitle
- Crop Photo for Germany
+ Crop image for Germany
@@ -389,17 +394,7 @@
clickAndWait
- //img[@alt='delete']
-
-
-
- assertConfirmation
- Are you sure you want to delete this photo?
-
-
-
- waitForPageToLoad
- 5000
+ css=img.delete-individual
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
index d32df4c1..a61fb1b3 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html
@@ -106,6 +106,11 @@
+
+ click
+ //div[@id='wrapper-content']/ul/li[18]
+
+
verifyTextPresent
architectural details
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
index f312f9f7..289fba30 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html
@@ -91,11 +91,6 @@
//div[@id='wrapper-content']/ul/li[8]
-
- selectWindow
- null
-
-
clickAndWait
xpath=(//img[@alt='add'])[24]
@@ -159,7 +154,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[24]
+ xpath=(//img[@alt='add'])[28]
@@ -280,7 +275,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[24]
+ xpath=(//img[@alt='add'])[28]
@@ -362,7 +357,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[24]
+ xpath=(//img[@alt='add'])[28]
diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
index a72aba11..290b265b 100644
--- a/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
+++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/ChangeAdvises.html
@@ -211,7 +211,7 @@
clickAndWait
- xpath=(//img[@alt='edit this entry'])[3]
+ xpath=(//img[@alt='edit this entry'])[4]
@@ -293,7 +293,7 @@
clickAndWait
- xpath=(//img[@alt='edit this entry'])[4]
+ xpath=(//img[@alt='edit this entry'])[5]
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
index ab30a9b1..dc11e549 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
@@ -91,9 +91,14 @@
//div[@id='wrapper-content']/ul/li[12]
+
+ assertTitle
+ Edit
+
+
clickAndWait
- xpath=(//img[@alt='add'])[34]
+ xpath=(//img[@alt='add'])[40]
@@ -120,7 +125,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[34]
+ xpath=(//img[@alt='add'])[40]
@@ -198,7 +203,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[34]
+ xpath=(//img[@alt='add'])[40]
@@ -280,7 +285,7 @@
clickAndWait
- xpath=(//img[@alt='add'])[34]
+ xpath=(//img[@alt='add'])[40]
@@ -407,7 +412,7 @@
click
- //div[@id='wrapper-content']/ul/li[6]
+ css=li.nonSelectedGroupTab.clickable
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
index 8b87c169..48af6488 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
@@ -88,7 +88,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[12]
@@ -211,7 +211,7 @@
clickAndWait
- xpath=(//img[@alt='edit this entry'])[3]
+ xpath=(//img[@alt='edit this entry'])[4]
diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
index 1ed87cfa..c37aa286 100644
--- a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
+++ b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html
@@ -86,11 +86,6 @@
-
- click
- //div[@id='wrapper-content']/ul/li[20]
-
-
clickAndWait
css=a.delete-relatedBy > img.delete-individual
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
index de31c06d..8b306e15 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
@@ -104,7 +104,7 @@
clickAndWait
- xpath=(//img[@alt='edit this entry'])[4]
+ xpath=(//img[@alt='edit this entry'])[5]
@@ -184,14 +184,9 @@
-
- assertTitle
- Faculty, Jane
-
-
clickAndWait
- xpath=(//img[@alt='edit this entry'])[3]
+ //ul[@id='RO_0000056-EducationalProcess-List']/li[2]/a[2]
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
index a938974d..7ed32182 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html
@@ -127,16 +127,6 @@
link=University of Wisconsin
-
- verifyTextPresent
- United States of America Country
-
-
-
- verifyElementPresent
- link=United States of America
-
-
clickAndWait
link=Home
diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
index 370496bd..a78d0b39 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
@@ -303,12 +303,12 @@
verifyTextPresent
- Version rel-1.6-rc2
+ Version rel-1.6-rc3
verifyElementPresent
- link=rel-1.6-rc2
+ link=rel-1.6-rc3
@@ -532,7 +532,7 @@
verifyTextPresent
- Version rel-1.6-rc2
+ Version rel-1.6-rc3
@@ -639,12 +639,12 @@
verifyTextPresent
- Version rel-1.6-rc2
+ Version rel-1.6-rc3
verifyElementPresent
- link=rel-1.6-rc2
+ link=rel-1.6-rc3
diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
index 032f4c70..36704180 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
@@ -873,6 +873,11 @@
link=Africa
+
+ verifyElementPresent
+ link=Antarctica
+
+
verifyElementPresent
link=Asia
@@ -893,11 +898,6 @@
link=North America
-
- verifyElementPresent
- link=Oceania
-
-
verifyElementPresent
link=South America
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html b/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html
new file mode 100644
index 00000000..8592226c
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/AddRDFData.html
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Add/Remove RDF data
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ type
+ name=rdfStream
+ C:\VIVO\vivo\utilities\acceptance-tests\suites\LanguageSupport\Test-utf8
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html b/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html
new file mode 100644
index 00000000..e05235b5
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/CheckEnglishOverview.html
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ clickAndWait
+ link=Faculty Member
+
+
+
+ assertTitle
+ Faculty Member
+
+
+
+ clickAndWait
+ link=Faculty, Jane
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ verifyTextPresent
+ I am a ladybug expert.
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html b/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html
new file mode 100644
index 00000000..653772ba
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/CheckGermanOverview.html
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ clickAndWait
+ link=Faculty Member
+
+
+
+ assertTitle
+ Faculty Member
+
+
+
+ clickAndWait
+ link=Faculty, Jane
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ verifyTextPresent
+ Ich bin ein Marienkäfer-Experte.
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html
new file mode 100644
index 00000000..938071b6
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/DeleteTestFacultyMember.html
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ clickAndWait
+ link=Faculty Member
+
+
+
+ assertTitle
+ Faculty Member
+
+
+
+ clickAndWait
+ link=Faculty, Jane
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ link=Edit this individual
+
+
+
+
+ clickAndWait
+ //input[@value="Edit This Individual"]
+
+
+
+ assertTitle
+ Individual Editing Form
+
+
+
+ clickAndWait
+ _delete
+
+
+
+ assertConfirmation
+ Are you SURE you want to delete this individual? If in doubt, CANCEL.
+
+
+
+ waitForPageToLoad
+ 5000
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Rebuild search index
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ clickAndWait
+ name=rebuild
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ waitForTextPresent
+ Reset the search index and re-populate it.
+
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ verifyTextNotPresent
+ Faculty Member
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html
new file mode 100644
index 00000000..65a1371d
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/RebuildSearchIndex.html
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+RebuildSearchIndex
+
+
+
+
+RebuildSearchIndex
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 100000000000
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+ type
+ id=loginName
+ testAdmin@cornell.edu
+
+
+ type
+ id=loginPassword
+ Password
+
+
+ clickAndWait
+ name=loginForm
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Rebuild search index
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ clickAndWait
+ name=rebuild
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ waitForTextPresent
+ Reset the search index and re-populate it.
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html b/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html
new file mode 100644
index 00000000..fbca24d5
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/RemoveRDFData.html
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Add/Remove RDF data
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ type
+ name=rdfStream
+ C:\VIVO\vivo\utilities\acceptance-tests\suites\LanguageSupport\Test-utf8
+
+
+ click
+ xpath=(//input[@name='mode'])[3]
+
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/LanguageSupport/Suite.html b/utilities/acceptance-tests/suites/LanguageSupport/Suite.html
new file mode 100644
index 00000000..5abb4877
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LanguageSupport/Suite.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html b/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html
new file mode 100644
index 00000000..f3120ee1
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/AddRDFData.html
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Add/Remove RDF data
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ type
+ name=rdfStream
+ C:\VIVO\vivo\utilities\acceptance-tests\suites\MultiLabels\TestMultipleLabels.txt
+
+
+ select
+ name=language
+ label=N3
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html b/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html
new file mode 100644
index 00000000..6f092517
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/AddTestFaculty.html
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+AddTestFaculty
+
+
+
+
+AddTestFaculty
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+
+ select
+ VClassURI
+ label=Faculty Member (vivo)
+
+
+ clickAndWait
+ //input[@value='Add individual of this class']
+
+
+
+ assertTitle
+ Edit
+
+
+
+
+ type
+ firstName
+ Frank
+
+
+ type
+ lastName
+ Furter
+
+
+ clickAndWait
+ submit
+
+
+
+ assertTitle
+ Furter, Frank
+
+
+
+
+ pause 10000
+
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html
new file mode 100644
index 00000000..059952ba
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/DeleteTestFaculty.html
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+DeleteTestFaculty
+
+
+
+
+DeleteTestFaculty
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 100000
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+
+ verifyTextPresent
+ people
+
+
+
+ verifyTextPresent
+ Faculty Member
+
+
+
+ verifyTextPresent
+ Person
+
+
+
+
+ clickAndWait
+ link=Faculty Member
+
+
+
+ assertTitle
+ Faculty Member
+
+
+
+ clickAndWait
+ link=Furter, Frank
+
+
+
+ assertTitle
+ Furter, Frank
+
+
+
+ clickAndWait
+ link=Edit this individual
+
+
+
+ assertTitle
+ Individual Control Panel
+
+
+
+
+ clickAndWait
+ //input[@value="Edit This Individual"]
+
+
+
+ assertTitle
+ Individual Editing Form
+
+
+
+ click
+ _delete
+
+
+
+ assertConfirmation
+ Are you SURE you want to delete this individual? If in doubt, CANCEL.
+
+
+
+ waitForPageToLoad
+ 5000
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html b/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
new file mode 100644
index 00000000..86d59d2f
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+AddTestFaculty
+
+
+
+
+AddTestFaculty
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Furter, Frank
+
+
+
+ assertTitle
+ Furter, Frank
+
+
+
+ verifyElementPresent
+ css=a.add-label > img.add-individual
+
+
+
+
+ clickAndWait
+ css=a.add-label > img.add-individual
+
+
+
+ assertTitle
+ Edit
+
+
+
+ verifyTextPresent
+ Manage Labels for Furter, Frank
+
+
+
+ verifyTextPresent
+ Furter, Frank Edit Remove
+
+
+
+ verifyTextPresent
+ Test Label 1 Edit Remove
+
+
+
+ verifyTextPresent
+ Test Label 2 Edit Remove
+
+
+
+ verifyElementPresent
+ link=Edit
+
+
+
+ verifyElementPresent
+ link=Remove
+
+
+
+ verifyElementPresent
+ css=#showCancelOnly > a.cancel
+
+
+
+
+ click
+ link=Remove
+
+
+
+ click
+ link=Remove
+
+
+
+ verifyTextNotPresent
+ Furter, Frank Edit Remove
+
+
+
+ verifyTextNotPresent
+ Test Label 1 Edit Remove
+
+
+
+ verifyTextPresent
+ Test Label 2 Edit Remove
+
+
+
+
+ clickAndWait
+ css=#showCancelOnly > a.cancel
+
+
+
+ assertTitle
+ Test Label 2
+
+
+
+ verifyTextPresent
+ Test Label 2
+
+
+
+ verifyTextNotPresent
+ Furter, Frank
+
+
+
+ verifyTextNotPresent
+ Test Label 1
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html
new file mode 100644
index 00000000..65a1371d
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/RebuildSearchIndex.html
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+RebuildSearchIndex
+
+
+
+
+RebuildSearchIndex
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 100000000000
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+ type
+ id=loginName
+ testAdmin@cornell.edu
+
+
+ type
+ id=loginPassword
+ Password
+
+
+ clickAndWait
+ name=loginForm
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Rebuild search index
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ clickAndWait
+ name=rebuild
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ waitForTextPresent
+ Reset the search index and re-populate it.
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html b/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html
new file mode 100644
index 00000000..fe0f512f
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/RemoveRDFData.html
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Add/Remove RDF data
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ type
+ name=rdfStream
+ C:\VIVO\vivo\utilities\acceptance-tests\suites\MultiLabels\TestMultipleLabels.txt
+
+
+ click
+ xpath=(//input[@name='mode'])[3]
+
+
+
+ select
+ name=language
+ label=N3
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Ingest RDF Data
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/MultiLabels/Suite.html b/utilities/acceptance-tests/suites/MultiLabels/Suite.html
new file mode 100644
index 00000000..2ff061a9
--- /dev/null
+++ b/utilities/acceptance-tests/suites/MultiLabels/Suite.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
index eba90b20..fbe9731e 100644
--- a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
+++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
@@ -87,33 +87,23 @@
- click
- //div[@id='wrapper-content']/ul/li[20]
+ verifyElementPresent
+ link=Websites
- verifyTextPresent
- OpenSocial
+ verifyElementPresent
+ link=Hello RDF!
- verifyTextPresent
- Websites
+ verifyElementPresent
+ link=Tweets
- verifyTextPresent
- Hello RDF!
-
-
-
- verifyTextPresent
- Tweets
-
-
-
- verifyTextPresent
- Featured Presentations
+ verifyElementPresent
+ link=Featured Presentations
diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat b/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
index 1c234e76..25f87531 100644
--- a/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
+++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/setenv.bat
@@ -1,2 +1,3 @@
set CLASSPATH=c:/VIVO/data/shindig/conf
-set CATALINA_OPTS= -Dshindig.host=localhost -Dshindig.port=8080
\ No newline at end of file
+set CATALINA_OPTS= -Dshindig.host=localhost -Dshindig.port=8080
+set CATALINA_OPTS= -Xms512m -Xmx512m -XX:MaxPermSize=128m
\ No newline at end of file
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
index c4f04349..cb9eaa36 100644
--- a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewFacultyMember.html
@@ -106,14 +106,9 @@
-
- selectWindow
- null
-
-
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[18]
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
index 8e25d808..73d12433 100644
--- a/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/CreateNewSelfEditorUser.html
@@ -118,7 +118,12 @@
type
id=associateProfileName
- Faculty, Jane
+ facult
+
+
+ click
+ id=ui-active-menuitem
+
click
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
index 01090412..cc48a5cc 100644
--- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteAdminProxy.html
@@ -203,6 +203,11 @@
link=My profile
+
+ pause
+ 5000
+
+
clickAndWait
link=Faculty, Jane
@@ -294,6 +299,11 @@
link=My profile
+
+ pause
+ 5000
+
+
clickAndWait
link=Faculty, Jane
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
index 768a8c9d..ad56fa27 100644
--- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteUserProxy.html
@@ -147,13 +147,8 @@
- clickAndWait
- link=Faculty Member
-
-
-
- assertTitle
- Faculty Member
+ pause
+ 5000
diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
index 44b613e8..ade7b584 100644
--- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
+++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html
@@ -413,6 +413,11 @@
VIVO
+
+ pause
+ 5000
+
+
clickAndWait
link=Faculty, Jane
diff --git a/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html b/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
index 9f396f62..d21e77a0 100644
--- a/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
+++ b/utilities/acceptance-tests/suites/SearchBoost/CreateTestPeople.html
@@ -187,6 +187,12 @@
Foxtrot, Echo
+
+
+ pause
+ 10000
+
+
clickAndWait
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html
new file mode 100644
index 00000000..8436282e
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/CreateTestFacultyMember.html
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+CreateTestFacultyMember
+
+
+
+
+CreateTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ verifyTextPresent
+ Data Input
+
+
+
+ select
+ VClassURI
+ label=Faculty Member (vivo)
+
+
+ clickAndWait
+ //input[@value='Add individual of this class']
+
+
+
+ assertTitle
+ Edit
+
+
+
+
+ type
+ firstName
+ Jane
+
+
+ type
+ lastName
+ Faculty
+
+
+ clickAndWait
+ submit
+
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ assertTextPresent
+ Faculty Member
+
+
+
+ selectWindow
+ null
+
+
+
+ clickAndWait
+ css=header > #ARG_2000028 > a.add-ARG_2000028
+
+
+
+ assertTitle
+ Edit
+
+
+
+ type
+ id=preferredTitle
+ Assistant Professor
+
+
+ clickAndWait
+ id=submit
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ assertTextPresent
+ Assistant Professor
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html
new file mode 100644
index 00000000..938071b6
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/DeleteTestFacultyMember.html
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+
+DeleteTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ clickAndWait
+ link=Faculty Member
+
+
+
+ assertTitle
+ Faculty Member
+
+
+
+ clickAndWait
+ link=Faculty, Jane
+
+
+
+ assertTitle
+ Faculty, Jane
+
+
+
+ clickAndWait
+ link=Edit this individual
+
+
+
+
+ clickAndWait
+ //input[@value="Edit This Individual"]
+
+
+
+ assertTitle
+ Individual Editing Form
+
+
+
+ clickAndWait
+ _delete
+
+
+
+ assertConfirmation
+ Are you SURE you want to delete this individual? If in doubt, CANCEL.
+
+
+
+ waitForPageToLoad
+ 5000
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Rebuild search index
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ clickAndWait
+ name=rebuild
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ waitForTextPresent
+ Reset the search index and re-populate it.
+
+
+
+
+ clickAndWait
+ link=Index
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ refreshAndWait
+ 10000
+
+
+
+ verifyTextNotPresent
+ Faculty Member
+
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html
new file mode 100644
index 00000000..65a1371d
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/RebuildSearchIndex.html
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+RebuildSearchIndex
+
+
+
+
+RebuildSearchIndex
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 100000000000
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Log in
+
+
+
+ assertTitle
+ Log in to VIVO
+
+
+
+ type
+ id=loginName
+ testAdmin@cornell.edu
+
+
+ type
+ id=loginPassword
+ Password
+
+
+ clickAndWait
+ name=loginForm
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=Rebuild search index
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ clickAndWait
+ name=rebuild
+
+
+
+ assertTitle
+ Rebuild Search Index
+
+
+
+ waitForTextPresent
+ Reset the search index and re-populate it.
+
+
+
+ clickAndWait
+ link=Log out
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html b/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html
new file mode 100644
index 00000000..21cdba4c
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/SearchFound.html
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+SearchPositions
+
+
+
+
+SearchPositions
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ type
+ querytext
+ faculty
+
+
+ clickAndWait
+ //input[@value='Search']
+
+
+
+ assertTitle
+ faculty - VIVO Search Results
+
+
+
+ verifyTextPresent
+ Search results for 'faculty'
+
+
+
+ verifyElementPresent
+ link=people
+
+
+
+ verifyTextPresent
+ Faculty, Jane Assistant Professor
+
+
+
+ verifyElementPresent
+ link=Faculty, Jane
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html b/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html
new file mode 100644
index 00000000..67a72aa5
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/SearchNotFound.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+SearchPositions
+
+
+
+
+SearchPositions
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ open
+ /vivo/
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ type
+ querytext
+ faculty
+
+
+ clickAndWait
+ //input[@value='Search']
+
+
+
+ assertTitle
+ Search for 'faculty'
+
+
+
+ verifyTextPresent
+ Search for 'faculty'
+
+
+
+ verifyTextPresent
+ No matching results.
+
+
+
+ verifyElementNotPresent
+ link=people
+
+
+
+ verifyTextNotPresent
+ Faculty, Jane Assistant Professor
+
+
+
+ verifyElementNotPresent
+ link=Faculty, Jane
+
+
+
+ clickAndWait
+ link=Home
+
+
+
+ assertTitle
+ VIVO
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SearchExclusion/Suite.html b/utilities/acceptance-tests/suites/SearchExclusion/Suite.html
new file mode 100644
index 00000000..22d36e09
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SearchExclusion/Suite.html
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
index 8483ccc1..85c6d68c 100644
--- a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
+++ b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html
@@ -121,9 +121,14 @@
Faculty, Jane
+
+ selectWindow
+ null
+
+
click
- //div[@id='wrapper-content']/ul/li[20]
+ //div[@id='wrapper-content']/ul/li[18]
@@ -131,6 +136,82 @@
JaneFaculty@cornell.edu
+
+
+ clickAndWait
+ link=Log out
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ type
+ loginName
+ testAdmin@cornell.edu
+
+
+ type
+ loginPassword
+ Password
+
+
+ clickAndWait
+ loginForm
+
+
+
+ clickAndWait
+ link=Site Admin
+
+
+
+ assertTitle
+ VIVO Site Administration
+
+
+
+ clickAndWait
+ link=User accounts
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ clickAndWait
+ link=JaneFaculty@cornell.edu
+
+
+
+ assertTitle
+ VIVO
+
+
+
+ type
+ id=associateProfileName
+ Facult
+
+
+ click
+ id=ui-active-menuitem
+
+
+
+ clickAndWait
+ id=submitMyAccount
+
+
+
+ assertTitle
+ VIVO
+
+
clickAndWait
diff --git a/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html b/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
index ada75c77..fb6f5ea5 100644
--- a/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
+++ b/utilities/acceptance-tests/suites/SelfEditing/CheckSelfEditorPrivileges.html
@@ -43,102 +43,6 @@
Log in to VIVO
-
-
- type
- loginName
- testAdmin@cornell.edu
-
-
- type
- loginPassword
- Password
-
-
- clickAndWait
- loginForm
-
-
-
- clickAndWait
- link=Site Admin
-
-
-
- assertTitle
- VIVO Site Administration
-
-
-
- clickAndWait
- link=User accounts
-
-
-
- assertTitle
- VIVO
-
-
-
- type
- id=externalAuthId
- JaneFaculty@cornell.edu
-
-
- type
- id=associateProfileName
- fac
-
-
- click
- id=ui-active-menuitem
-
-
-
- click
- id=verifyProfileLink
-
-
-
- waitForPopUp
- verifyMatchWindow
- 30000
-
-
- clickAndWait
- id=submitMyAccount
-
-
-
- assertTitle
- VIVO
-
-
-
- verifyTextPresent
- The account for Jane Faculty has been updated.
-
-
-
- clickAndWait
- link=Log out
-
-
-
- assertTitle
- VIVO
-
-
-
- clickAndWait
- link=Log in
-
-
-
- assertTitle
- Log in to VIVO
-
-
type
@@ -171,6 +75,11 @@
link=Site Admin
+
+ click
+ //div[@id='wrapper-content']/ul/li[18]
+
+
clickAndWait
css=a.add-overview > img.add-individual
diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
index 38fae457..b77f786a 100644
--- a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
+++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html
@@ -130,6 +130,16 @@
Henry, George
+
+ verifyTextNotPresent
+ Jenkins, Iris
+
+
+
+ verifyElementNotPresent
+ link=Jenkins, Iris
+
+
clickAndWait
@@ -222,6 +232,11 @@
link=Faculty Member (4)
+
+ pause
+ 5000
+
+
verifyElementPresent
link=Baker, Able
@@ -267,6 +282,11 @@
link=Jenkins, Iris
+
+ verifyTextNotPresent
+ Jenkins, Iris
+
+
clickAndWait
@@ -328,6 +348,11 @@
link=Jenkins, Iris
+
+ verifyTextPresent
+ Jenkins, Iris
+
+
type
diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
index 2a9c9612..7b351b6d 100644
--- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
+++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
@@ -105,11 +105,6 @@
Baker, Able
-
- selectWindow
- null
-
-
clickAndWait
css=header > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual
@@ -178,12 +173,12 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ css=li.nonSelectedGroupTab.clickable
clickAndWait
- xpath=(//img[@alt='add'])[9]
+ css=a.add-RO_0000053 > img.add-individual
@@ -265,7 +260,7 @@
click
- //div[@id='wrapper-content']/ul/li[20]
+ css=li.nonSelectedGroupTab.clickable
diff --git a/utilities/acceptance-tests/suites/ShortViews/Suite.html b/utilities/acceptance-tests/suites/ShortViews/Suite.html
index 784003ff..4c825517 100644
--- a/utilities/acceptance-tests/suites/ShortViews/Suite.html
+++ b/utilities/acceptance-tests/suites/ShortViews/Suite.html
@@ -1,19 +1,19 @@
-
-
-
-
-
- Test Suite
-
-
-
-
-
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3 b/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
deleted file mode 100644
index dc389c21..00000000
--- a/utilities/acceptance-tests/suites/SparqlUpdateApi/EnableSparqlUpdateApi.n3
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix rdfs: .
-@prefix auth: .
-@prefix simplePermission: .
-@prefix displayByRole: .
-@prefix editByRole: .
-
-auth:ADMIN
- auth:hasPermission simplePermission:UseSparqlUpdateApi ;
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html
new file mode 100644
index 00000000..5b5c488b
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/Suite.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+ Test Suite
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html
new file mode 100644
index 00000000..78b3af1a
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiDisabled.html
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+CreateTestFacultyMember
+
+
+
+
+CreateTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ css=input[type="submit"]
+
+
+
+ verifyTextPresent
+ 403 Account is not authorized
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
new file mode 100644
index 00000000..760e6026
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+CreateTestFacultyMember
+
+
+
+
+CreateTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='GET method not allowed']
+
+
+
+ assertTitle
+ Apache Tomcat/7.0.42 - Error report
+
+
+
+ verifyTextPresent
+ HTTP Status 405 - HTTP method GET is not supported by this URL
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='Email and password missing']
+
+
+
+ verifyTextPresent
+ 403 email/password combination is not valid
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='No such user']
+
+
+
+ verifyTextPresent
+ 403 email/password combination is not valid
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='Wrong password']
+
+
+
+ verifyTextPresent
+ 403 email/password combination is not valid
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='Account not authorized']
+
+
+
+ verifyTextPresent
+ 403 Account is not authorized
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='SPARQL is invalid']
+
+
+
+ verifyTextPresent
+ 400 Failed to parse SPARQL update
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value="SPARQL doesn't specify a GRAPH"]
+
+
+
+ verifyTextPresent
+ 400 SPARQL update must specify a GRAPH URI.
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
new file mode 100644
index 00000000..0b0110f3
--- /dev/null
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+CreateTestFacultyMember
+
+
+
+
+CreateTestFacultyMember
+
+
+
+ deleteAllVisibleCookies
+
+
+
+
+ setTimeout
+ 10000000
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ css=input[type="submit"]
+
+
+
+ verifyTextPresent
+ 200 SPARQL update accepted.
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ link=Get RDF
+
+
+
+
+ pause
+ 10000
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ //input[@value='Successful DELETE']
+
+
+
+ verifyTextPresent
+ 200 SPARQL update accepted.
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+ clickAndWait
+ link=Get RDF
+
+
+
+ assertTitle
+ Individual Not Found
+
+
+
+ verifyTextPresent
+ Individual not found:
+
+
+
+ verifyTextPresent
+ This id is the id of the entity to query for. netid also works.
+
+
+
+ open
+ /vivo/TestSparqlApi.html
+
+
+
+
+
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html
deleted file mode 100644
index dfef47ac..00000000
--- a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestSparqlApi.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-Test the SPARQL API
-
-
-
-
- Get RDF
-
-
-
-
-DELETE DATA {
- GRAPH {
-
-
- "Fundamentals of Compiler Design" .
- }
-}
-
-
-
-
-
-
-
-
-
-
-INSERT DATA {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-INSERT DATA {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-
-
-
-INSERT DATA {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-
-
-
-INSERT DATA {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-
-
-
-INSERT DATA {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-INSERT DATA } {
- GRAPH {
- }
-}
-
-
-
-
-
-
-
-
-
-
-INSERT DATA {
-
-
- "Fundamentals of Compiler Design" .
-}
-
-
-
-
-
-
-200 Success
-400 Failed to parse SPARQL update
-400 SPARQL update must specify a GRAPH URI.
-403 username/password combination is not valid
-403 Account is not authorized
-405 Method not allowed
-500 Unknown error
-
-