diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index 61432db3..5b3a68d9 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -231,7 +231,7 @@ select objectVar - label=Primate Research Laboratory + label=Primate Research Laboratory (Laboratory) clickAndWait @@ -291,7 +291,7 @@ select objectVar - label=Primate Colleges of the World + label=Primate Colleges of the World (Consortium) clickAndWait @@ -696,7 +696,7 @@ select id=objectVar - label=Primate Info + label=Primate Info (Database) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index de9f2d9a..c079cf51 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -361,7 +361,7 @@ select objectVar - label=Primate Health Check + label=Primate Health Check (Event) clickAndWait @@ -436,7 +436,7 @@ select id=objectVar - label=Primate Health and Fitness + label=Primate Health and Fitness (Invited Talk) clickAndWait @@ -557,7 +557,7 @@ select id=objectVar - label=Primate Happenings + label=Primate Happenings (Blog Posting) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index f95bc3ab..f003012e 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -181,7 +181,7 @@ select objectVar - label=Primate Research Laboratory + label=Primate Research Laboratory (Laboratory) clickAndWait @@ -299,7 +299,7 @@ select id=objectVar - label=Primate Heart Health + label=Primate Heart Health (Service) clickAndWait @@ -324,7 +324,7 @@ select id=objectVar - label=Primate University of America + label=Primate University of America (University) clickAndWait @@ -349,7 +349,7 @@ select id=objectVar - label=Primate Health Check + label=Primate Health Check (Event) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index a63e6f9d..3e65716a 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -536,7 +536,7 @@ select objectVar - label=Primate Health Check + label=Primate Health Check (Event) clickAndWait @@ -662,7 +662,7 @@ select id=objectVar - label=Primate Health and Fitness + label=Primate Health and Fitness (Invited Talk) clickAndWait @@ -707,7 +707,7 @@ select id=objectVar - label=Primate Happenings + label=Primate Happenings (Blog Posting) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 4521dc99..5a2e70de 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -288,7 +288,7 @@ select id=objectVar - label=Primate Heart Health + label=Primate Heart Health (Service) clickAndWait @@ -313,7 +313,7 @@ select id=objectVar - label=Primate University of America + label=Primate University of America (University) clickAndWait @@ -338,7 +338,7 @@ select id=objectVar - label=Primate Health Check + label=Primate Health Check (Event) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index 0efadcb6..22bcdfc6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -211,7 +211,7 @@ select objectVar - label=B.S. Bachelor of Science + label=B.S. Bachelor of Science (Academic Degree) clickAndWait @@ -637,7 +637,7 @@ select objectVar - label=Primates-r-us + label=Primates-r-us (Company) clickAndWait @@ -1349,7 +1349,7 @@ select id=objectVar - label=Primate Happenings + label=Primate Happenings (Blog Posting) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 047df8b4..61c60624 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -319,6 +319,11 @@ New Primate Students Workshop + + clickAndWait + link=2 + + verifyElementPresent link=Primate History Library @@ -329,11 +334,6 @@ Primate History Library Library - - clickAndWait - link=2 - - verifyElementPresent link=Primate Memorial Building diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 80c4778a..3cb0549a 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -951,7 +951,7 @@ select id=objectVar - label=Mouse, Minnie + label=Mouse, Minnie (Person) clickAndWait @@ -1938,7 +1938,7 @@ select id=objectVar - label=Nintendo: Good or Bad for Kids? + label=Nintendo: Good or Bad for Kids? (Book) clickAndWait @@ -2004,7 +2004,7 @@ select id=objectVar - label=Kids Now Conference Proceedings + label=Kids Now Conference Proceedings (Chapter) clickAndWait @@ -2383,7 +2383,7 @@ select id=objectVar - label=Focus on Kids! + label=Focus on Kids! (Conference) clickAndWait diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 24b73402..74da54dd 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -1027,6 +1027,11 @@ //div[@id='wrapper-content']/ul/li[10] + + pause + 10000 + + verifyElementPresent link=Prototype New Ape Home diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index db37034b..f3ed6ef3 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -253,77 +253,6 @@ Please select an existing value or enter a new value in the Name field. - - verifyTextPresent - Please enter a new value in the Role field. - - - - - verifyTextPresent - Create presentation entry for Librarian, Lily - - - - verifyTextPresent - Presentation Type - - - - select - typeSelector - label=Presentation - - - verifyTextPresent - Presentation Name - - - - verifyTextPresent - Role in Presentation - - - - verifyTextPresent - Presented At - - - - verifyTextPresent - Years of Participation - - - - verifyTextPresent - Start Year - - - - verifyTextPresent - End Year - - - - type - id=presentation - Researching Primates - - - clickAndWait - css=input.submit - - - - assertTitle - Edit - - - - verifyTextPresent - Please enter a new value in the Role field. - - verifyTextPresent diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html index 07fa2af9..1df81a5f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html +++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html @@ -194,7 +194,7 @@ - clickAndWait + click xpath=(//input[@type='checkbox'])[6] diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html index 468685c0..ab49e5fe 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminCheckPrivileges.html @@ -131,11 +131,6 @@ link=Site information - - verifyElementPresent - link=Startup status - - verifyElementPresent link=User accounts @@ -236,6 +231,11 @@ link=Recompute inferences + + verifyElementPresent + link=Startup status + + verifyElementPresent link=Restrict logins @@ -1074,11 +1074,6 @@ Ingest Menu - - verifyElementPresent - link=Connect DB - - verifyElementPresent link=Manage Jena Models @@ -1154,6 +1149,11 @@ link=Execute Workflow + + verifyElementPresent + link=Dump or Restore the knowledge base + + verifyTextNotPresent We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. @@ -1231,7 +1231,7 @@ verifyTextPresent - Format for SELECT query results: + Format for SELECT and ASK query results: @@ -1481,13 +1481,18 @@ - click - id=developerPanelClickText + verifyTextNotPresent + We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. click - id=developerEnabled + id=developerPanelClickMe + + + + click + id=developer_enabled @@ -1495,11 +1500,6 @@ id=developerPanelSaveButton - - verifyTextNotPresent - We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help. - - clickAndWait diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html index 67ccdd63..830a7b31 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html @@ -196,11 +196,6 @@ Edit - - assertTitle - Edit - - clickAndWait id=returnLink @@ -346,7 +341,7 @@ verifyElementPresent - link=(GraphML File) + link=GraphML file diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index bf173417..d5bbbb96 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -836,13 +836,13 @@ - verifyElementPresent - link=(GraphML File) + selectWindow + null verifyElementPresent - link=(GraphML File) + link=GraphML file diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index a4949d70..ff92bf6d 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -691,11 +691,6 @@ //div[@id='leftUpper']/div/select label=by Grants - - pause 10000 - - - assertTitle Child Development - Temporal Graph Visualization @@ -920,7 +915,7 @@ select objectVar - label=Child Development + label=Child Development (Department) clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index f604b438..d67336d7 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -691,7 +691,7 @@ select id=objectVar - label=Primate Reactions + label=Primate Reactions (Case Study) clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index e2f0ce3b..a71c82c9 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -1160,7 +1160,7 @@ Faculty, Jane - + clickAndWait link=Index @@ -1238,7 +1238,7 @@ verifyTextPresent - Organization (2) + Organization (1) diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index c5c972af..84b2b3ef 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -256,11 +256,6 @@ Edit - - selectWindow - null - - select id=typeOfNew diff --git a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html b/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html index 61d32c75..50d1d77f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html +++ b/utilities/acceptance-tests/suites/CreatePeople/ReorderPeople.html @@ -236,6 +236,11 @@ + + click + //div[@id='wrapper-content']/ul/li[18] + + clickAndWait css=a.add-hasCollaborator > img.add-individual @@ -374,17 +379,17 @@ verifyElementPresent - css=#hasCollaboratorList > li + css=#hasCollaborator-Person-List > li verifyElementPresent - //ul[@id='hasCollaboratorList']/li[2] + //ul[@id='hasCollaborator-Person-List']/li[2] verifyElementPresent - //ul[@id='hasCollaboratorList']/li[3] + //ul[@id='hasCollaborator-Person-List']/li[3] @@ -459,11 +464,6 @@ link=Booth, Susie - - selectWindow - null - - clickAndWait id=verbosePropertySwitch @@ -475,23 +475,18 @@ - assertTitle - Booth, Susie + verifyElementPresent + css=#hasCollaborator-Person-List > li verifyElementPresent - css=#hasCollaboratorList > li + //ul[@id='hasCollaborator-Person-List']/li[2] verifyElementPresent - //ul[@id='hasCollaboratorList']/li[2] - - - - verifyElementPresent - //ul[@id='hasCollaboratorList']/li[3] + //ul[@id='hasCollaborator-Person-List']/li[3] @@ -583,17 +578,17 @@ verifyElementPresent - css=#hasCollaboratorList > li + css=#hasCollaborator-Person-List > li verifyElementPresent - //ul[@id='hasCollaboratorList']/li[2] + //ul[@id='hasCollaborator-Person-List']/li[2] verifyElementPresent - //ul[@id='hasCollaboratorList']/li[3] + //ul[@id='hasCollaborator-Person-List']/li[3] diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html index 1708bbcf..c1ceef6e 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html @@ -397,6 +397,16 @@ css=img.delete-individual + + assertConfirmation + Are you sure you want to delete this photo? + + + + waitForPageToLoad + 5000 + + assertTitle Germany diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html index 56cea1ff..ff8d3f0d 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html @@ -124,7 +124,7 @@ waitForPageToLoad - 20000 + 50000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html index b9a4e61e..92a242b6 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html @@ -120,7 +120,7 @@ waitForPageToLoad - 20000 + 50000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html index 1587ceed..c34acc21 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html @@ -110,7 +110,7 @@ waitForPageToLoad - 20000 + 50000 diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 45943ee9..2ae7a488 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6.1-rc4 + Version rel-1.7-rc1 verifyElementPresent - link=rel-1.6.1-rc4 + link=rel-1.7-rc1 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6.1-rc4 + Version rel-1.7-rc1 @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6.1-rc4 + Version rel-1.7-rc1 verifyElementPresent - link=rel-1.6.1-rc4 + link=rel-1.7-rc1 diff --git a/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html b/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html index 76743a9d..95b68937 100644 --- a/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html +++ b/utilities/acceptance-tests/suites/MultiLabels/ManageLabels.html @@ -132,6 +132,16 @@ link=Remove + + assertConfirmation + Are you sure you wish to delete this label? + + + + waitForPageToLoad + 5000 + + verifyTextNotPresent Furter, Frank Edit Remove @@ -173,6 +183,16 @@ link=Remove + + assertConfirmation + Are you sure you wish to delete this label? + + + + waitForPageToLoad + 5000 + + verifyTextNotPresent Furter, Frank Edit Remove diff --git a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt index 5f28d807..912029aa 100644 --- a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt +++ b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt @@ -1,3 +1,3 @@ - "Test Label 1" . - "Test Label 2" . + "Test Label 1" . + "Test Label 2" . diff --git a/utilities/acceptance-tests/suites/OntologyManagement/Suite.html b/utilities/acceptance-tests/suites/OntologyManagement/Suite.html index 58de5a1d..d24b382a 100644 --- a/utilities/acceptance-tests/suites/OntologyManagement/Suite.html +++ b/utilities/acceptance-tests/suites/OntologyManagement/Suite.html @@ -1,16 +1,16 @@ - - - - - - Test Suite - - - - - - - -
Test Suite
RebuildSearchIndex
AddOntology
DeleteOntology
- - + + + + + + Test Suite + + + + + + + +
Test Suite
RebuildSearchIndex
AddOntology
DeleteOntology
+ + diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html index 1807cbfe..1a681958 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy.html @@ -360,6 +360,11 @@ id=ui-active-menuitem + + pause + 5000 + + verifyElementPresent link=Remove selection diff --git a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt b/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt index 85573af9..bc7cbf39 100644 --- a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt +++ b/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt @@ -1,3 +1,3 @@ - + 2000.0 . diff --git a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html index 0052111b..b6ba5fe4 100644 --- a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html +++ b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html @@ -113,6 +113,11 @@ Jenkins, Iris Faculty Member Emeritus + + pause 100000 + + + clickAndWait @@ -210,6 +215,11 @@ Jenkins, Iris Faculty Member Emeritus + + pause 100000 + + + clickAndWait @@ -312,6 +322,11 @@ Jenkins, Iris Faculty Member Emeritus + + pause 100000 + + + clickAndWait diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html index aee17b65..01f935a0 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html @@ -302,7 +302,7 @@ sendKeys id=activity - Depart + Department B pause