diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
index 6feae912..405423e8 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
@@ -149,11 +149,6 @@
Course (1) |
|
-
- verifyTextPresent |
- Academic Term (1) |
- |
-
verifyTextPresent |
Conference (1) |
@@ -284,11 +279,6 @@
link=Course |
|
-
- verifyElementPresent |
- link=Academic Term |
- |
-
verifyElementPresent |
link=Conference |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
index 3b47e613..b3708ea1 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
@@ -94,11 +94,46 @@
Faculty, Jane |
|
+
+ verifyTextPresent |
+ Positions |
+ |
+
verifyTextPresent |
Primate College of America, Dr. 1999 - |
|
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
+
+ verifyTextPresent |
+ Research Areas |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Service |
+ |
+
+
+ verifyTextPresent |
+ organizer of |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
@@ -144,11 +179,26 @@
Librarian, Lily |
|
+
+ verifyTextPresent |
+ Service |
+ |
+
+
+ verifyTextPresent |
+ organizer of |
+ |
+
verifyTextPresent |
Primate Health Conference Conference |
|
+
+ verifyElementPresent |
+ link=Primate Health Conference |
+ |
+
comment |
@@ -189,6 +239,21 @@
Primate Heart Health Clinic |
|
+
+ verifyTextPresent |
+ related role |
+ |
+
+
+ verifyTextPresent |
+ clinical role |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America Founder 2010 - |
@@ -229,31 +294,81 @@
Introduction to Primate Health |
|
+
+ verifyTextPresent |
+ offered by |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
|
+
+ verifyTextPresent |
+ description |
+ |
+
verifyTextPresent |
Learn the basics about the general health of primates. |
|
+
+ verifyTextPresent |
+ organized by |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
Faculty, Jane Assistant Professor |
|
+
+ verifyTextPresent |
+ prerequisite for |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
|
+
+ verifyTextPresent |
+ contact information |
+ |
+
verifyTextPresent |
ME Tarzan at metarzan@primates.edu or 555-555-5553 |
|
+
+ verifyTextPresent |
+ geographic focus |
+ |
+
+
+ verifyElementPresent |
+ link=Africa |
+ |
+
verifyTextPresent |
Africa geographical_region |
@@ -261,7 +376,37 @@
verifyTextPresent |
- Liberia |
+ has geographic location |
+ |
+
+
+ verifyElementPresent |
+ link=Liberia |
+ |
+
+
+ verifyTextPresent |
+ Liberia self_governing |
+ |
+
+
+ verifyTextPresent |
+ date/time interval |
+ |
+
+
+ verifyTextPresent |
+ September 1, 2007 - December 15, 2007 |
+ |
+
+
+ verifyTextPresent |
+ related documents |
+ |
+
+
+ verifyElementPresent |
+ link=http://primatehealthintro.cornell.edu |
|
@@ -269,11 +414,41 @@
http://primatehealthintro.cornell.edu Webpage |
|
+
+ verifyTextPresent |
+ has prerequisite |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
|
+
+ verifyTextPresent |
+ subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
+
+ verifyTextPresent |
+ Primate Health Subject Area |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
verifyTextPresent |
Animal Health Subject Area |
@@ -281,7 +456,12 @@
verifyTextPresent |
- Primate Health Subject Area |
+ includes event |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
|
@@ -291,12 +471,12 @@
verifyTextPresent |
- 9 |
+ credits |
|
verifyTextPresent |
- Fall Semester 2007 | Academic Term |
+ 9 |
|
@@ -319,41 +499,6 @@
|
-
- clickAndWait |
- link=Academic Term |
- |
-
-
- assertTitle |
- Academic Term |
- |
-
-
- clickAndWait |
- link=Fall Semester 2007 |
- |
-
-
- assertTitle |
- Fall Semester 2007 |
- |
-
-
- verifyTextPresent |
- Introduction to Primate Health Course |
- |
-
-
- clickAndWait |
- link=Index |
- |
-
-
- assertTitle |
- Index to VIVO Contents |
- |
-
clickAndWait |
link=Conference |
@@ -374,21 +519,51 @@
Primate Health Conference |
|
+
+ verifyTextPresent |
+ description |
+ |
+
verifyTextPresent |
First annual conference for those interested in the general health of primates. |
|
+
+ verifyTextPresent |
+ proceedings |
+ |
+
+
+ verifyElementPresent |
+ link=PHC Proceedings |
+ |
+
verifyTextPresent |
PHC Proceedings Proceedings |
|
+
+ verifyTextPresent |
+ organized by |
+ |
+
+
+ verifyElementPresent |
+ link=Librarian, Lily |
+ |
+
verifyTextPresent |
Librarian, Lily Assistant Librarian |
|
+
+ verifyTextPresent |
+ contact information |
+ |
+
verifyTextPresent |
info@primateconf.org |
@@ -396,17 +571,52 @@
verifyTextPresent |
- Kenya |
+ geographic focus |
+ |
+
+
+ verifyElementPresent |
+ link=Kenya |
|
verifyTextPresent |
- the Congo |
+ Kenya self_governing |
|
verifyTextPresent |
- 2011-01-05 to 2011-01-09 |
+ has geographic location |
+ |
+
+
+ verifyElementPresent |
+ link=the Congo |
+ |
+
+
+ verifyTextPresent |
+ the Congo self_governing |
+ |
+
+
+ verifyTextPresent |
+ date/time interval |
+ |
+
+
+ verifyTextPresent |
+ January 5, 2011 - January 9, 2011 |
+ |
+
+
+ verifyTextPresent |
+ related documents |
+ |
+
+
+ verifyElementPresent |
+ link=http://primatehealthintro.cornell.edu |
|
@@ -414,16 +624,41 @@
http://primatehealthintro.cornell.edu Webpage |
|
+
+ verifyTextPresent |
+ subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
verifyTextPresent |
Animal Health Subject Area |
|
+
+ verifyTextPresent |
+ includes event |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
+ |
+
verifyTextPresent |
Primate Health Check Event |
|
+
+ verifyTextPresent |
+ abbreviation |
+ |
+
verifyTextPresent |
PrimHConf |
@@ -459,6 +694,21 @@
Primate Health and Fitness |
|
+
+ verifyTextPresent |
+ related role |
+ |
+
+
+ verifyTextPresent |
+ presenter role |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America Organizer 2008 |
@@ -546,7 +796,12 @@
verifyTextPresent |
- Primate College of America College |
+ predecessor organization |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
|
@@ -554,6 +809,31 @@
Primate College of America College |
|
+
+ verifyTextPresent |
+ successor organization |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
+
+ verifyTextPresent |
+ Primate College of America College |
+ |
+
+
+ verifyTextPresent |
+ offers degree |
+ |
+
+
+ verifyElementPresent |
+ link=B.S. Bachelor of Science |
+ |
+
verifyTextPresent |
B.S. Bachelor of Science Academic Degree |
@@ -561,7 +841,12 @@
verifyTextPresent |
- Primate Habitat Research Grant Grant |
+ awards grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Habitat Research Grant |
|
@@ -569,61 +854,181 @@
Primate Habitat Research Grant Grant |
|
+
+ verifyTextPresent |
+ subcontracts grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Survival Planning Grant |
+ |
+
verifyTextPresent |
Primate Survival Planning Grant Grant |
|
+
+ verifyTextPresent |
+ sponsors award or honor |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Student of the Year |
+ |
+
verifyTextPresent |
Primate Student of the Year Award or Honor |
|
+
+ verifyTextPresent |
+ award or honor given |
+ |
+
+
+ verifyElementPresent |
+ link=Best Primate College |
+ |
+
verifyTextPresent |
Best Primate College Award or Honor Receipt |
|
+
+ verifyTextPresent |
+ has equipment |
+ |
+
+
+ verifyElementPresent |
+ link=Portable Primate Habitat |
+ |
+
verifyTextPresent |
Portable Primate Habitat Equipment |
|
+
+ verifyTextPresent |
+ has sub-organization |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
verifyTextPresent |
Primate Research Laboratory Laboratory |
|
+
+ verifyTextPresent |
+ organization within |
+ |
+
+
+ verifyElementPresent |
+ link=Primate History Library |
+ |
+
verifyTextPresent |
Primate History Library Library |
|
+
+ verifyTextPresent |
+ people |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
Faculty, Jane, Dr. 1999 - |
|
+
+ verifyTextPresent |
+ head of |
+ |
+
+
+ verifyElementPresent |
+ link=Primates-r-us |
+ |
+
verifyTextPresent |
Primates-r-us Founder 2010 - |
|
+
+ verifyTextPresent |
+ affliliated organization |
+ |
+
+
+ verifyElementPresent |
+ link=Primates-r-us |
+ |
+
verifyTextPresent |
Primates-r-us Organization |
|
+
+ verifyTextPresent |
+ member of |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Colleges of the World |
+ |
+
verifyTextPresent |
Primate Colleges of the World Member 2009 - |
|
+
+ verifyTextPresent |
+ collaborator |
+ |
+
+
+ verifyElementPresent |
+ link=Primate History Library |
+ |
+
verifyTextPresent |
Primate History Library Library |
|
+
+ verifyTextPresent |
+ clinical activities |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Heart Health Clinic |
+ |
+
verifyTextPresent |
Primate Heart Health Clinic Founder 2010 - |
@@ -631,7 +1036,27 @@
verifyTextPresent |
- Primate Info |
+ selected publications |
+ |
+
+
+ verifyTextPresent |
+ database |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Info |
+ |
+
+
+ verifyTextPresent |
+ presentations |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health and Fitness |
|
@@ -639,46 +1064,121 @@
Primate Health and Fitness Organizer 2008 |
|
+
+ verifyTextPresent |
+ outreach and community service |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Check |
+ |
+
verifyTextPresent |
Primate Health Check Sponsor 2008 - 2010 |
|
+
+ verifyTextPresent |
+ has geographic location |
+ |
+
+
+ verifyElementPresent |
+ link=northern Africa |
+ |
+
verifyTextPresent |
northern Africa geographical_region |
|
+
+ verifyTextPresent |
+ email |
+ |
+
verifyTextPresent |
info@primates.edu |
|
+
+ verifyTextPresent |
+ phone |
+ |
+
verifyTextPresent |
555-555-5555 |
|
+
+ verifyTextPresent |
+ fax |
+ |
+
verifyTextPresent |
555-555-5554 |
|
+
+ verifyTextPresent |
+ mailing address |
+ |
+
+
+ verifyElementPresent |
+ link=1234 Northern African Nation |
+ |
+
verifyTextPresent |
1234 Northern African Nation Address |
|
+
+ verifyTextPresent |
+ date/time interval |
+ |
+
+
+ verifyTextPresent |
+ 1959 - |
+ |
+
+
+ verifyTextPresent |
+ offers course |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
|
+
+ verifyTextPresent |
+ abbreviation |
+ |
+
verifyTextPresent |
PCoA |
|
+
+ verifyTextPresent |
+ keywords |
+ |
+
verifyTextPresent |
Gorillas |
@@ -714,16 +1214,51 @@
Primate Colleges of the World |
|
+
+ verifyTextPresent |
+ administers grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Elderly Care |
+ |
+
verifyTextPresent |
Primate Elderly Care Grant |
|
+
+ verifyTextPresent |
+ related role |
+ |
+
+
+ verifyTextPresent |
+ member role |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America Member 2009 - |
|
+
+ verifyTextPresent |
+ subcontracts grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Elderly Care |
+ |
+
verifyTextPresent |
Primate Elderly Care Grant |
@@ -759,6 +1294,21 @@
Primate History Library |
|
+
+ verifyTextPresent |
+ Affiliation |
+ |
+
+
+ verifyTextPresent |
+ has sub-organization |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
@@ -794,21 +1344,61 @@
Primate Research Laboratory |
|
+
+ verifyTextPresent |
+ awards grant |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Elderly Care |
+ |
+
verifyTextPresent |
Primate Elderly Care Grant |
|
+
+ verifyTextPresent |
+ has equipment |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Feeder |
+ |
+
verifyTextPresent |
Primate Feeder Equipment |
|
+
+ verifyTextPresent |
+ has facility |
+ |
+
+
+ verifyElementPresent |
+ link=Jane Memorial Building |
+ |
+
verifyTextPresent |
Jane Memorial Building Building |
|
+
+ verifyTextPresent |
+ organization within |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
@@ -844,6 +1434,21 @@
Primates-r-us |
|
+
+ verifyTextPresent |
+ related role |
+ |
+
+
+ verifyTextPresent |
+ leader role |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America Founder 2010 - |
@@ -889,11 +1494,31 @@
Portable Primate Habitat |
|
+
+ verifyTextPresent |
+ equipment for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
|
+
+ verifyTextPresent |
+ in facility |
+ |
+
+
+ verifyElementPresent |
+ link=Jane Memorial Building |
+ |
+
verifyTextPresent |
Jane Memorial Building Building |
@@ -929,21 +1554,56 @@
Primate Feeder |
|
+
+ verifyTextPresent |
+ equipment for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
verifyTextPresent |
Primate Research Laboratory Laboratory |
|
+
+ verifyTextPresent |
+ in facility |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Lab Room 123 |
+ |
+
verifyTextPresent |
Primate Research Lab Room 123 Facility |
|
+
+ verifyTextPresent |
+ subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
verifyTextPresent |
Primate Diet Subject Area |
|
+
+ verifyTextPresent |
+ keywords |
+ |
+
verifyTextPresent |
Animal Diet |
@@ -989,56 +1649,151 @@
Primate Elderly Care |
|
+
+ verifyTextPresent |
+ administered by |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Colleges of the World |
+ |
+
verifyTextPresent |
Primate Colleges of the World Consortium |
|
+
+ verifyTextPresent |
+ grant awarded by |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
verifyTextPresent |
Primate Research Laboratory Laboratory |
|
+
+ verifyTextPresent |
+ abstract |
+ |
+
verifyTextPresent |
Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. |
|
+
+ verifyTextPresent |
+ subcontracted through |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Colleges of the World |
+ |
+
verifyTextPresent |
Primate Colleges of the World Consortium |
|
+
+ verifyTextPresent |
+ total award amount |
+ |
+
verifyTextPresent |
$1,234,567 |
|
+
+ verifyTextPresent |
+ direct costs |
+ |
+
verifyTextPresent |
$999,999 |
|
+
+ verifyTextPresent |
+ sponsor award id |
+ |
+
verifyTextPresent |
1234-5678 |
|
+
+ verifyTextPresent |
+ geographic focus |
+ |
+
+
+ verifyElementPresent |
+ link=Africa |
+ |
+
verifyTextPresent |
Africa geographical_region |
|
+
+ verifyTextPresent |
+ date/time interval |
+ |
+
+
+ verifyTextPresent |
+ September 1, 2010 - August 31, 2012 |
+ |
+
+
+ verifyTextPresent |
+ local award id |
+ |
+
verifyTextPresent |
P999-1234 |
|
+
+ verifyTextPresent |
+ funding vehicle for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Student of the Year |
+ |
+
verifyTextPresent |
Primate Student of the Year Award or Honor |
|
+
+ verifyTextPresent |
+ subject area |
+ |
+
+
+ verifyElementPresent |
+ link=Elderly Care |
+ |
+
verifyTextPresent |
Elderly Care Subject Area |
@@ -1074,6 +1829,16 @@
Primate Habitat Research Grant |
|
+
+ verifyTextPresent |
+ grant awarded by |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
@@ -1109,6 +1874,16 @@
Primate Survival Planning Grant |
|
+
+ verifyTextPresent |
+ subcontracted through |
+ |
+
+
+ verifyElementPresent |
+ link=Primate College of America |
+ |
+
verifyTextPresent |
Primate College of America College |
@@ -1144,11 +1919,31 @@
Elderly Care |
|
+
+ verifyTextPresent |
+ subject area for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Elderly Care |
+ |
+
verifyTextPresent |
Primate Elderly Care Grant |
|
+
+ verifyTextPresent |
+ related |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
verifyTextPresent |
Primate Health Subject Area |
@@ -1184,11 +1979,31 @@
Primate Diet |
|
+
+ verifyTextPresent |
+ broader term |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health |
+ |
+
verifyTextPresent |
Primate Health Subject Area |
|
+
+ verifyTextPresent |
+ subject area for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Feeder |
+ |
+
verifyTextPresent |
Primate Feeder Equipment |
@@ -1224,31 +2039,91 @@
Primate Health |
|
+
+ verifyTextPresent |
+ broader term |
+ |
+
+
+ verifyElementPresent |
+ link=Animal Health |
+ |
+
verifyTextPresent |
Animal Health Subject Area |
|
+
+ verifyTextPresent |
+ research area of |
+ |
+
+
+ verifyElementPresent |
+ link=Faculty, Jane |
+ |
+
verifyTextPresent |
Faculty, Jane Assistant Professor |
|
+
+ verifyTextPresent |
+ source vocabulary reference |
+ |
+
+
+ verifyElementPresent |
+ link=Not sure |
+ |
+
verifyTextPresent |
Not sure Vocabulary Source Reference |
|
+
+ verifyTextPresent |
+ subject area for |
+ |
+
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
|
+
+ verifyTextPresent |
+ narrower term |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Diet |
+ |
+
verifyTextPresent |
Primate Diet Subject Area |
|
+
+ verifyTextPresent |
+ related to |
+ |
+
+
+ verifyElementPresent |
+ link=Elderly Care |
+ |
+
verifyTextPresent |
Elderly Care Subject Area |
@@ -1276,12 +2151,22 @@
clickAndWait |
- link=exact:http://primatehealthintro.cornell.edu |
+ link=http://primatehealthintro.cornell.edu |
|
assertTitle |
- exact:http://primatehealthintro.cornell.edu |
+ http://primatehealthintro.cornell.edu |
+ |
+
+
+ verifyTextPresent |
+ presented at |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Health Conference |
|
@@ -1289,6 +2174,11 @@
Primate Health Conference Conference |
|
+
+ verifyElementPresent |
+ link=Introduction to Primate Health |
+ |
+
verifyTextPresent |
Introduction to Primate Health Course |
@@ -1334,26 +2224,76 @@
Jane Memorial Building |
|
+
+ verifyTextPresent |
+ facility for |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
verifyTextPresent |
Primate Research Laboratory Laboratory |
|
+
+ verifyTextPresent |
+ rooms |
+ |
+
+
+ verifyElementPresent |
+ link=Lab Admin Office |
+ |
+
verifyTextPresent |
Lab Admin Office Room |
|
+
+ verifyTextPresent |
+ geographically contains |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Laboratory |
+ |
+
verifyTextPresent |
Primate Research Laboratory Campus |
|
+
+ verifyTextPresent |
+ location of equipment |
+ |
+
+
+ verifyElementPresent |
+ link=Portable Primate Habitat |
+ |
+
verifyTextPresent |
Portable Primate Habitat Equipment |
|
+
+ verifyTextPresent |
+ geographic location of |
+ |
+
+
+ verifyElementPresent |
+ link=Primate Research Lab Room 123 |
+ |
+
verifyTextPresent |
Primate Research Lab Room 123 Facility |
@@ -1389,6 +2329,16 @@
Lab Admin Office |
|
+
+ verifyTextPresent |
+ room within building |
+ |
+
+
+ verifyElementPresent |
+ link=Jane Memorial Building |
+ |
+
verifyTextPresent |
Jane Memorial Building Building |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 101c7675..f7a9a0d7 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -444,25 +444,35 @@
Edit |
|
+
+ type |
+ startField.year |
+ 2010 |
+
select |
- typeOfNew |
- label=Date/Time Interval (core) |
+ startField.month |
+ label=9 |
- clickAndWait |
- //input[@id='submit' and @value='add a new item to this list'] |
- |
-
-
- assertTitle |
- Edit |
- |
+ select |
+ startField.day |
+ label=1 |
type |
- name |
- 2010-09-01 to 2012-08-31 |
+ endField.year |
+ 2012 |
+
+
+ select |
+ endField.month |
+ label=8 |
+
+
+ select |
+ endField.day |
+ label=31 |
clickAndWait |
@@ -631,7 +641,7 @@
verifyTextPresent |
- 2010-09-01 to 2012-08-31 |
+ September 1, 2010 - August 31, 2012 |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 6f55b8cb..a04f4093 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -416,23 +416,38 @@
verifyTextPresent |
- Select an existing Date/Time Interval for Introduction to Primate Health |
- |
-
-
- clickAndWait |
- //input[@id='submit' and @value='add a new item to this list'] |
- |
-
-
- assertTitle |
- Edit |
+ Create date time interval for Introduction to Primate Health |
|
type |
- name |
- Fall Semester 2007 |
+ startField.year |
+ 2007 |
+
+
+ select |
+ startField.month |
+ label=9 |
+
+
+ select |
+ startField.day |
+ label=1 |
+
+
+ type |
+ endField.year |
+ 2007 |
+
+
+ select |
+ endField.month |
+ label=12 |
+
+
+ select |
+ endField.day |
+ label=15 |
clickAndWait |
@@ -636,7 +651,7 @@
verifyTextPresent |
- Fall Semester 2007 |
+ September 1, 2007 - December 15, 2007 |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 77630766..5dd4fe75 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -434,25 +434,35 @@
Edit |
|
+
+ type |
+ startField.year |
+ 2011 |
+
select |
- typeOfNew |
- label=Date/Time Interval (core) |
+ startField.month |
+ label=1 |
- clickAndWait |
- //input[@id='submit' and @value='add a new item to this list'] |
- |
-
-
- assertTitle |
- Edit |
- |
+ select |
+ startField.day |
+ label=5 |
type |
- name |
- 2011-01-05 to 2011-01-09 |
+ endField.year |
+ 2011 |
+
+
+ select |
+ endField.month |
+ label=1 |
+
+
+ select |
+ endField.day |
+ label=9 |
clickAndWait |
@@ -616,7 +626,7 @@
verifyTextPresent |
- 2011-01-05 to 2011-01-09 |
+ January 5, 2011 - January 9, 2011 |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
index 6b4207c4..125482c5 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
@@ -146,7 +146,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
index 8b62cf7a..43d5e847 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
@@ -151,7 +151,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index cdc892b2..a3c9b5e1 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -466,7 +466,7 @@
clickAndWait |
- //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img |
+ //h3[@id='hasSubOrganization']/a/img |
|
@@ -1039,21 +1039,6 @@
Edit |
|
-
- select |
- typeOfNew |
- label=Date/Time Interval (core) |
-
-
- clickAndWait |
- //input[@id='submit' and @value='add a new item to this list'] |
- |
-
-
- assertTitle |
- Edit |
- |
-
type |
startField.year |
@@ -1069,6 +1054,11 @@
Primate College of America |
|
+
+ assertTitle |
+ Primate College of America |
+ |
+
comment |
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index ac0c6a39..f10c38e3 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -149,6 +149,11 @@
equipment |
|
+
+ verifyTextPresent |
+ Academic Term (1) |
+ |
+
verifyTextPresent |
research |
@@ -186,7 +191,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -256,7 +261,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -331,7 +336,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -401,7 +406,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -471,7 +476,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -541,7 +546,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -616,7 +621,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -669,76 +674,6 @@
|
-
- clickAndWait |
- link=Academic Term |
- |
-
-
- assertTitle |
- Academic Term |
- |
-
-
- clickAndWait |
- link=Fall Semester 2007 |
- |
-
-
- assertTitle |
- Fall Semester 2007 |
- |
-
-
- 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 |
- |
-
-
- assertTitle |
- VIVO Site Administration |
- |
-
-
- clickAndWait |
- link=Index |
- |
-
-
- assertTitle |
- Index to VIVO Contents |
- |
-
clickAndWait |
link=Conference |
@@ -761,7 +696,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -831,7 +766,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -906,7 +841,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -976,7 +911,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1046,7 +981,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1116,7 +1051,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1181,7 +1116,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1256,7 +1191,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1326,7 +1261,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1401,7 +1336,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1466,7 +1401,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1531,7 +1466,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1601,7 +1536,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1671,7 +1606,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1741,7 +1676,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1811,7 +1746,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1886,7 +1821,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
@@ -1956,7 +1891,7 @@
clickAndWait |
- link=edit this individual |
+ link=Edit this individual |
|
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index cf5a22cf..78d8f556 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -141,7 +141,7 @@
verifyTextPresent |
- Primate Info | Database |
+ Primate Info | Database |
|
@@ -279,11 +279,6 @@
1234 Northern African Nation | Address |
|
-
- verifyTextPresent |
- Fall Semester 2007 | Academic Term |
- |
-
verifyTextPresent |
Librarian, Lily | Assistant Librarian |