diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html index 73e96171..d065e8ae 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html @@ -79,11 +79,6 @@ people - - verifyTextPresent - courses - - verifyTextPresent activities @@ -91,7 +86,7 @@ verifyTextPresent - topics + courses @@ -111,7 +106,7 @@ verifyTextPresent - publications + research @@ -141,22 +136,7 @@ verifyTextPresent - Course (1) - - - - verifyTextPresent - Semester Class (1) - - - - verifyTextPresent - Agreement (2) - - - - verifyTextPresent - Grant (2) + Agreement (3) @@ -166,12 +146,12 @@ verifyTextPresent - Subject Area (4) + Course (1) verifyTextPresent - Academic Term (2) + Academic Term (1) @@ -219,6 +199,16 @@ Equipment (2) + + verifyTextPresent + Grant (3) + + + + verifyTextPresent + Subject Area (4) + + verifyTextPresent Webpage (1) @@ -264,26 +254,11 @@ link=Person - - verifyElementPresent - link=Course - - - - verifyElementPresent - link=Semester Class - - verifyElementPresent link=Agreement - - verifyElementPresent - link=Grant - - verifyElementPresent link=Service @@ -291,7 +266,7 @@ verifyElementPresent - link=Subject Area + link=Course @@ -344,6 +319,16 @@ link=Equipment + + verifyElementPresent + link=Grant + + + + verifyElementPresent + link=Subject Area + + verifyElementPresent link=Webpage diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index 70dd00be..27a1d64b 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -96,17 +96,12 @@ verifyTextPresent - Primate College of America Dr., 1999 - + Primate College of America, Dr. 1999 - verifyTextPresent - Primate Health | Subject Area - - - - verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course @@ -136,7 +131,7 @@ verifyTextPresent - Librarian, Lily | Assistant Librarian + Librarian, Lily Assistant Librarian @@ -149,6 +144,11 @@ Librarian, Lily + + verifyTextPresent + Primate Health Conference Conference + + comment Go back to Index @@ -164,6 +164,51 @@ Index to VIVO Contents + + comment + Verify Activities + + + + clickAndWait + link=Service + + + + assertTitle + Service + + + + verifyTextPresent + Primate Heart Health Clinic

    * Service + + + + clickAndWait + link=Primate Heart Health Clinic + + + + assertTitle + Primate Heart Health Clinic + + + + verifyTextPresent + Primate College of America Founder 2010 - + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + comment Verify Courses @@ -191,7 +236,7 @@ verifyTextPresent - Primate College of America | College + Primate College of America College @@ -201,12 +246,12 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course @@ -216,7 +261,7 @@ verifyTextPresent - Africa | geographical_region + Africa geographical_region @@ -226,27 +271,27 @@ verifyTextPresent - http://primatehealthintro.cornell.edu | Webpage + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course verifyTextPresent - Primate Health Check | Event + Animal Health Subject Area verifyTextPresent - Animal Health | Subject Area + Primate Health Subject Area verifyTextPresent - Primate Health | Subject Area + Primate Health Check Event @@ -256,362 +301,7 @@ verifyTextPresent - Fall 2010 | Academic Term - - - - verifyTextPresent - 2010-09-06 - - - - verifyTextPresent - 2010 - - - - verifyTextPresent - 2010-12-07 - - - - verifyTextPresent - 2010 - - - - verifyTextPresent - Fall 2010 | Academic Term - - - - comment - Go back to Index - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - comment - Verify Activities - - - - clickAndWait - link=Grant - - - - assertTitle - Grant - - - - clickAndWait - link=Primate Elderly Care - - - - assertTitle - Primate Elderly Care - - - - verifyTextPresent - Primate Colleges of the World | Consortium - - - - verifyTextPresent - Primate Research Laboratory | Laboratory - - - - verifyTextPresent - Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. - - - - verifyTextPresent - Primate Colleges of the World | Consortium - - - - verifyTextPresent - $1,234,567 - - - - verifyTextPresent - $999,999 - - - - verifyTextPresent - Africa | geographical_region - - - - verifyTextPresent - P999-1234 - - - - verifyTextPresent - 1234-5678 - - - - verifyTextPresent - Primate Student of the Year | Award or Honor - - - - verifyTextPresent - Elderly Care | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Grant - - - - assertTitle - Grant - - - - clickAndWait - link=Primate Habitat Research Grant - - - - assertTitle - Primate Habitat Research Grant - - - - verifyTextPresent - Primate College of America | College - - - - verifyTextPresent - Primate College of America | College - - - - comment - Go back to Index - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - comment - Verify Topics - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Animal Health - - - - assertTitle - Animal Health - - - - verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Primate Health Conference | Conference - - - - verifyTextPresent - Primate Health | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Elderly Care - - - - assertTitle - Elderly Care - - - - verifyTextPresent - Primate Elderly Care | Grant - - - - verifyTextPresent - Primate Health | Subject Area - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Diet - - - - assertTitle - Primate Diet - - - - verifyTextPresent - Primate Health | Subject Area - - - - verifyTextPresent - Primate Feeder | Equipment - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Health - - - - assertTitle - Primate Health - - - - verifyTextPresent - Animal Health | Subject Area - - - - verifyTextPresent - Faculty, Jane | Assistant Professor - - - - verifyTextPresent - Not sure | Vocabulary Source Reference - - - - verifyTextPresent - Introduction to Primate Health | Course - - - - verifyTextPresent - Primate Diet | Subject Area - - - - verifyTextPresent - Elderly Care | Subject Area + Fall Semester 2007 | Academic Term @@ -646,57 +336,17 @@ clickAndWait - link=Fall 2010 + link=Fall Semester 2007 assertTitle - Fall 2010 + Fall Semester 2007 verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Winter 2011 - - - - assertTitle - Winter 2011 - - - - verifyTextPresent - Primate Health Conference | Conference + Introduction to Primate Health Course @@ -729,11 +379,6 @@ Primate Health Conference - - verifyTextPresent - Primate Health and Fitness | Invited Talk - - verifyTextPresent First annual conference for those interested in the general health of primates. @@ -741,22 +386,7 @@ verifyTextPresent - self_governing - - - - verifyTextPresent - Kenya - - - - verifyTextPresent - Chad - - - - verifyTextPresent - the Congo + Librarian, Lily Assistant Librarian @@ -766,27 +396,32 @@ verifyTextPresent - 2011-01-05 + Kenya verifyTextPresent - 2011-01-09 + the Congo verifyTextPresent - Winter 2011 | Academic Term + 2011-01-05 to 2011-01-09 verifyTextPresent - Primate Health Check | Event + http://primatehealthintro.cornell.edu Webpage verifyTextPresent - Animal Health | Subject Area + Animal Health Subject Area + + + + verifyTextPresent + Primate Health Check Event @@ -829,16 +464,6 @@ Primate College of America Organizer 2008 - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Primate Health Conference | Conference - - clickAndWait link=Index @@ -874,16 +499,6 @@ Primate College of America Organizer 2008 - - verifyTextPresent - Introduction to Primate Health | Semester Class - - - - verifyTextPresent - Primate Health Conference | Conference - - comment Go back to Index @@ -931,77 +546,72 @@ verifyTextPresent - B.S. Bachelor of Science | Academic Degree + Primate College of America College verifyTextPresent - Primate College of America | College + Primate College of America College verifyTextPresent - Primate College of America | College + B.S. Bachelor of Science Academic Degree verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Habitat Research Grant Grant verifyTextPresent - Primate Habitat Research Grant | Grant + Primate Habitat Research Grant Grant verifyTextPresent - Primate Student of the Year | Award or Honor + Primate Survival Planning Grant Grant verifyTextPresent - Best Primate College | Award or Honor Receipt + Primate Student of the Year Award or Honor verifyTextPresent - Portable Primate Habitat | Equipment + Best Primate College Award or Honor Receipt verifyTextPresent - Laboratory + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate History Library | Library + Primate History Library Library verifyTextPresent - Position + Faculty, Jane, Dr. 1999 - verifyTextPresent - Faculty, Jane Dr., 1999 - + Primates-r-us Founder 2010 - verifyTextPresent - Primates-r-us | Founder - - - - verifyTextPresent - Primates-r-us | Organization + Primates-r-us Organization @@ -1011,7 +621,7 @@ verifyTextPresent - Primate History Library | Library + Primate History Library Library @@ -1031,7 +641,7 @@ verifyTextPresent - northern_Africa | geographical_region + northern Africa geographical_region @@ -1051,12 +661,12 @@ verifyTextPresent - 1234 Northern African Nation | Address + 1234 Northern African Nation Address verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course @@ -1101,7 +711,7 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant @@ -1111,7 +721,7 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant @@ -1146,12 +756,7 @@ verifyTextPresent - College - - - - verifyTextPresent - Primate College of America | College + Primate College of America College @@ -1186,22 +791,22 @@ verifyTextPresent - Primate Elderly Care | Grant + Primate Elderly Care Grant verifyTextPresent - Primate Feeder | Equipment + Primate Feeder Equipment verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building verifyTextPresent - Primate College of America | College + Primate College of America College @@ -1236,12 +841,7 @@ verifyTextPresent - Leader Role - - - - verifyTextPresent - Primate College of America | Founder + Primate College of America Founder 2010 - @@ -1286,12 +886,12 @@ verifyTextPresent - Primate College of America | College + Primate College of America College verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building @@ -1326,17 +926,17 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area @@ -1359,6 +959,351 @@ Index to VIVO Contents + + comment + Verify Research + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Elderly Care + + + + assertTitle + Primate Elderly Care + + + + verifyTextPresent + Primate Colleges of the World Consortium + + + + verifyTextPresent + Primate Research Laboratory Laboratory + + + + verifyTextPresent + Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. + + + + verifyTextPresent + Primate Colleges of the World Consortium + + + + verifyTextPresent + $1,234,567 + + + + verifyTextPresent + $999,999 + + + + verifyTextPresent + 1234-5678 + + + + verifyTextPresent + Africa geographical_region + + + + verifyTextPresent + P999-1234 + + + + verifyTextPresent + Primate Student of the Year Award or Honor + + + + verifyTextPresent + Elderly Care Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Habitat Research Grant + + + + assertTitle + Primate Habitat Research Grant + + + + verifyTextPresent + Primate College of America College + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Survival Planning Grant + + + + assertTitle + Primate Survival Planning Grant + + + + verifyTextPresent + Primate College of America College + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Elderly Care + + + + assertTitle + Elderly Care + + + + verifyTextPresent + Primate Elderly Care Grant + + + + verifyTextPresent + Primate Health Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Diet + + + + assertTitle + Primate Diet + + + + verifyTextPresent + Primate Health Subject Area + + + + verifyTextPresent + Primate Feeder Equipment + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Health + + + + assertTitle + Primate Health + + + + verifyTextPresent + Animal Health Subject Area + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + verifyTextPresent + Not sure Vocabulary Source Reference + + + + verifyTextPresent + Introduction to Primate Health Course + + + + verifyTextPresent + Primate Diet Subject Area + + + + verifyTextPresent + Elderly Care Subject Area + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Webpage + + + + assertTitle + Webpage + + + + clickAndWait + link=exact:http://primatehealthintro.cornell.edu + + + + assertTitle + exact:http://primatehealthintro.cornell.edu + + + + verifyTextPresent + Primate Health Conference Conference + + + + verifyTextPresent + Introduction to Primate Health Course + + + + comment + Go back to Index + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + comment Verify Locations @@ -1386,27 +1331,27 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Lab Admin Office | Room + Lab Admin Office Room verifyTextPresent - Primate Research Laboratory | Campus + Primate Research Laboratory Campus verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility @@ -1441,7 +1386,7 @@ verifyTextPresent - Jane Memorial Building | Building + Jane Memorial Building Building diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index 9fa1eca7..0f76c3a7 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='equipmentFor']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='equipmentInFacility']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='hasSubjectArea']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='freetextKeyword']/a + //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img @@ -361,17 +361,17 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 6e8b0c44..444eacff 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='facilityFor']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='hasRoom']/a + //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='geographicallyContains']/a + //div[@id='wrapper-content']/section[3]/article[2]/h3/a @@ -341,7 +341,7 @@ clickAndWait - //div[@id='locationOfEquipment']/a + //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img @@ -366,7 +366,7 @@ clickAndWait - //div[@id='geographicLocationOf']/a + //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img @@ -401,27 +401,27 @@ verifyTextPresent - Primate Research Laboratory | Laboratory + Primate Research Laboratory Laboratory verifyTextPresent - Lab Admin Office | Room + Lab Admin Office Room verifyTextPresent - Primate Research Laboratory | Campus + Primate Research Laboratory Campus verifyTextPresent - Portable Primate Habitat | Equipment + Portable Primate Habitat Equipment verifyTextPresent - Primate Research Lab Room 123 | Facility + Primate Research Lab Room 123 Facility diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index 394bfb90..393951b8 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -366,7 +366,7 @@ clickAndWait - submit + //input[@id='submit' and @value='add a new item to this list'] @@ -532,7 +532,7 @@ type name - Primate + Primate type @@ -964,6 +964,11 @@ Edit + + clickAndWait + //input[@id='submit' and @value='add a new item to this list'] + + clickAndWait submit @@ -1156,7 +1161,7 @@ verifyTextPresent - Primates-r-us Founder 2010 - + Primates-r-us Founder 2010 - diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index f301edda..d8e481e2 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='broader']/a + //div[@id='wrapper-content']/section[2]/article/h3/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='researchAreaOf']/a + //div[@id='wrapper-content']/section[3]/article/h3/a/img @@ -271,7 +271,7 @@ clickAndWait - //div[@id='sourceVocabularyReference']/a + //div[@id='wrapper-content']/section[4]/article/h3/a/img @@ -316,7 +316,7 @@ clickAndWait - //div[@id='subjectAreaFor']/a + //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img @@ -346,7 +346,7 @@ clickAndWait - //div[@id='narrower']/a + //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='related']/a + //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img @@ -426,32 +426,32 @@ verifyTextPresent - Animal Health | Subject Area + Animal Health Subject Area verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane Assistant Professor verifyTextPresent - Not sure | Vocabulary Source Reference + Not sure Vocabulary Source Reference verifyTextPresent - Introduction to Primate Health | Course + Introduction to Primate Health Course verifyTextPresent - Primate Diet | Subject Area + Primate Diet Subject Area verifyTextPresent - Elderly Care | Subject Area + Elderly Care Subject Area diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index 21371403..725ea633 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -124,11 +124,6 @@ people - - verifyTextPresent - courses - - verifyTextPresent activities @@ -136,7 +131,7 @@ verifyTextPresent - topics + courses @@ -156,7 +151,7 @@ verifyTextPresent - publications + research @@ -309,81 +304,6 @@ Index to VIVO Contents - - comment - Delete Courses - - - - clickAndWait - link=Course - - - - assertTitle - Course - - - - clickAndWait - link=Introduction to Primate Health - - - - assertTitle - Introduction to Primate Health - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - comment Delete Activities @@ -529,6 +449,76 @@ Index to VIVO Contents + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=Primate Survival Planning Grant + + + + assertTitle + Primate Survival Planning Grant + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + clickAndWait link=Service @@ -601,237 +591,27 @@ comment - Delete Topics + Delete Courses clickAndWait - link=Subject Area + link=Course assertTitle - Subject Area + Course clickAndWait - link=Animal Health + link=Introduction to Primate Health assertTitle - Animal Health - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Elderly Care - - - - assertTitle - Elderly Care - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Diet - - - - assertTitle - Primate Diet - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Subject Area - - - - assertTitle - Subject Area - - - - clickAndWait - link=Primate Health - - - - assertTitle - Primate Health + Introduction to Primate Health @@ -901,82 +681,12 @@ clickAndWait - link=Fall 2010 + link=Fall Semester 2007 assertTitle - Fall 2010 - - - - 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 entity? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index to VIVO Contents - - - - clickAndWait - link=Academic Term - - - - assertTitle - Academic Term - - - - clickAndWait - link=Winter 2011 - - - - assertTitle - Winter 2011 + Fall Semester 2007 @@ -1666,27 +1376,237 @@ comment - Delete Publications + Delete research clickAndWait - link=Webpage + link=Subject Area assertTitle - Webpage + Subject Area clickAndWait - link=exact:http://primatehealthintro.cornell.edu + link=Animal Health assertTitle - exact:http://primatehealthintro.cornell.edu + Animal Health + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Elderly Care + + + + assertTitle + Elderly Care + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Diet + + + + assertTitle + Primate Diet + + + + 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 entity? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Subject Area + + + + assertTitle + Subject Area + + + + clickAndWait + link=Primate Health + + + + assertTitle + Primate Health @@ -1751,12 +1671,12 @@ clickAndWait - link=Primate + link=exact:http://primatehealthintro.cornell.edu assertTitle - Primate + exact:http://primatehealthintro.cornell.edu @@ -2024,11 +1944,6 @@ people - - verifyTextNotPresent - courses - - verifyTextNotPresent activities @@ -2036,7 +1951,7 @@ verifyTextNotPresent - topics + courses @@ -2056,7 +1971,7 @@ verifyTextNotPresent - publications + research diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index c9bba6a6..a016837d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -79,11 +79,6 @@ link=people - - verifyElementPresent - link=courses - - verifyElementPresent link=activities @@ -91,7 +86,7 @@ verifyElementPresent - link=topics + link=courses @@ -111,7 +106,7 @@ verifyElementPresent - link=publications + link=research @@ -134,11 +129,6 @@ Primates-r-us | Organization - - verifyTextPresent - Primate Habitat Research Grant | Grant - - verifyTextPresent Primate Colleges of the World | Consortium @@ -169,11 +159,6 @@ Primate Heart Health Clinic | Service - - verifyTextPresent - Primate Research Laboratory | Campus - - verifyTextPresent Primate Health and Fitness | Invited Talk @@ -201,7 +186,12 @@ verifyTextPresent - Best Primate College | Award or Honor Receipt + Primate Habitat Research Grant | Grant + + + + verifyTextPresent + Best Primate College | Award or Honor Receipt @@ -216,7 +206,7 @@ verifyTextPresent - Portable Primate Habitat | Equipment + Primate Research Lab Room 123 | Facility @@ -224,11 +214,6 @@ Primate Elderly Care | Grant - - verifyTextPresent - Primate Health Conference | Conference - - verifyTextPresent Jane Memorial Building | Building @@ -236,7 +221,7 @@ verifyTextPresent - http://primatehealthintro.cornell.edu | Webpage + http://primatehealthintro.cornell.edu | Webpage @@ -244,6 +229,11 @@ Faculty, Jane | Assistant Professor + + verifyTextPresent + Elderly Care | Subject Area + + clickAndWait link=Next @@ -256,12 +246,12 @@ verifyTextPresent - Elderly Care | Subject Area + Primate Health Conference | Conference verifyTextPresent - Not sure | Vocabulary Source Reference + Not sure | Vocabulary Source Reference @@ -276,12 +266,12 @@ verifyTextPresent - Librarian, Lily | Assistant Librarian + Fall Semester 2007 | Academic Term verifyTextPresent - northern_Africa | geographical_region + Librarian, Lily | Assistant Librarian @@ -289,6 +279,11 @@ Africa | geographical_region + + verifyTextPresent + northern Africa | geographical_region + + verifyTextPresent Liberia @@ -301,22 +296,7 @@ verifyTextPresent - Chad - - - - verifyTextPresent - Congo_the - - - - verifyTextPresent - Fall 2010 | Academic Term - - - - verifyTextPresent - Winter 2011 | Academic Term + the Congo diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 36333206..cb9e6649 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -234,11 +234,6 @@ link=Chimps - - verifyTextPresent - Subject Area - - verifyElementPresent link=Chimp Lover for Life