From 9d7ebe1cae584d450c5c9190f2a1b17af05ab642 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Mon, 16 Jun 2014 17:26:32 -0400 Subject: [PATCH] More test case changes from 1.7 rc 1 by Holly. --- .../AddNonPersonThings/CreateActivity.html | 6 +- .../AddNonPersonThings/CreateCourse.html | 6 +- .../CreateOrganization.html | 6 +- .../AddRoles/AddFacultyMemberRoles2.html | 5 ++ .../suites/AddRoles/AddLibrarianRoles1.html | 71 ------------------- .../suites/AddRoles/GrantDisplay.html | 2 +- .../NewAdminCheckPrivileges.html | 35 ++++++--- .../CheckVisualizations/AddCoAuthors.html | 7 +- .../CheckVisualizations/AddPublications.html | 6 +- .../TestTemporalGraphs.html | 7 +- .../suites/CreatePeople/ReorderPeople.html | 35 ++++----- .../suites/OntologyManagement/Suite.html | 32 ++++----- .../ProxyEditing/ValidateAdminProxy.html | 5 ++ 13 files changed, 81 insertions(+), 142 deletions(-) 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/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/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 d13deb7d..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. @@ -1485,6 +1485,21 @@ 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=developerPanelClickMe + + + + click + id=developer_enabled + + + + click + id=developerPanelSaveButton + + 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/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/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