From 791b39fa9a47cdf3816e06e66235ef889aa2989e Mon Sep 17 00:00:00 2001 From: hlm7 Date: Fri, 28 Jan 2011 20:10:26 +0000 Subject: [PATCH] Holly did some tweaking on the visualizations tests. --- .../AddCoInvestigators.html | 10 ++++ .../suites/CheckVisualizations/AddGrants.html | 10 ++++ .../CheckVisualizations/DeleteIndexStuff.html | 29 +++++++--- .../AddCoInvestigators.html | 12 ++++- .../CheckVisualizationsVB/AddGrants.html | 10 ++++ .../DeleteIndexStuff.html | 29 +++++++--- .../suites/CheckVisualizationsVB/Suite.html | 46 ++++++++-------- .../TestTemporalGraphs.html | 53 +++++++++++++++++-- 8 files changed, 157 insertions(+), 42 deletions(-) diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index bdecb5f0..821c6a0b 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -384,6 +384,16 @@ 2   Co-investigator(s) + + verifyTextPresent + 2002  First Grant + + + + verifyTextPresent + 2010   Last Grant + + verifyTextPresent 4 grants diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html index abe74574..9da89340 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddGrants.html @@ -314,6 +314,16 @@ 0   Co-investigator(s) + + verifyTextPresent + 2002  First Grant + + + + verifyTextPresent + 2010   Last Grant + + verifyTextPresent 4 grants diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html index a26cb294..6134a631 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/DeleteIndexStuff.html @@ -969,6 +969,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -1015,13 +1020,8 @@ - assertTitle - Individual Control Panel - - - - assertTitle - Individual Editing Form + clickAndWait + //input[@value='Edit This Individual'] @@ -1034,6 +1034,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -1044,6 +1049,16 @@ Verify that everything is gone + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + pause 50000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html index e5c4ef91..82998fc7 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddCoInvestigators.html @@ -384,6 +384,16 @@ 2   Co-investigator(s) + + verifyTextPresent + 2002  First Grant + + + + verifyTextPresent + 2010   Last Grant + + verifyTextPresent 4 grants @@ -426,7 +436,7 @@ verifyTextPresent - 2003 + 2006 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddGrants.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddGrants.html index abe74574..9da89340 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddGrants.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/AddGrants.html @@ -314,6 +314,16 @@ 0   Co-investigator(s) + + verifyTextPresent + 2002  First Grant + + + + verifyTextPresent + 2010   Last Grant + + verifyTextPresent 4 grants diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html index a26cb294..6134a631 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/DeleteIndexStuff.html @@ -969,6 +969,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -1015,13 +1020,8 @@ - assertTitle - Individual Control Panel - - - - assertTitle - Individual Editing Form + clickAndWait + //input[@value='Edit This Individual'] @@ -1034,6 +1034,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + pause + 5000 + + assertTitle VIVO Site Administration @@ -1044,6 +1049,16 @@ Verify that everything is gone + + clickAndWait + link=Index + + + + assertTitle + Index to VIVO Contents + + pause 50000 diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html index e09d66e8..e7e29e66 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/Suite.html @@ -1,23 +1,23 @@ - - - - - - Test Suite - - - - - - - - - - - - - - -
Test Suite
SetDefaultTheme
AddTestFaculty
AddPublications
AddCoAuthors
AddGrants
AddCoInvestigators
TestTemporalGraphs
DeleteTestFaculty
DeleteTestCos
DeleteIndexStuff
- - + + + + + + Test Suite + + + + + + + + + + + + + + +
Test Suite
SetDefaultTheme
AddTestFaculty
AddPublications
AddCoAuthors
AddGrants
AddCoInvestigators
TestTemporalGraphs
DeleteTestFaculty
DeleteTestCos
DeleteIndexStuff
+ + diff --git a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html index dca5a8fb..7079c8c0 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizationsVB/TestTemporalGraphs.html @@ -286,12 +286,32 @@ clickAndWait - link=Organizations + link=Index assertTitle - Organizations + Index to VIVO Contents + + + + clickAndWait + link=Department + + + + assertTitle + Department + + + + clickAndWait + link=Child Development + + + + assertTitle + Child Development @@ -734,6 +754,11 @@ link=Site Admin + + pause + 5000 + + assertTitle VIVO Site Administration @@ -806,12 +831,32 @@ clickAndWait - link=Organizations + link=Index assertTitle - Organizations + Index to VIVO Contents + + + + clickAndWait + link=College + + + + assertTitle + College + + + + clickAndWait + link=College of Human Ecology + + + + assertTitle + College of Human Ecology