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/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/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/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/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
-
-