From 50f7f764f525b29a301d722db2338baa74b7cbd8 Mon Sep 17 00:00:00 2001 From: ejc12 Date: Thu, 5 Aug 2010 21:24:36 +0000 Subject: [PATCH] Holly is still tweaking the AddRolls test suite... --- .../suites/AddRoles/AddFacultyMemberRoles1 | 26 +-- .../suites/AddRoles/CheckIndexView.html | 19 +- .../suites/AddRoles/CheckPublicView.html | 24 +- .../suites/AddRoles/CheckRepairMode.html | 46 +++- .../suites/AddRoles/DeleteIndexStuff.html | 219 +++++++++++++++--- .../AddRoles/VerifyAllRolesSearchable.html | 66 ++++-- 6 files changed, 295 insertions(+), 105 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 index fdb42a6d..367e4890 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1 @@ -31,7 +31,7 @@ comment - Add grant roles for Jane Faculty + Add grant roles for Jane Faculty--originally tested auto-complete but doesn't work well within Selenium @@ -572,12 +572,7 @@ type relatedIndLabel - VIVO Cornell Grant - - - click - ui-active-menuitem - + VIVO Cornell Grant Too clickAndWait @@ -627,7 +622,7 @@ type relatedIndLabel - VIVO Cornell Grant + VIVO Cornell Grant Too type @@ -691,7 +686,7 @@ verifyTextPresent - VIVO Cornell Grant + VIVO Cornell Grant Too @@ -747,12 +742,7 @@ type relatedIndLabel - NIH VIVO - - - click - ui-active-menuitem - + NIH VIVO Too type @@ -811,7 +801,7 @@ verifyTextPresent - NIH VIVO + NIH VIVO Too @@ -861,7 +851,7 @@ verifyTextPresent - VIVO Cornell Grant + VIVO Cornell Grant Too @@ -876,7 +866,7 @@ verifyTextPresent - NIH VIVO + NIH VIVO Too diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html index a410107d..768f26ea 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckIndexView.html @@ -99,6 +99,16 @@ Person (2) + + verifyTextPresent + courses + + + + verifyTextPresent + Course (1) + + verifyTextPresent activities @@ -109,11 +119,6 @@ Agreement (5) - - verifyTextPresent - Course (1) - - verifyTextPresent Grant (5) @@ -211,12 +216,12 @@ verifyElementPresent - link=Agreement + link=Course verifyElementPresent - link=Course + link=Agreement diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html index d79dc6cd..567d011e 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html @@ -136,7 +136,7 @@ verifyElementPresent - link=NIH VIVO + link=NIH VIVO Too @@ -144,16 +144,6 @@ 2010 - - - verifyElementPresent - link=NIH VIVO - - - - verifyTextPresent - 2009 - 2010 - - verifyElementPresent link=VIVO Cornell Grant @@ -166,7 +156,17 @@ verifyElementPresent - link=VIVO Cornell Grant + link=NIH VIVO + + + + verifyTextPresent + 2009 - 2010 + + + + verifyElementPresent + link=VIVO Cornell Grant Too diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index d1db1ff3..450c7293 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -31,7 +31,7 @@ comment - Test repair mode using Lily Librarian + Test repair mode using Lily Librarian--originally tested auto-complete but doesn't work well within Selenium @@ -429,6 +429,41 @@ typeSelector label=Association + + verifyTextPresent + Edit membership entry for Librarian, Lily + + + + verifyTextPresent + Membership Type + + + + verifyTextPresent + Association Name + + + + verifyTextPresent + Role in Association + + + + verifyTextPresent + Years of Participation in Association + + + + verifyTextPresent + Start Year + + + + verifyTextPresent + End Year + + clickAndWait submit @@ -457,12 +492,7 @@ type relatedIndLabel - LITA - - - click - ui-active-menuitem - + LITA Too clickAndWait @@ -476,7 +506,7 @@ verifyElementPresent - link=LITA + link=LITA Too diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 23835ec3..0f726b53 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -109,6 +109,16 @@ Verify what is to be deleted + + verifyTextPresent + courses + + + + verifyTextPresent + Course + + verifyTextPresent activities @@ -119,11 +129,6 @@ Agreement - - verifyTextPresent - Course - - verifyTextPresent Grant @@ -255,7 +260,7 @@ - pause + waitForPageToLoad 5000 @@ -325,7 +330,7 @@ - pause + waitForPageToLoad 5000 @@ -395,7 +400,77 @@ - pause + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Agreement + + + + assertTitle + Agreement + + + + clickAndWait + link=NIH VIVO Too + + + + assertTitle + NIH VIVO Too + + + + 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 @@ -465,15 +540,10 @@ - pause + waitForPageToLoad 5000 - - assertTitle - VIVO Site Administration - - clickAndWait link=Index @@ -496,12 +566,12 @@ clickAndWait - link=VIVO Cornell Grant + link=VIVO Cornell Grant Too assertTitle - VIVO Cornell Grant + VIVO Cornell Grant Too @@ -535,7 +605,7 @@ - pause + waitForPageToLoad 5000 @@ -605,7 +675,7 @@ - pause + waitForPageToLoad 5000 @@ -675,7 +745,7 @@ - pause + waitForPageToLoad 5000 @@ -745,7 +815,7 @@ - pause + waitForPageToLoad 5000 @@ -815,7 +885,7 @@ - pause + waitForPageToLoad 5000 @@ -885,7 +955,7 @@ - pause + waitForPageToLoad 5000 @@ -955,7 +1025,7 @@ - pause + waitForPageToLoad 5000 @@ -1025,7 +1095,7 @@ - pause + waitForPageToLoad 5000 @@ -1095,7 +1165,7 @@ - pause + waitForPageToLoad 5000 @@ -1165,7 +1235,7 @@ - pause + waitForPageToLoad 5000 @@ -1235,7 +1305,7 @@ - pause + waitForPageToLoad 5000 @@ -1305,7 +1375,7 @@ - pause + waitForPageToLoad 5000 @@ -1375,7 +1445,7 @@ - pause + waitForPageToLoad 5000 @@ -1445,7 +1515,7 @@ - pause + waitForPageToLoad 5000 @@ -1515,7 +1585,77 @@ - pause + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + + + clickAndWait + link=Organization + + + + assertTitle + Organization + + + + clickAndWait + link=LITA Too + + + + assertTitle + LITA Too + + + + 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 @@ -1589,6 +1729,16 @@ 10000 + + verifyTextNotPresent + courses + + + + verifyTextNotPresent + Course + + verifyTextNotPresent activities @@ -1599,11 +1749,6 @@ Agreement - - verifyTextNotPresent - Course - - verifyTextNotPresent Grant @@ -1611,7 +1756,7 @@ comment - Can't search for Project because it appears on botton of every page + Can't check for Project because it appears on botton of every page diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index 5fa830f4..83091244 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -86,12 +86,22 @@ verifyTextPresent - NIH VIVO | Grant + NIH VIVO | Grant verifyTextPresent - VIVO Cornell Grant | Grant + NIH VIVO Too | Grant + + + + verifyTextPresent + VIVO Cornell Grant | Grant + + + + verifyTextPresent + VIVO Cornell Grant Too | Grant @@ -104,11 +114,21 @@ link=NIH VIVO + + verifyElementPresent + link=NIH VIVO Too + + verifyElementPresent link=VIVO Cornell Grant + + verifyElementPresent + link=VIVO Cornell Grant Too + + comment Verify search results for APE @@ -141,32 +161,32 @@ verifyTextPresent - Habitats for Apes | Grant + Habitats for Apes | Grant verifyTextPresent - Ape World | Conference + Ape World | Conference verifyTextPresent - History of Apes in Africa | Project + History of Apes in Africa | Project verifyTextPresent - Introduction to the Ape World | Course + Introduction to the Ape World | Course verifyTextPresent - Prototype New Ape Home | Project + Prototype New Ape Home | Project verifyTextPresent - Ape Health Program | Service + Ape Health Program | Service @@ -226,27 +246,27 @@ verifyTextPresent - Working with Primates | Workshop + Working with Primates | Workshop verifyTextPresent - Researching Primates | Presentation + Researching Primates | Presentation verifyTextPresent - Primates of the World | Museum + Primates of the World | Museum verifyTextPresent - Show Me the Primates! | Event + Show Me the Primates! | Event verifyTextPresent - Librarians for the Better Treatment of Primates | Committee + Librarians for the Better Treatment of Primates | Committee @@ -301,17 +321,17 @@ verifyTextPresent - Librarian, Lily | Associate Librarian + Librarian, Lily | Associate Librarian verifyTextPresent - Librarians for the Better Treatment of Primates | Committee + Librarians for the Better Treatment of Primates | Committee verifyTextPresent - Reference Division | Department + Reference Division | Department @@ -351,7 +371,7 @@ verifyTextPresent - Animal Librarianship | Invited Talk + Animal Librarianship | Invited Talk @@ -381,7 +401,7 @@ verifyTextPresent - Carroll College | College + Carroll College | College @@ -411,22 +431,22 @@ verifyTextPresent - Amercian Library Association | Association + Amercian Library Association | Association verifyTextPresent - B.L.S. Bachelor of Library Science | Academic Degree + B.L.S. Bachelor of Library Science | Academic Degree verifyTextPresent - D.L.S. Doctor of Library Science | Academic Degree + D.L.S. Doctor of Library Science | Academic Degree verifyTextPresent - M.L.S. Master of Library Science | Academic Degree + M.L.S. Master of Library Science | Academic Degree @@ -471,7 +491,7 @@ verifyTextPresent - Faculty, Jane | Assistant Professor + Faculty, Jane | Assistant Professor