From 799abb68c2858addc1a7eb11587dbc79d5f5623a Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 24 Jan 2011 20:11:44 +0000 Subject: [PATCH] Holly made additional changes to the AddNonPersonThings test suite. --- .../AddNonPersonThings/CreateActivity.html | 24 ++++---- .../AddNonPersonThings/CreateCourse.html | 26 ++++---- .../AddNonPersonThings/CreateEquipment.html | 8 +-- .../AddNonPersonThings/CreateEvent.html | 22 +++---- .../AddNonPersonThings/CreateLocation.html | 10 ++-- .../CreateOrganization.html | 60 ++++++++----------- .../AddNonPersonThings/CreateTopic.html | 12 ++-- .../AddNonPersonThings/DeleteIndexStuff.html | 5 -- 8 files changed, 76 insertions(+), 91 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index f7a9a0d7..f3aed1ed 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[1]/h3/a/img + //h3[@id='administeredBy']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='grantAwardedBy']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='abstract']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='grantSubcontractedThrough']/a @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='totalAwardAmount']/a/img @@ -351,7 +351,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[7]/h3/a/img + //h3[@id='grantDirectCosts']/a/img @@ -376,7 +376,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[8]/h3/a/img + //h3[@id='sponsorAwardId']/a/img @@ -406,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -436,7 +436,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -491,7 +491,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='localAwardId']/a/img @@ -526,7 +526,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='fundingVehicleFor']/a/img @@ -556,7 +556,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[2]/h3/a/img + //h3[@id='hasSubjectArea']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index a04f4093..d968cccd 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='description']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='courseOfferedBy']/a/img @@ -261,7 +261,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='organizer']/a/img @@ -281,7 +281,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='prerequisiteFor']/a/img @@ -306,7 +306,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[6]/h3/a/img + //h3[@id='contactInformation']/a/img @@ -341,7 +341,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -371,7 +371,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -406,7 +406,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeInterval']/a @@ -466,7 +466,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article/h3/a/img + //h3[@id='presents']/a/img @@ -521,7 +521,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='includesEvent']/a/img @@ -546,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -586,7 +586,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[4]/h3/a/img + //h3[@id='courseCredits']/a/img @@ -651,7 +651,7 @@ verifyTextPresent - September 1, 2007 - December 15, 2007 + September 1, 2007 - December 15, 2007 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index 0f76c3a7..5abfd3a5 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='equipmentFor']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='equipmentInFacility']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -326,7 +326,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index 5dd4fe75..f5b59f25 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[2]/h3/a/img + //h3[@id='description']/a/img @@ -236,7 +236,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[3]/h3/a/img + //h3[@id='hasProceedings']/a/img @@ -296,7 +296,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[4]/h3/a/img + //h3[@id='organizer']/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article[5]/h3/a/img + //h3[@id='contactInformation']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='geographicFocus']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -426,7 +426,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -481,7 +481,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article/h3/a/img + //h3[@id='presents']/a/img @@ -506,7 +506,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[2]/h3/a/img + //h3[@id='includesEvent']/a/img @@ -536,7 +536,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[1]/h3/a/img + //h3[@id='hasSubjectArea']/a/img @@ -561,7 +561,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article[3]/h3/a/img + //h3[@id='abbreviation']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 444eacff..81a90a17 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='facilityFor']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[1]/h3/a/img + //h3[@id='hasRoom']/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[2]/h3/a + //h3[@id='geographicallyContains']/a/img @@ -341,7 +341,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[1]/h3/a/img + //h3[@id='locationOfEquipment']/a/img @@ -366,7 +366,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='geographicLocationOf']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index a3c9b5e1..bcf8d576 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[4]/h3/a/img + //h3[@id='offersDegree']/a/img @@ -266,7 +266,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[2]/h3/a/img + //h3[@id='hasPredecessorOrganization']/a/img @@ -286,7 +286,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[5]/h3/a/img + //h3[@id='awardsGrant']/a/img @@ -321,7 +321,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[7]/h3/a/img + //h3[@id='sponsors']/a/img @@ -356,7 +356,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[8]/h3/a/img + //h3[@id='awardConferred']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[9]/h3/a/img + //h3[@id='hasEquipment']/a/img @@ -426,7 +426,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article[6]/h3/a/img + //h3[@id='subcontractsGrant']/a/img @@ -506,7 +506,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[2]/h3/a/img + //h3[@id='subOrganizationWithin']/a/img @@ -529,11 +529,6 @@ Edit - - type - name - Primate - type name @@ -551,7 +546,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[3]/h3/a/img + //h3[@id='organizationForPosition']/a/img @@ -581,7 +576,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[4]/h3/a/img + //h3[@id='hasLeaderRole']/a/img @@ -621,7 +616,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[5]/h3/a/img + //h3[@id='affiliatedOrganization']/a/img @@ -646,7 +641,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[6]/h3/a/img + //h3[@id='hasMemberRole']/a/img @@ -686,7 +681,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[7]/h3/a/img + //h3[@id='hasCollaborator']/a/img @@ -711,7 +706,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article[8]/h3/a/img + //h3[@id='hasClinicalRole']/a/img @@ -756,7 +751,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='authorInAuthorship']/a/img @@ -786,7 +781,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + //h3[@id='hasPresenterRole']/a @@ -831,7 +826,7 @@ clickAndWait - //div[@id='wrapper-content']/section[6]/article[1]/h3/a/img + //h3[@id='hasOutreachProviderRole']/a/img @@ -881,7 +876,7 @@ clickAndWait - //div[@id='wrapper-content']/section[7]/article/h3/a/img + //h3[@id='hasGeographicLocation']/a/img @@ -911,7 +906,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[1]/h3/a/img + //h3[@id='email']/a/img @@ -936,7 +931,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[2]/h3/a/img + //h3[@id='phoneNumber']/a/img @@ -961,7 +956,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[3]/h3/a/img + //h3[@id='faxNumber']/a/img @@ -986,7 +981,7 @@ clickAndWait - //div[@id='wrapper-content']/section[8]/article[4]/h3/a/img + //h3[@id='mailingAddress']/a/img @@ -1031,7 +1026,7 @@ clickAndWait - //div[@id='wrapper-content']/section[9]/article/h3/a/img + //h3[@id='dateTimeInterval']/a/img @@ -1054,11 +1049,6 @@ Primate College of America - - assertTitle - Primate College of America - - comment Test other entry @@ -1066,7 +1056,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[2]/h3/a/img + //h3[@id='abbreviation']/a/img @@ -1091,7 +1081,7 @@ clickAndWait - //div[@id='wrapper-content']/section[10]/article[3]/h3/a/img + //h3[@id='freetextKeyword']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index d8e481e2..20b5935c 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -206,7 +206,7 @@ clickAndWait - //div[@id='wrapper-content']/section[2]/article/h3/a/img + //h3[@id='broader']/a/img @@ -241,7 +241,7 @@ clickAndWait - //div[@id='wrapper-content']/section[3]/article/h3/a/img + //h3[@id='researchAreaOf']/a/img @@ -271,7 +271,7 @@ clickAndWait - //div[@id='wrapper-content']/section[4]/article/h3/a/img + //h3[@id='sourceVocabularyReference']/a/img @@ -316,7 +316,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[1]/h3/a/img + //h3[@id='subjectAreaFor']/a/img @@ -346,7 +346,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[2]/h3/a/img + //h3[@id='narrower']/a/img @@ -391,7 +391,7 @@ clickAndWait - //div[@id='wrapper-content']/section[5]/article[3]/h3/a/img + //h3[@id='related']/a/img diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index fecd8130..ceb7ed11 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -149,11 +149,6 @@ equipment - - verifyTextPresent - Academic Term (1) - - verifyTextPresent research