From a3608ae4f66225156c25fa63b721a69e45ef9b77 Mon Sep 17 00:00:00 2001 From: hlm7 Date: Wed, 5 Jan 2011 14:19:47 +0000 Subject: [PATCH] Holly made more changes due to ontology modifications. --- .../AddEducationBackground.html | 46 +++++++++++++++---- .../ChangeEducationBackground.html | 33 ++++++------- .../CustomEducationForm/CheckPublicView.html | 8 ++-- .../DeleteEducationalBackground.html | 26 +++++------ .../SearchEducationBackground.html | 29 +++--------- 5 files changed, 76 insertions(+), 66 deletions(-) diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index 1f242e42..64c097f9 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -259,6 +259,16 @@ dateTime.year 1980 + + select + dateTime.month + label=month + + + select + dateTime.day + label=day + clickAndWait submit @@ -331,7 +341,7 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S. in Business Administration, Carroll College, 1980 @@ -389,15 +399,25 @@ dateTime.year 2000 + + select + dateTime.month + label=month + + + select + dateTime.day + label=day + select typeSelector - label=College + label=University type relatedIndLabel - Carroll College + Carroll University type @@ -421,12 +441,12 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S. in Business Administration, Carroll College, 1980 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 @@ -459,6 +479,16 @@ dateTime.year 2005 + + select + dateTime.month + label=month + + + select + dateTime.day + label=day + select typeSelector @@ -516,17 +546,17 @@ verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + B.S. in Business Administration, Carroll College, 1980 verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index 9188b5d7..e372d588 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, 1980 + B.S. in Business Administration, Carroll College, 1980 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship @@ -221,22 +221,22 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship + M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship comment - Change organization for M.B.A. degree + Change department for M.B.A. degree @@ -251,13 +251,8 @@ type - newOrgName - University of Illinois - - - select - newOrgType - label=University + dept + Business Administration Department clickAndWait @@ -301,12 +296,12 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department, 2000 @@ -381,17 +376,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Administration Department, 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + M.Ed. in Business Education, University of Wisconsin, School of Business, 2005 diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html index 67d2c54c..5abcfab6 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html @@ -96,22 +96,22 @@ verifyTextPresent - educational training + education and training verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + M.Ed. in Business Education, University of Wisconsin, School of Business, 2005 verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A. in Business Administration, Carroll College, Business Department, 2000 verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 831a9f7c..fe8cae2f 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -136,17 +136,17 @@ verifyTextPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship verifyTextPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 verifyTextPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + M.Ed. in Business Education, University of Wisconsin, School of Business, 2005 @@ -221,17 +221,17 @@ verifyTextNotPresent - B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship + B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship verifyTextNotPresent - M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000 + M.B.A. in Business Administration, Carroll University, Business Department, 2000 verifyTextNotPresent - M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005 + M.Ed. in Business Education, University of Wisconsin, School of Business, 2005 @@ -412,7 +412,7 @@ type querytext - illinois + carroll university clickAndWait @@ -421,17 +421,17 @@ assertTitle - illinois - VIVO Search Results + carroll university - VIVO Search Results clickAndWait - link=University of Illinois + link=Carroll University assertTitle - University of Illinois + Carroll University @@ -477,7 +477,7 @@ type querytext - illinois + carroll university clickAndWait @@ -486,12 +486,12 @@ assertTitle - illinois - VIVO Search Results + carroll university - VIVO Search Results verifyTextNotPresent - University of Illinois + Carroll University diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index 01eb7b93..25e31faa 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -57,7 +57,7 @@ type querytext - carroll college + carroll clickAndWait @@ -66,7 +66,7 @@ assertTitle - carroll college - VIVO Search Results + carroll - VIVO Search Results @@ -74,6 +74,11 @@ link=Carroll College + + verifyElementPresent + link=Carroll University + + type querytext @@ -94,26 +99,6 @@ link=University of Wisconsin - - type - querytext - illinois - - - clickAndWait - //input[@value='Search'] - - - - assertTitle - illinois - VIVO Search Results - - - - verifyElementPresent - link=University of Illinois - - clickAndWait link=Home