From ad93f4bde8b32687eef819ea77df42a9e23f5407 Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 6 Dec 2013 12:25:36 -0500 Subject: [PATCH 01/33] minor css tweaks --- productMods/js/homePageUtils.js | 4 ++-- productMods/templates/freemarker/lib/lib-home-page.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/productMods/js/homePageUtils.js b/productMods/js/homePageUtils.js index 1341292b..7c5410ba 100644 --- a/productMods/js/homePageUtils.js +++ b/productMods/js/homePageUtils.js @@ -60,7 +60,7 @@ $(document).ready(function(){ getFacultyMembers(); } else { - individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; + individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; $('div#tempSpacing').hide(); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); } @@ -95,7 +95,7 @@ $(document).ready(function(){ }); } else { - individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; + individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; $('div#tempSpacing').hide(); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').css("padding", "1.0em 0 0.825em 0.75em"); diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl index 9d46e731..61fddcb0 100644 --- a/productMods/templates/freemarker/lib/lib-home-page.ftl +++ b/productMods/templates/freemarker/lib/lib-home-page.ftl @@ -141,7 +141,7 @@ <#if !foundClassGroup> -

  • ${i18n().no_research_content_found}

    • +

  • ${i18n().no_research_content_found}

    • From dba0fafea1b8f32596be6b0764155d39174e3d17 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Fri, 6 Dec 2013 12:51:03 -0500 Subject: [PATCH 02/33] VIVO-624 removed 8 object properties whose domain or range classes aren't being included --- rdf/tbox/filegraph/object-properties.owl | 123 ------------------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 43 ------- 2 files changed, 166 deletions(-) diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index 6820cc96..f9037fbf 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -351,61 +351,6 @@ - - - - - Imaging processing software that requires .jpg format files for analysis. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Software data input format. - has input format - - - - - - - - - - - - - - - - - - - Microsoft Excel arranges and saves data in .xlsx format. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Software data output type. - has output format - - - - - - - - - - - - ImageJ software measures characteristics of digital images. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Transformation objective of the software. - achieves objective - - - - - - - @@ -631,24 +576,6 @@ - - - - - PERSON: Melissa Haendel - PERSON: Melissa Haendel - Paraffin embedding of tissue. - Technique used to prepare the biological specimen. - has preparation technique - - - - - - - - - @@ -699,48 +626,6 @@ - - - - - - - - - - - - - - - - Is a legal instrument (usually by way of contract law) governing the usage or redistribution of software. - PERSON: Scott Hoffmann - http://en.wikipedia.org/wiki/Software_license - - - - - - - - - - - - Links an objective to a software operation whise execution achieves the objective. Is different from OBI:objective_achieved_by which links an objective to the process that achieves it. - PERSON:Matthew Brush - PERSON:Matthew Brush - a relation between a software objective (data transformation objective) and an operation whose execution in a software tool achieves the objective - software relation expanding to something like: - -objective_achieved_by some ('software/algorithm execution' and (specified_by some 'data processing operation')) - - - - - - @@ -1935,14 +1820,6 @@ there is a measurement process p that has specified output m, a measurement datu - - - - - - - - diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 558ff364..9ce05f6f 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -556,13 +556,6 @@ geo:territory vcard:OrganizationName rdfs:label "Organization Name"@en-US . -obo:ERO_0000076 - rdfs:label "has input type"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . - vivo:researchAreaOf rdfs:label "research area of"@en-US ; vitro:displayLimitAnnot @@ -705,13 +698,6 @@ obo:IAO_0000142 vivo:submitted rdfs:label "submitted"@en-US . -obo:ERO_0000077 - rdfs:label "has output type"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . - bibo:Issue rdfs:label "Issue"@en-US ; vitro:displayLimitAnnot @@ -797,9 +783,6 @@ vitro:moniker vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0000078 - rdfs:label "achieves objective"@en-US . - geo:codeFAOSTAT rdfs:label "codeFAOSTAT"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1008,9 +991,6 @@ vivo:Continent vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001908 - rdfs:label "objective achieved by operation"@en-US . - geo:nameOfficialRU rdfs:label "nameOfficialRU"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1372,9 +1352,6 @@ vivo:PopulatedPlace vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001811 - rdfs:label "has format"@en-US . - vivo:FacultyAdministrativePosition rdfs:label "Faculty Administrative Position"@en-US ; vitro:displayLimitAnnot @@ -2658,23 +2635,6 @@ bibo:Website vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001057 - rdfs:label "has preparation technique"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "53"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . - obo:BFO_0000003 rdfs:label "Occurrent" . @@ -4225,9 +4185,6 @@ vivo:Screenplay vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001824 - rdfs:label "has software license"@en-US . - geo:nameOfficialAR rdfs:label "nameOfficialAR"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot From f7863669e8669d086305ed86c8b5b53752001fea Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Fri, 6 Dec 2013 13:23:57 -0500 Subject: [PATCH 03/33] Minor changes to hide additional eagle-i properties that are deprecated or involve classes not currently in VIVO --- rdf/display/everytime/PropertyConfig.n3 | 61 +++---- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 157 +++++++++++-------- 2 files changed, 122 insertions(+), 96 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 8c5b81d0..d96824b5 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1323,38 +1323,39 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . - -local:projectUsesMaterialEntityContext a :ConfigContext ; - :hasConfiguration local:projectUsesMaterialEntityConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Project ; - :qualifiedBy . ## Material Entity -local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "uses equipment or instrument" ; - vitro:displayRankAnnot 85; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - :propertyGroup . - -local:materialEntityUsedByProjectContext a :ConfigContext ; - :hasConfiguration local:MaterialEntityUsedByProjectConfig ; - :configContextFor ; - :qualifiedByDomain ; ## Material Entity - :qualifiedBy vivo:Project . +# uses and used by need work -- apply to continuants and occurrents, and material entities as well as information content entities +#local:projectUsesMaterialEntityContext a :ConfigContext ; +# :hasConfiguration local:projectUsesMaterialEntityConfig ; +# :configContextFor ; +# :qualifiedByDomain vivo:Project ; +# :qualifiedBy . ## Material Entity -local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "used by project" ; - vitro:displayRankAnnot 85; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - :propertyGroup . +#local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; +# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :displayName "uses specimen, equipment, instrument, organism, reagent, or software" ; +# vitro:displayRankAnnot 85; +# vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; +# vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; +# vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; +# vitro:selectFromExistingAnnot "true"^^xsd:boolean ; +# :propertyGroup . + +#local:materialEntityUsedByProjectContext a :ConfigContext ; +# :hasConfiguration local:MaterialEntityUsedByProjectConfig ; +# :configContextFor ; +# :qualifiedByDomain ; ## Material Entity +# :qualifiedBy vivo:Project . + +#local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; +# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :displayName "used by project" ; +# vitro:displayRankAnnot 85; +# vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; +# vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; +# vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; +# vitro:selectFromExistingAnnot "true"^^xsd:boolean ; +# :propertyGroup . local:facilityLocationOfEquipmentContext a :ConfigContext ; :hasConfiguration local:facilityLocationOfEquipmentConfig ; diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 558ff364..ec55fc93 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -25,7 +25,8 @@ vivo:pmcid . obo:ERO_0000071 - rdfs:label "Software"@en-US . + rdfs:label "Software"@en-US ; + vitro:inClassGroup . bibo:Note rdfs:label "Note"@en-US ; @@ -1648,7 +1649,7 @@ vivo:Contract "-1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inClassGroup ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . @@ -1868,22 +1869,22 @@ bibo:doi bibo:accepted rdfs:label "accepted"@en-US . -obo:ERO_0000070 +obo:ERO_0000070 ## inverse of ERO_0000031 rdfs:label "used by"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "15"^^xsd:int ; +# vitro:displayLimitAnnot +# "2"^^xsd:int ; +# vitro:displayRankAnnot +# "15"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . vcard:Email rdfs:label "Email"@en-US . @@ -2660,20 +2661,20 @@ bibo:Website obo:ERO_0001057 rdfs:label "has preparation technique"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "53"^^xsd:int ; +# vitro:displayLimitAnnot +# "2"^^xsd:int ; +# vitro:displayRankAnnot +# "53"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . obo:BFO_0000003 rdfs:label "Occurrent" . @@ -3992,20 +3993,20 @@ obo:ERO_0000572 obo:RO_0001000 rdfs:label "derives from"@en-US ; ## note -- has a "some values from" restriction on Organism - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "50"^^xsd:int ; +# vitro:displayLimitAnnot +# "5"^^xsd:int ; +# vitro:displayRankAnnot +# "50"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . bibo:gtin14 @@ -4063,7 +4064,17 @@ vcard:Fax rdfs:label "Fax"@en-US . obo:ERO_0001521 - rdfs:label "human study performed by"@en-US . + rdfs:label "performed by organization"@en-US ; + vitro:displayRankAnnot + "20"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + vivo:nihmsid rdfs:label "NIH Manuscript Submission System ID"@en-US ; @@ -4724,22 +4735,22 @@ vcard:hasLanguage vcard:hasURL rdfs:label "has URL"@en-US . -obo:ERO_0000482 +obo:ERO_0000482 # deprecated rdfs:label "uses software"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "92"^^xsd:int ; +# vitro:displayLimitAnnot +# "5"^^xsd:int ; +# vitro:displayRankAnnot +# "92"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; - vitro:inPropertyGroupAnnot - . + . +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean ; +# vitro:inPropertyGroupAnnot +# . vivo:ResearchProposal rdfs:label "Research Proposal"@en-US ; @@ -6142,20 +6153,20 @@ vcard:Muse obo:ERO_0000034 rdfs:label "manufacturer"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "73"^^xsd:int ; +# vitro:displayLimitAnnot +# "2"^^xsd:int ; +# vitro:displayRankAnnot +# "73"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . geo:area @@ -6513,7 +6524,21 @@ vcard:hasRelated rdfs:label "has related"@en-US . obo:ERO_0000424 - rdfs:label "has study population"@en-US . + rdfs:label "has study population"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "15"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:ARG_2000079 rdfs:label "American Board of Pathology"@en-US . From e16acae5411bf3c93190c7bdd3cbe978bc991e8c Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 6 Dec 2013 16:51:07 -0500 Subject: [PATCH 04/33] some template clean up that wasn't of blocker significance --- .../body/individual/individual--foaf-person-2column.ftl | 2 +- .../body/individual/individual--foaf-person-quickview.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 2de768a2..712f5b33 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -61,7 +61,7 @@ <@p.verboseDisplay title /> <#list title.statements as statement> - ${statement.preferredTitle} + ${statement.preferredTitle} <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri /> diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl index 4ac95fce..a5dbae08 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl @@ -69,7 +69,7 @@ <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if (title.statements?size < 1) > <@p.addLinkWithLabel title editable /> - <#else> + <#elseif editable>

    ${title.name?capitalize!}

    <@p.verboseDisplay title /> From 46db6f69338585912560ac798c5e4217721f5723 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Fri, 6 Dec 2013 16:56:40 -0500 Subject: [PATCH 05/33] =?UTF-8?q?Added=20Software=20to=20the=20class=20gro?= =?UTF-8?q?up=20publications=20(=E2=80=9Cresearch=E2=80=9D);=20corrected?= =?UTF-8?q?=20class=20group=20name=20on=20Protocol;=20relabeled=20?= =?UTF-8?q?=E2=80=9Cdocumentation=20for=20service=E2=80=9D=20to=20?= =?UTF-8?q?=E2=80=9Cdocumentation=20for=20project=20or=20resource=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 9affa1b9..28aaa3ff 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -25,7 +25,8 @@ vivo:pmcid . obo:ERO_0000071 - rdfs:label "Software"@en-US . + rdfs:label "Software"@en-US ; + vitro:inClassGroup . bibo:Note rdfs:label "Note"@en-US ; @@ -400,7 +401,7 @@ obo:OBI_0000643 obo:OBI_0000272 rdfs:label "Protocol"@en-US ; - vitro:inClassGroup . + vitro:inClassGroup . vcard:Identification rdfs:label "Identification"@en-US . @@ -6460,7 +6461,7 @@ obo:ERO_0001716 rdfs:label "Database"@en-US . - rdfs:label "documentation for service"@en-US ; + rdfs:label "documentation for project or resource"@en-US ; vitro:displayLimitAnnot "2"^^xsd:int ; vitro:displayRankAnnot From bd929d7158bbdef5c5b26fa932cae5da4fb20e1c Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Fri, 6 Dec 2013 18:16:25 -0500 Subject: [PATCH 06/33] added inverse property relationship between bibo:translator and vivo:translatorOf --- rdf/tbox/filegraph/object-properties.owl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index f9037fbf..be6d0dc9 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -1211,7 +1211,7 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1522,6 +1522,7 @@ there is a measurement process p that has specified output m, a measurement datu + From 1a69b23b60031a010a90dd3ef0905e3f329338d3 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Fri, 6 Dec 2013 18:41:09 -0500 Subject: [PATCH 07/33] Added inverse property relationship between vivo:offers and vivo:offeredBy --- rdf/tbox/filegraph/object-properties.owl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index be6d0dc9..fbd79d5b 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -1407,7 +1407,7 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1415,7 +1415,7 @@ there is a measurement process p that has specified output m, a measurement datu - + From efeee37b4f49eb04cf736d6d2fdd7fb761210536 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Sun, 8 Dec 2013 00:01:43 -0500 Subject: [PATCH 08/33] Holly committed first batch of test case updates from testing RC 4. --- .../CheckMapOfScience/AddPublications.html | 10 +- .../TestTemporalGraphs.html | 16 +- .../suites/CustomAdvisesForm/AddAdvises.html | 2 +- .../suites/CustomAwardsForm/AddAwards.html | 109 ++++++-- .../suites/CustomAwardsForm/DeleteAwards.html | 5 + .../suites/InitialSetup/EditSiteInfo.html | 10 +- .../LinkedOpenData/CheckDataHiding.html | 192 +++++++++++++++ .../LinkedOpenData/RebuildSearchIndex.html | 107 ++++++++ .../suites/LinkedOpenData/Suite.html | 18 ++ .../suites/LinkedOpenData/TestRDFAccept.html | 103 ++++++++ .../LinkedOpenData/TestUserCreated.html | 94 +++++++ .../LinkedOpenData/TestVariousRequests.html | 233 ++++++++++++++++++ .../suites/SelfEditing/AddSelfEditorId.html | 34 +-- .../SelfEditing/CreateNewSelfEditorUser.html | 2 +- 14 files changed, 861 insertions(+), 74 deletions(-) create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/Suite.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html diff --git a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html index f65cac1d..2e5e8c27 100644 --- a/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckMapOfScience/AddPublications.html @@ -1180,11 +1180,6 @@ link=Map of Science - - pause 10000 - - - assertTitle Furter, Frank - Map of Science Visualization @@ -1195,6 +1190,11 @@ Furter, Frank + + pause + 10000 + + verifyElementPresent id=entityMoniker diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index 806f5541..20a7f319 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -103,7 +103,7 @@ click - //div[@id='wrapper-content']/ul/li[16] + css=li.nonSelectedGroupTab.clickable @@ -888,8 +888,18 @@ - verifyTextPresent - Child Development + selectWindow + null + + + + click + css=li.nonSelectedGroupTab.clickable + + + + verifyElementPresent + link=Child Development diff --git a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html index 289fba30..9f9f0ceb 100644 --- a/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html +++ b/utilities/acceptance-tests/suites/CustomAdvisesForm/AddAdvises.html @@ -93,7 +93,7 @@ clickAndWait - xpath=(//img[@alt='add'])[24] + xpath=(//img[@alt='add'])[28] diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index dc11e549..56866b16 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -93,7 +93,7 @@ assertTitle - Edit + Faculty, Jane @@ -411,13 +411,18 @@ - click - css=li.nonSelectedGroupTab.clickable + verifyTextPresent + Best Professor - verifyElementPresent - link=Carroll College + verifyTextPresent + Award or Honor + + + + selectWindow + null @@ -427,7 +432,7 @@ clickAndWait - link=Best Professor (Faculty, Jane - 2012) + css=a[title="name"] @@ -435,6 +440,11 @@ Best Professor (Faculty, Jane - 2012) + + verifyTextPresent + Yearly award for the best professor across departments. + + verifyElementPresent link=Best Professor @@ -442,7 +452,7 @@ verifyTextPresent - Faculty, Jane Assistant Professor + Faculty, Jane   Assistant Professor @@ -451,8 +461,8 @@ - verifyTextPresent - Yearly award for the best professor across departments. + verifyElementPresent + link=Carroll College @@ -501,8 +511,13 @@ - verifyElementPresent - link=Carroll College + verifyTextPresent + Professor of the Decade + + + + verifyTextPresent + Award or Honor @@ -512,7 +527,7 @@ clickAndWait - link=Professor of the Decade (Faculty, Jane - 2010) + css=a[title="name"] @@ -522,12 +537,42 @@ verifyTextPresent - Professor of the Decade + Professor of the Decade (Faculty, Jane - 2010) + + + + clickAndWait + link=Professor of the Decade + + + + clickAndWait + css=a[title="name"] + + + + assertTitle + Professor of the Decade (Faculty, Jane - 2010) + + + + assertTitle + Professor of the Decade (Faculty, Jane - 2010) verifyTextPresent - Faculty, Jane Assistant Professor + Professor of the Decade (Faculty, Jane - 2010) + + + + verifyElementPresent + link=Professor of the Decade + + + + verifyTextPresent + Faculty, Jane   Assistant Professor @@ -535,6 +580,11 @@ link=Faculty, Jane + + verifyElementPresent + link=Carroll College + + verifyTextPresent 2000 - 2010 @@ -586,13 +636,13 @@ - click - //div[@id='wrapper-content']/ul/li[6] + verifyTextPresent + Primate Expert - verifyElementPresent - link=Primates-R-Us + verifyTextPresent + Award or Honor @@ -611,18 +661,23 @@ - verifyElementPresent - link=Primate Expert - - - - assertTitle + verifyTextPresent Primate Expert (Faculty, Jane - 2005) verifyTextPresent - Faculty, Jane Assistant Professor + Yearly award for the person who does the most to improve the life of primates. + + + + verifyElementPresent + link=Primate Expert + + + + verifyTextPresent + Faculty, Jane   Assistant Professor @@ -631,8 +686,8 @@ - verifyTextPresent - Yearly award for the person who does the most to improve the life of primates. + verifyElementPresent + link=Primates-R-Us diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html index c37aa286..a8ef132f 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/DeleteAwards.html @@ -86,6 +86,11 @@ + + click + //div[@id='wrapper-content']/ul/li[18] + + clickAndWait css=a.delete-relatedBy > img.delete-individual diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index a78d0b39..5aecf35b 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6-rc3 + Version rel-1.6-rc4 verifyElementPresent - link=rel-1.6-rc3 + link=rel-1.6-rc4 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6-rc3 + Version rel-1.6-rc4 @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6-rc3 + Version rel-1.6-rc verifyElementPresent - link=rel-1.6-rc3 + link=rel-1.6-rc4 diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html new file mode 100644 index 00000000..72f3b950 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html @@ -0,0 +1,192 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CreateTestFacultyMember
    deleteAllVisibleCookies
    setTimeout100000000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    open/vivo/individual/lodFacultyMember/lodFacultyMember.rdf
    pause10000
    verifyTextPresentvivo:eRACommonsId
    verifyTextNotPresentvivo:scopusId
    clickAndWaitlink=Log out
    verifyTextNotPresentScopus Id
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    open/vivo/individual/lodFacultyMember/lodFacultyMember.rdf
    pause10000
    verifyTextPresentvivo:eRACommonsId
    verifyTextPresentvivo:scopusId
    verifyTextNotPresentScopus Id
    clickAndWaitlink=Log out
    open/vivo/
    + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html b/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html new file mode 100644 index 00000000..65a1371d --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/RebuildSearchIndex.html @@ -0,0 +1,107 @@ + + + + + + +RebuildSearchIndex + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RebuildSearchIndex
    deleteAllVisibleCookies
    setTimeout100000000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    clickAndWaitlink=Site Admin
    assertTitleVIVO Site Administration
    clickAndWaitlink=Rebuild search index
    assertTitleRebuild Search Index
    clickAndWaitname=rebuild
    assertTitleRebuild Search Index
    waitForTextPresentReset the search index and re-populate it.
    clickAndWaitlink=Log out
    + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html b/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html new file mode 100644 index 00000000..985a3c1d --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html @@ -0,0 +1,18 @@ + + + + + + Test Suite + + + + + + + + + +
    Test Suite
    RebuildSearchIndex
    TestUserCreated
    TestVariousRequests
    CheckDataHiding
    TestRDFAccept
    + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html new file mode 100644 index 00000000..c79731c3 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html @@ -0,0 +1,103 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CreateTestFacultyMember
    deleteAllVisibleCookies
    setTimeout100000000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    open/vivo/TestLinkedOpenData.html
    pause10000
    verifyTextPresent?????
    clickAndWaitlink=Log out
    open/vivo/
    + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html new file mode 100644 index 00000000..52117c10 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html @@ -0,0 +1,94 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CreateTestFacultyMember
    deleteAllVisibleCookies
    setTimeout100000000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    open/vivo/display/lodFacultyMember
    pause10000
    verifyTextPresent?????
    clickAndWaitlink=Log out
    open/vivo/
    + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html new file mode 100644 index 00000000..2736a519 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html @@ -0,0 +1,233 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CreateTestFacultyMember
    deleteAllVisibleCookies
    setTimeout100000000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeid=loginNametestAdmin@cornell.edu
    typeid=loginPasswordPassword
    clickAndWaitname=loginForm
    assertTitleVIVO
    open/vivo/individual/lodFacultyMember/lodFacultyMember.rdf
    pause10000
    verifyTextPresent?????
    open/vivo/display/lodFacultyMember?format=rdfxml
    pause10000
    verifyTextPresent?????
    open/vivo/individual/lodFacultyMember/lodFacultyMember.jsonld
    pause10000
    verifyTextPresent?????
    open/vivo/display/lodFacultyMember?format=jsonld
    pause10000
    verifyTextPresent?????
    open/vivo/individual/lodFacultyMember/lodFacultyMember.n3
    pause10000
    verifyTextPresent?????
    open/vivo/display/lodFacultyMember?format=n3
    pause10000
    verifyTextPresent?????
    open/vivo/individual/lodFacultyMember/lodFacultyMember.ttl
    pause10000
    verifyTextPresent?????
    open/vivo/display/lodFacultyMember?format=ttl
    pause10000
    verifyTextPresent?????
    open/vivo/display/bogus?format=jsonld
    clickAndWaitlink=Log out
    open/vivo/
    + + diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html index 85c6d68c..8ca76151 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html +++ b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html @@ -121,11 +121,6 @@ Faculty, Jane - - selectWindow - null - - click //div[@id='wrapper-content']/ul/li[18] @@ -136,32 +131,7 @@ JaneFaculty@cornell.edu - - - clickAndWait - link=Log out - - - - assertTitle - VIVO - - - - type - loginName - testAdmin@cornell.edu - - - type - loginPassword - Password - - - clickAndWait - loginForm - - + clickAndWait link=Site Admin @@ -195,7 +165,7 @@ type id=associateProfileName - Facult + Facul click diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html index 1b5b3afd..03314d62 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html @@ -118,7 +118,7 @@ type id=associateProfileName - Faculty, Jane + Faculy, Jane click From 5bd4d5f89373530d89beace9f54df20ad1133e66 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Sun, 8 Dec 2013 17:03:22 -0500 Subject: [PATCH 09/33] Holly made another round of test case changes, mostly to help test cases run more smoothly. --- .../suites/AddPublications/AddConference.html | 10 + .../AddPublications/CheckIndexView.html | 10 + .../AddPublications/CheckPublicView.html | 145 +++--- .../AddPublications/DeleteIndexStuff.html | 70 +++ .../DeleteValidationStuff.html | 229 ++++++++- .../AddPublications/SearchPublications.html | 4 +- .../AddPublications/ValidateFields.html | 478 +++++++++--------- .../AddRoles/AddFacultyMemberRoles2.html | 29 +- .../AddRoles/AddFacultyMemberRoles3.html | 7 +- .../suites/AddRoles/AddLibrarianRoles1.html | 2 +- .../suites/AddRoles/CheckPublicView.html | 4 +- .../suites/AddRoles/CheckRepairMode.html | 9 +- .../suites/AddRoles/DeleteIndexStuff.html | 117 ++++- .../suites/AddRoles/GrantDisplay.html | 10 +- .../AddRoles/VerifyAllRolesSearchable.html | 18 +- 15 files changed, 779 insertions(+), 363 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index ca9ac4c2..5980aacb 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -478,6 +478,16 @@ link=Conference Paper + + verifyTextPresent + Journal (1) + + + + verifyElementPresent + link=Journal + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html index a81773a1..30181d85 100644 --- a/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddPublications/CheckIndexView.html @@ -180,6 +180,16 @@ link=Conference Paper + + verifyTextPresent + Journal (1) + + + + verifyElementPresent + link=Journal + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html index c209f16e..7c724659 100644 --- a/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddPublications/CheckPublicView.html @@ -147,31 +147,11 @@ link=Sony, Sunny - - verifyTextPresent - 765 - - - - verifyTextPresent - 13 - - - - verifyTextPresent - 876 - - verifyElementPresent link=Marcel Dekker - - verifyTextPresent - New York - - verifyElementPresent link=Child Development @@ -179,7 +159,17 @@ verifyTextPresent - Child Development + 13 + + + + verifyElementPresent + link=Kids in the 21st Century + + + + verifyTextPresent + Children @@ -189,7 +179,17 @@ verifyTextPresent - Children + 765 + + + + verifyTextPresent + 876 + + + + verifyTextPresent + New York @@ -279,16 +279,6 @@ link=Furter, Frank - - verifyElementPresent - link=Putnam - - - - verifyTextPresent - New York - - verifyElementPresent link=in press @@ -300,8 +290,8 @@ - verifyTextPresent - 258 + verifyElementPresent + link=Putnam @@ -309,6 +299,16 @@ link=Child Development + + verifyTextPresent + Children + + + + verifyTextPresent + Games + + verifyTextPresent 5555555555 @@ -321,12 +321,12 @@ verifyTextPresent - Games + 258 verifyTextPresent - Children + New York @@ -355,44 +355,34 @@ Too Much Nintendo - - verifyTextPresent - Supplement - - verifyElementPresent link=Furter, Frank - - verifyTextPresent - 29 - - - - verifyTextPresent - 298 - - - - verifyTextPresent - 344 - - verifyTextPresent 2010 - verifyTextPresent - 987654321.1234567890 + verifyElementPresent + link=Child Development + + + + verifyElementPresent + link=Child Development verifyTextPresent - ABC111222333 + Children + + + + verifyTextPresent + Games @@ -411,18 +401,33 @@ - verifyElementPresent - link=Child Development + verifyTextPresent + 987654321.1234567890 verifyTextPresent - Children + ABC111222333 verifyTextPresent - Games + 298 + + + + verifyTextPresent + 344 + + + + verifyTextPresent + 29 + + + + verifyTextPresent + Supplement @@ -528,7 +533,7 @@ verifyElementPresent - link=exact:Nintendo: Good or Bad for Kids? + link=Nintendo: Good or Bad for Kids? @@ -562,10 +567,20 @@ - verifyElementPresent + click link=Conference Paper (1) + + pause + 5000 + + + + verifyElementPresent + link=Nintendo Case Studies + + click link=Journal (1) diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html index cd684da3..3dc72603 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html @@ -347,6 +347,76 @@ link=Index + + clickAndWait + link=Journal + + + + assertTitle + Journal + + + + clickAndWait + link=Child Development + + + + assertTitle + Child Development + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + pause diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html index 89248bba..1f7f7f10 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html @@ -71,6 +71,11 @@ people + + verifyTextPresent + activities + + verifyTextPresent events @@ -542,7 +547,7 @@ link=Index - + clickAndWait link=Competition @@ -843,6 +848,216 @@ Index of Contents + + clickAndWait + link=Service + + + + assertTitle + Service + + + + clickAndWait + link=Kids Now Conference + + + + assertTitle + Kids Now Conference + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Book + + + + assertTitle + Book + + + + clickAndWait + link=Raising Children in the 21st Century + + + + assertTitle + Raising Children in the 21st Century + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Chapter + + + + assertTitle + Chapter + + + + clickAndWait + link=Kids Now Conference Proceedings + + + + assertTitle + Kids Now Conference Proceedings + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + refreshAndWait 10000 @@ -876,7 +1091,12 @@ verifyTextNotPresent - topics + research + + + + verifyTextNotPresent + activities @@ -889,11 +1109,6 @@ organizations - - verifyTextNotPresent - publications - - clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html index 1c657d6b..5a1744e9 100644 --- a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html +++ b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html @@ -141,7 +141,7 @@ verifyTextPresent - Child Development + Child Development Journal @@ -207,7 +207,7 @@ verifyTextPresent - Child Development + Child Development Journal diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 62ddaf8a..36f7fde8 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -172,7 +172,7 @@ - click + clickAndWait link=Cancel @@ -666,16 +666,6 @@ submit - - assertTitle - Nintendo O.K. for Kids - - - - clickAndWait - css=img.add-individual - - assertTitle Edit @@ -892,66 +882,10 @@ Mouse, Minnie - - - verifyTextPresent - Add new entry for: chapter - - - - verifyTextPresent - A chapter number. NOT to be used for the chapter title, which should be entered in the "name" field instead (the field in bold at the top of the page) - - - - clickAndWait - link=Cancel - - - - pause - 10000 - - - - assertTitle - Nintendo O.K. for Kids - - - - clickAndWait - //h3[@id='chapter']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - 15 - - - clickAndWait - submit - - - - assertTitle - Nintendo O.K. for Kids - - clickAndWait - //h3[@id='features']/a/img + css=a.add-features > img.add-individual @@ -961,7 +895,7 @@ verifyTextPresent - Add an entry to: features + Select an existing Agent for Nintendo O.K. for Kids @@ -991,7 +925,7 @@ verifyTextPresent - Add an entry to: features + Select an existing Agent for Nintendo O.K. for Kids @@ -1316,7 +1250,7 @@ select typeOfNew - label=Document Part (bibo) + label=Chapter (bibo) clickAndWait @@ -1356,7 +1290,12 @@ verifyTextPresent - Add an entry to: part of + Select an existing Document for Nintendo O.K. for Kids + + + + verifyTextPresent + If you don't find the appropriate entry on the selection list above: @@ -1381,8 +1320,18 @@ select - id=objectVar - label=Nintendo O.K. for Kids + id=typeOfNew + label=Book (bibo) + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + type @@ -1948,12 +1897,27 @@ select - objectVar - label=Nintendo: Good or Bad for Kids? + id=typeOfNew + label=Book (bibo) clickAndWait - submit + id=offerCreate + + + + assertTitle + Edit + + + + type + id=name + Nintendo: Good or Bad for Kids? + + + clickAndWait + id=submit @@ -2111,8 +2075,9 @@ type id=name - Kids + Kids Now C + click id=ui-active-menuitem @@ -2333,8 +2298,9 @@ type id=name - Kids Now + Kids Now C + click id=ui-active-menuitem @@ -2353,7 +2319,7 @@ clickAndWait - css=a.add-BFO_0000050 > img.add-individual + css=a.add-RO_0002353 > img.add-individual @@ -2363,7 +2329,7 @@ verifyTextPresent - Add an entry to: part of + Select an existing Process for Nintendo O.K. for Kids @@ -2388,7 +2354,7 @@ clickAndWait - css=a.add-partOf > img.add-individual + css=a.add-RO_0002353 > img.add-individual @@ -2396,6 +2362,11 @@ Edit + + select + id=objectVar + label=Kids Now! + clickAndWait id=submit @@ -2419,12 +2390,7 @@ verifyTextPresent - Select an existing Information Content Entity for Nintendo O.K. for Kids - - - - verifyTextPresent - Information Content Entity Name + Select an existing Document for Nintendo O.K. for Kids @@ -2459,12 +2425,7 @@ verifyTextPresent - Select an existing Information Content Entity for Nintendo O.K. for Kids - - - - verifyTextPresent - Information Content Entity Name + Select an existing Document for Nintendo O.K. for Kids @@ -2477,6 +2438,11 @@ link=Cancel + + select + id=typeOfNew + label=Academic Article (bibo) + clickAndWait id=offerCreate @@ -2492,6 +2458,11 @@ link=Cancel + + assertTitle + Edit + + verifyTextPresent Create "cited by" entry for Nintendo O.K. for Kids @@ -2538,6 +2509,11 @@ link=Cancel + + select + id=typeOfNew + label=Academic Article (bibo) + clickAndWait id=offerCreate @@ -2573,6 +2549,11 @@ Edit + + select + id=typeOfNew + label=Academic Article (bibo) + clickAndWait id=offerCreate @@ -2599,19 +2580,19 @@ - - verifyElementPresent - //img[@title='click to view larger image'] - - verifyElementPresent link=Company Homepage + + click + //div[@id='wrapper-content']/ul/li[12] + + verifyTextPresent - Company Homepage + This is a chapter in a book that provides various professional viewpoints as to the impact of Nintendo usage on kids. @@ -2625,13 +2606,123 @@ - verifyTextPresent - 1 + verifyElementPresent + link=Mouse, Minnie + + + + verifyElementPresent + link=published verifyTextPresent - 9 + 2009 + + + + verifyElementPresent + link=Marcel Dekker + + + + verifyElementPresent + link=Child Development + + + + verifyElementPresent + link=Kids Now Conference Proceedings + + + + verifyElementPresent + link=Nintendo: Good or Bad for Kids? + + + + verifyTextPresent + 15 + + + + verifyTextPresent + Mouse, Minnie  Person + + + + verifyElementPresent + link=Mouse, Minnie + + + + verifyElementPresent + link=Raising Children in the 21st Century + + + + verifyElementPresent + link=United States of America + + + + verifyElementPresent + link=Kids Now Conference + + + + verifyElementPresent + link=Kids Now! + + + + verifyElementPresent + link=Kids Now Conference + + + + verifyElementPresent + link=Kids Now! + + + + verifyTextPresent + Children + + + + verifyElementPresent + link=Kids Today + + + + verifyElementPresent + link=Children Today + + + + verifyElementPresent + link=Kids of the 21st Century + + + + verifyTextPresent + 1234-5678-90 + + + + verifyTextPresent + 123456789 + + + + verifyTextPresent + 99 + + + + verifyTextPresent + 22 @@ -2646,17 +2737,7 @@ verifyTextPresent - Mouse, Minnie - - - - verifyElementPresent - link=Marcel Dekker - - - - verifyTextPresent - Marcel Dekker + 1 @@ -2664,126 +2745,16 @@ New York - - verifyTextPresent - This is a chapter in a book that provides various professional viewpoints as to the impact of Nintendo usage on kids. - - - - verifyElementPresent - link=Raising Children in the 21st Century - - - - verifyTextPresent - Raising Children in the 21st Century - - - - verifyElementPresent - link=Kids Now! - - - - verifyTextPresent - Kids Now! - - - - verifyElementPresent - link=published - - - - verifyTextPresent - published - - - - verifyElementPresent - link=Kids Now Conference Proceedings - - - - verifyTextPresent - Kids Now Conference Proceedings - - - - verifyElementPresent - link=exact:Nintendo: Good or Bad for Kids? - - - - verifyTextPresent - Nintendo: Good or Bad for Kids? - - - - verifyElementPresent - link=United States of America - - - - verifyTextPresent - 2009 - - - - verifyTextPresent - 123456789 - - - - verifyTextPresent - 1234-5678-90 - - - - verifyTextPresent - 15 - - - - verifyTextPresent - 22 - - - - verifyElementPresent - link=Child Development - - - - verifyTextPresent - Child Development - - - - verifyTextPresent - Children - - verifyElementPresent link=Nintendo: Good or Bad for Kids? - - verifyTextPresent - Nintendo: Good or Bad for Kids? - - verifyElementPresent link=Kids Now Conference Proceedings - - verifyTextPresent - Kids Now Conference Proceedings - - clickAndWait @@ -2807,22 +2778,12 @@ verifyTextPresent - research + activities verifyTextPresent - Book (2) - - - - verifyTextPresent - Chapter (1) - - - - verifyTextPresent - Concept (1) + Service (1) @@ -2830,11 +2791,21 @@ events + + verifyTextPresent + Competition (1) + + verifyTextPresent Conference (1) + + verifyTextPresent + Event (2) + + verifyTextPresent organizations @@ -2850,6 +2821,36 @@ Publisher (1) + + verifyTextPresent + research + + + + verifyTextPresent + Academic Article (3) + + + + verifyTextPresent + Article (3) + + + + verifyTextPresent + Book (2) + + + + verifyTextPresent + Chapter (2) + + + + verifyTextPresent + Concept (1) + + clickAndWait @@ -2877,6 +2878,11 @@ + + click + css=li.nonSelectedGroupTab.clickable + + verifyTextPresent chapter diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 9d0082d4..134db85d 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -233,7 +233,7 @@ - click + clickAndWait link=Cancel @@ -1128,6 +1128,11 @@ Research + + pause + 5000 + + verifyElementPresent link=Grant (5) @@ -1179,10 +1184,15 @@ - clickAndWait + click css=a[alt="view all faculty"] + + pause + 5000 + + assertTitle People @@ -1208,6 +1218,11 @@ link=Faculty Member (1) + + pause + 5000 + + verifyElementPresent link=Faculty, Jane @@ -1223,6 +1238,11 @@ link=Librarian (1) + + pause + 5000 + + verifyElementPresent link=Librarian, Lily @@ -1238,6 +1258,11 @@ link=Person (2) + + pause + 5000 + + verifyElementPresent link=Faculty, Jane diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html index e84eaa70..ff077c35 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles3.html @@ -148,7 +148,7 @@ label=Conference - click + clickAndWait link=Cancel @@ -255,6 +255,11 @@ + + click + css=li.nonSelectedGroupTab.clickable + + verifyTextPresent PoA Annual Conference 2000 - 2010 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html index 74b39942..b0b98552 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html @@ -178,7 +178,7 @@ - click + clickAndWait link=Cancel diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html index cc721b86..cb4949fc 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckPublicView.html @@ -57,7 +57,7 @@ click - //div[@id='wrapper-content']/ul/li[8] + //div[@id='wrapper-content']/ul/li[10] @@ -244,7 +244,7 @@ click - //div[@id='wrapper-content']/ul/li[8] + //div[@id='wrapper-content']/ul/li[10] diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html index b90d153a..cf1801ab 100644 --- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html +++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html @@ -152,11 +152,6 @@ LITA - - click - //div[@id='wrapper-content']/ul/li[16] - - click css=li.selectedGroupTab.clickable @@ -226,7 +221,7 @@ - click + clickAndWait //input[@value='Delete'] @@ -310,7 +305,7 @@ click - //div[@id='wrapper-content']/ul/li[20] + //div[@id='wrapper-content']/ul/li[18] diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html index 4d244da2..e9b5e2ad 100644 --- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html @@ -73,7 +73,12 @@ verifyTextPresent - Project + Project (2) + + + + verifyTextPresent + Service (1) @@ -83,37 +88,32 @@ verifyTextPresent - Course + Course (1) verifyTextPresent - events + Conference (3) verifyTextPresent - Conference + Event (7) verifyTextPresent - Event + Invited Talk (1) verifyTextPresent - Invited Talk + Presentation (2) verifyTextPresent - Presentation - - - - verifyTextPresent - Workshop + Workshop (1) @@ -123,37 +123,37 @@ verifyTextPresent - Association + Association (4) verifyTextPresent - College + College (1) verifyTextPresent - Committee + Committee (1) verifyTextPresent - Department + Department (1) verifyTextPresent - Group + Group (1) verifyTextPresent - Museum + Museum (1) verifyTextPresent - Organization + Organization (7) @@ -163,7 +163,7 @@ verifyTextPresent - Grant + Grant (5) @@ -302,6 +302,81 @@ link=Index + + selectWindow + null + + + + clickAndWait + link=Service + + + + assertTitle + Service + + + + clickAndWait + link=Ape Health Program + + + + assertTitle + Ape Health Program + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait @@ -1340,7 +1415,7 @@ VIVO Site Administration - + clickAndWait link=Index diff --git a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html index 75a7e161..07fa2af9 100644 --- a/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html +++ b/utilities/acceptance-tests/suites/AddRoles/GrantDisplay.html @@ -194,7 +194,7 @@ - click + clickAndWait xpath=(//input[@type='checkbox'])[6] @@ -241,8 +241,8 @@ - verifyTextPresent - manage grants & projects + verifyElementPresent + link=manage grants & projects @@ -271,7 +271,7 @@ - clickAndWait + click link=Return to Profile Page @@ -343,7 +343,7 @@ - clickAndWait + click link=Return to Profile Page diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index cfc8ecd2..f63e51d0 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -347,11 +347,6 @@ Librarians for the Better Treatment of Primates Committee - - verifyTextPresent - Reference Division Department - - verifyElementPresent link=Librarian, Lily @@ -362,11 +357,6 @@ link=Librarians for the Better Treatment of Primates - - verifyElementPresent - link=Reference Division - - type @@ -503,12 +493,12 @@ verifyTextPresent - VIVO Cornell Grant Too Grant + VIVO Cornell Grant Grant verifyTextPresent - VIVO Cornell Grant Grant + VIVO Cornell Grant Too Grant @@ -528,12 +518,12 @@ verifyElementPresent - link=VIVO Cornell Grant Too + link=VIVO Cornell Grant verifyElementPresent - link=VIVO Cornell Grant + link=VIVO Cornell Grant Too From 496cedaabb8057561ae03c7a5591dcb24c5d5f8e Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 9 Dec 2013 11:56:58 -0500 Subject: [PATCH 10/33] range change for VIVO-592 --- rdf/tbox/filegraph/objectRanges.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf/tbox/filegraph/objectRanges.rdf b/rdf/tbox/filegraph/objectRanges.rdf index 165d888e..4e3d9b3b 100644 --- a/rdf/tbox/filegraph/objectRanges.rdf +++ b/rdf/tbox/filegraph/objectRanges.rdf @@ -27,7 +27,7 @@ xmlns:swrl="http://www.w3.org/2003/11/swrl#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"> - + From 6e3648f8c84248eec7e2f29a9564a0465d28b9bb Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Mon, 9 Dec 2013 12:49:06 -0500 Subject: [PATCH 11/33] Added owl:inverse for geopolitical:hasMember, geopolitical:isPredecessorOf, bibo:CitedBy, bibo:reviewOf, bibo:translator, bibo:hasTranslation, vivo:hasAssociatedConcept, vivo:subcontractsGrant, vivo:hasPrerequisite, vivo:hasPublicationVenue, vivo:offeredBy, vivo:publisher, skos:broader as detailed on https://docs.google.com/spreadsheet/ccc?key=0AqosQY8NM9BGdGVub2lKcVdtOE85LW5oRWZOVjlfSFE&usp=sharing --- rdf/tbox/filegraph/object-properties.owl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index fbd79d5b..d59bc291 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -79,6 +79,7 @@ + @@ -108,6 +109,7 @@ United Nations Statistics Division http://unstats.un.org/unsd/methods/m49/m49chang.htm http://unstats.un.org/unsd/methods/m49/m49chang.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm +     @@ -1031,6 +1033,7 @@ there is a measurement process p that has specified output m, a measurement datu + @@ -1158,8 +1161,8 @@ there is a measurement process p that has specified output m, a measurement datu - The bibo:reviewOf public description was found here: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . As of 26 May 2010, bibo:reviewOf is used with the class Review, but core:reviewIn doesn't seem to be being used. + @@ -1196,7 +1199,7 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1361,7 +1364,7 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1370,9 +1373,9 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1380,7 +1383,7 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1398,8 +1401,8 @@ there is a measurement process p that has specified output m, a measurement datu - Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + @@ -1407,7 +1410,6 @@ there is a measurement process p that has specified output m, a measurement datu - @@ -1452,9 +1454,9 @@ there is a measurement process p that has specified output m, a measurement datu - Public Definition source (http://www.answers.com/topic/publisher). + @@ -1511,9 +1513,9 @@ there is a measurement process p that has specified output m, a measurement datu - + @@ -1522,7 +1524,6 @@ there is a measurement process p that has specified output m, a measurement datu - @@ -1608,8 +1609,8 @@ there is a measurement process p that has specified output m, a measurement datu - Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . + @@ -1617,7 +1618,6 @@ there is a measurement process p that has specified output m, a measurement datu - Public description modified from the information on this page: http://www.w3.org/TR/2005/WD-swbp-skos-core-guide-20050510/#sechierarchy . From f8fe9f870a5cc4688cc033785e749be2da096253 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 9 Dec 2013 13:13:31 -0500 Subject: [PATCH 12/33] VIVO-629 added GlobalCitationCount to publications class group --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 1 + 1 file changed, 1 insertion(+) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 28aaa3ff..581c2e3e 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -2019,6 +2019,7 @@ vivo:Review "19"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . From 0f4a763c1ad1578376dd10f1097943fac9ebd22f Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 9 Dec 2013 13:53:11 -0500 Subject: [PATCH 13/33] VIVO-630 and VIVO-634: orcidId fixes --- productMods/config/listViewConfig-orcidId.xml | 2 +- .../generators/AddOrcidIdToPersonGenerator.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/productMods/config/listViewConfig-orcidId.xml b/productMods/config/listViewConfig-orcidId.xml index fe93bba2..6e25fc1b 100644 --- a/productMods/config/listViewConfig-orcidId.xml +++ b/productMods/config/listViewConfig-orcidId.xml @@ -11,7 +11,7 @@ SELECT ?value WHERE { ?subject ?property ?value - } LIMIT 1 + } diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java index e5ae2c3d..ebe8c6fd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrcidIdToPersonGenerator.java @@ -46,12 +46,9 @@ public class AddOrcidIdToPersonGenerator extends VivoBaseGenerator implements conf.setVarNameForObject("orcidId"); conf.setN3Required( Arrays.asList( n3ForOrcidId ) ); - - conf.addNewResource("orcidId", DEFAULT_NS_FOR_NEW_RESOURCE); - + conf.setUrisOnform(Arrays.asList("orcidId")); -// conf.addSparqlForAdditionalUrisInScope("orcidId", orcidIdQuery); conf.addSparqlForExistingUris("orcidId", orcidIdQuery); conf.addField( new FieldVTwo(). From 5b28d0658264f3c28958a55a43b374be59e9dabb Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 9 Dec 2013 16:52:10 -0500 Subject: [PATCH 14/33] VIVO-636 update the language files --- .../display/everytime/PropertyConfig_es_GO.n3 | 156 +- .../firsttime/initialTBoxAnnotations_es_GO.n3 | 1273 +++++------------ .../themes/wilma/i18n/all_es_GO.properties | 14 +- 3 files changed, 486 insertions(+), 957 deletions(-) diff --git a/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3 b/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3 index 7abe692b..77200334 100644 --- a/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3 +++ b/languages/es_GO/rdf/display/everytime/PropertyConfig_es_GO.n3 @@ -1,58 +1,104 @@ - "aconsejado en"@es-GO . - "editor de"@es-GO . - "la educaci\u00F3n y la formaci\u00F3n"@es-GO . - "extensi\u00F3n y servicio a la comunidad"@es-GO . - "servicio a la profesi\u00F3n"@es-GO . - "tel\u00E9fono"@es-GO . - "personas"@es-GO . - "p\u00E1gina web"@es-GO . - "actividades de investigaci\u00F3n"@es-GO . - "en la serie de eventos"@es-GO . - "recogida o editor de la serie de"@es-GO . - "actividades docentes"@es-GO . - "posiciones"@es-GO . - "t\u00EDtulo preferido"@es-GO . - "publicaciones seleccionadas"@es-GO . - "nombre y apellidos"@es-GO . - "revisor de"@es-GO . - "autores"@es-GO . - "asistido"@es-GO . - "incluye eventos"@es-GO . - "correo electr\u00F3nico principal"@es-GO . - "investigador co-principal en"@es-GO . - "fax"@es-GO . - "contribuyente"@es-GO . - "editores"@es-GO . - "direcci\u00F3n de env\u00EDo"@es-GO . - "fax"@es-GO . - "organizador del"@es-GO . - "investigador principal en"@es-GO . - "correos electr\u00F3nicos adicionales"@es-GO . - "asesorados"@es-GO . - "premios y honores"@es-GO . - "ingresos"@es-GO . - "la recepci\u00F3n de"@es-GO . - "investigador en"@es-GO . + "direcci\u00F3n postal"@es-GO . "premio o el honor de"@es-GO . - "caso, dentro de"@es-GO . - "actividades cl\u00EDnicas"@es-GO . - "presentaciones"@es-GO . - "relacionados por"@es-GO . - "part\u00EDcipe"@es-GO . - "jefe de"@es-GO . + "fax"@es-GO . + "ubicado en las instalaciones"@es-GO . + "ubicaci\u00F3n de la instalaci\u00F3n"@es-GO . + "autores"@es-GO . + "premios y honores"@es-GO . "miembro de"@es-GO . - "tel\u00E9fono"@es-GO . - "tiene sub-organización"@es-GO . - "organización dentro de"@es-GO . - - "administrado subvención por"@es-GO . - "administra la subvención"@es-GO . + "ubicaci\u00F3n del equipo o instrumento"@es-GO . + "incluye eventos"@es-GO . + "asesorados"@es-GO . + "ingresos"@es-GO . + "instalaciones para el servicio"@es-GO . + "premios y honores recibidos"@es-GO . + "otorgado por"@es-GO . + "direcci\u00F3n de correo electr\u00F3nico"@es-GO . + "colecci\u00F3n o grupo editorial series para"@es-GO . + "evento al que asistieron"@es-GO . + "tiene ubicaci\u00F3n geogr\u00E1fica"@es-GO . + "de salida de proceso o evento"@es-GO . + "administrado por"@es-GO . + "tiene sub subvenci\u00F3n"@es-GO . + "enfoque geogr\u00E1fico"@es-GO . + "habitaciones"@es-GO . + "Nivel de estudios"@es-GO . + "posiciones"@es-GO . + "nivel de estudios:"@es-GO . + "presentaciones"@es-GO . + "tiene suborganizaci\u00F3n"@es-GO . + "tiene \u00E1rea tem\u00E1tica"@es-GO . + "publicaciones de salida u otras obras"@es-GO . + "ubicaci\u00F3n geogr\u00E1fica"@es-GO . + "que tuvo lugar en las instalaciones"@es-GO . + "fax"@es-GO . + "premio conferido por"@es-GO . + "nombre completo"@es-GO . + "tiene parte"@es-GO . + "actividades de extensi\u00F3n y servicio a la comunidad"@es-GO . + "direcci\u00F3n postal"@es-GO . + "nivel de estudios:"@es-GO . + "parte de"@es-GO . + "investigador principal en"@es-GO . + "coordinador del evento"@es-GO . + "nivel de estudios:"@es-GO . + "instalaci\u00F3n de persona, grupo u organizaci\u00F3n"@es-GO . + "organizaci\u00F3n dentro de"@es-GO . + "otras actividades de investigaci\u00F3n"@es-GO . + "recolecci\u00F3n o editor de la serie de"@es-GO . + "cartas credenciales"@es-GO . + "p\u00E1gina web"@es-GO . + "actividades cl\u00EDnicas"@es-GO . + "actividades de extensi\u00F3n y servicio a la comunidad"@es-GO . + "tel\u00E9fono"@es-GO . + "premio o distinci\u00F3n que se otorga"@es-GO . + "publicaciones seleccionadas"@es-GO . + "t\u00EDtulo preferido"@es-GO . + "concesi\u00F3n de sub"@es-GO . + "co -investigador principal en"@es-GO . + "dentro del edificio"@es-GO . "se produce dentro de evento"@es-GO . - "contiene geográficamente"@es-GO . - "geográficamente dentro de"@es-GO . - "ubicación de los equipos"@es-GO . - "ubicación geográfica de"@es-GO . - "documentos relacionados"@es-GO . - "tiene en la materia"@es-GO . - "tiene sub-subvención"@es-GO . - "sub-subvención de"@es-GO . \ No newline at end of file + "ofrecido por"@es-GO . + "instalaci\u00F3n para el evento"@es-GO . + "tiene documento de pieza"@es-GO . + "aconsejado de"@es-GO . + "credencial de"@es-GO . + "publicaciones seleccionadas"@es-GO . + "actividades de servicios profesionales"@es-GO . + "celebrada en la ubicaci\u00F3n geogr\u00E1fica"@es-GO . + "presentaciones"@es-GO . + "alojada en instalaciones"@es-GO . + "concesi\u00F3n de premios"@es-GO . + "geogr\u00E1ficamente dentro de"@es-GO . + "fecha de publicaci\u00F3n"@es-GO . + "organizaci\u00F3n principal de"@es-GO . + "correos electr\u00F3nicos adicionales"@es-GO . + "tiene colaborador"@es-GO . + "organizador del evento"@es-GO . + "editor de"@es-GO . + "tiene organizaci\u00F3n o grupo colaborar"@es-GO . + "part\u00EDcipe"@es-GO . + "contribuyente"@es-GO . + "eventos en esta serie"@es-GO . + "tel\u00E9fono"@es-GO . + "evento al que asistieron"@es-GO . + "investigador en"@es-GO . + "en la serie de eventos"@es-GO . + "miembro de"@es-GO . + "a\u00F1o otorgado"@es-GO . + "parte de otro documento"@es-GO . + "ofrece servicio"@es-GO . + "revisor de"@es-GO . + "actividades cl\u00EDnicas"@es-GO . + "la educaci\u00F3n y la formaci\u00F3n"@es-GO . + "organizaci\u00F3n para el entrenamiento"@es-GO . + "p\u00E1gina web"@es-GO . + "jefe de"@es-GO . + "administra subvenci\u00F3n"@es-GO . + "p\u00E1gina web"@es-GO . + "p\u00E1gina web"@es-GO . + "actividades de ense\u00F1anza"@es-GO . + "recepci\u00F3n de"@es-GO . + "editores"@es-GO . + "personas"@es-GO . + "correo electr\u00F3nico principal"@es-GO . diff --git a/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3 b/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3 index 8a2b565e..32e3e2e1 100644 --- a/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3 +++ b/languages/es_GO/rdf/tbox/firsttime/initialTBoxAnnotations_es_GO.n3 @@ -1,903 +1,386 @@ - "se administra por"@es-GO . - "internos Vitro"@es-GO . - "Entidad Realizable"@es-GO . - "tiene coordenadas"@es-GO . - "PubMed Central ID"@es-GO . - "estad\u00EDsticas Ocre"@es-GO . - "departamento"@es-GO . - "tiene participantes"@es-GO . - "Formaci\u00F3n Postdoctoral"@es-GO . - "regi\u00F3n"@es-GO . - "Fase 4"@es-GO . - "comunicaci\u00F3n"@es-GO . - "pa\u00EDs"@es-GO . - "instrumento"@es-GO . - "n\u00FAcleo"@es-GO . - "documentos relacionados"@es-GO . - "Proceso de medici\u00F3n Experiencia"@es-GO . - "Faculty Position Administrativo"@es-GO . - "Junta Americana de Patolog\u00EDa"@es-GO . - "direcci\u00F3n"@es-GO . - "software"@es-GO . - "tiene nombre de la lista"@es-GO . - "profesi\u00F3n de escritor"@es-GO . - "categor\u00EDa"@es-GO . - "empresa"@es-GO . - "Servicio de Transporte"@es-GO . - "publicaciones en el blog"@es-GO . - "seguridad"@es-GO . - "proporciona acceso a"@es-GO . - "nameListFR"@es-GO . - "citado por"@es-GO . - "tiene geo"@es-GO . - "manual"@es-GO . - "comit\u00E9"@es-GO . - "en prensa"@es-GO . - "internado"@es-GO . - "Presentador Papel"@es-GO . - "t\u00E9rminos organizativos"@es-GO . - "countryAreaYear"@es-GO . - "tiene entrada"@es-GO . - "tiene logo"@es-GO . - "Servicio de Almacenamiento"@es-GO . - "muestra biol\u00F3gica relacionada"@es-GO . - "papel"@es-GO . - "trabajar"@es-GO . - "tiene nombre corto"@es-GO . - "tiene en la materia"@es-GO . - "editorial"@es-GO . - "uid"@es-GO . - "Presentaci\u00F3n"@es-GO . - "gui\u00F3n"@es-GO . - "FOAF ( Friend of a Friend)"@es-GO . - "fecha / valor de tiempo"@es-GO . - "relaci\u00F3n"@es-GO . - "legislaci\u00F3n"@es-GO . - "identificador"@es-GO . - "voz"@es-GO . - "logra el objetivo"@es-GO . - "Error exploratorio Plazo"@es-GO . - "fecha de presentaci\u00F3n"@es-GO . - "Junta Americana de Psiquiatr\u00EDa y Neurolog\u00EDa"@es-GO . - "invitado"@es-GO . - "tiene nombre de formato"@es-GO . - "t\u00EDtulo"@es-GO . - "poblaci\u00F3n total"@es-GO . - "Organizaci\u00F3n de Estudiantes"@es-GO . - "Servicio de Mantenimiento de Datos"@es-GO . - "FileByteStream"@es-GO . - "t\u00E9cnica relacionada"@es-GO . - "producido por"@es-GO . - "afirmado por"@es-GO . - "Identificaci\u00F3n del producto"@es-GO . - "tiene m\u00E1xima latitud"@es-GO . - "agriculturalAreaTotal"@es-GO . - "grupo"@es-GO . - "tiene sonido"@es-GO . - "ubicaci\u00F3n de los"@es-GO . - "Email"@es-GO . - "tipo de t\u00E9rmino"@es-GO . - "Investigador Rol"@es-GO . - "Junta Americana de Cirug\u00EDa de Colon y Recto"@es-GO . - "es el agente de"@es-GO . - "publicado en"@es-GO . - "Blog"@es-GO . - "aconsejado Papel"@es-GO . - "realizado en"@es-GO . - "concepto asociado"@es-GO . - "nationalityEN"@es-GO . - "bibliotecario Em\u00E9rito"@es-GO . - "tiene nombre oficial"@es-GO . - "ID del paciente"@es-GO . - "libro editado"@es-GO . - "Protocolo de estudio Ocre"@es-GO . - "revista"@es-GO . - "Documento de la Conferencia"@es-GO . - "campo principal de grado"@es-GO . - "codeFAOSTAT"@es-GO . - "nameListRU"@es-GO . - "Revisor Papel"@es-GO . - "corresidentes"@es-GO . - "subcontratado a trav\u00E9s de"@es-GO . - "cuidado de identificaci\u00F3n del proveedor de salud"@es-GO . - "descripci\u00F3n"@es-GO . - "Residencia M\u00E9dica"@es-GO . - "hermano"@es-GO . - "relaci\u00F3n"@es-GO . - "tiene nombre de prefijo"@es-GO . - "geo"@es-GO . - "identificaci\u00F3n"@es-GO . - "Acci\u00F3n Especificaciones"@es-GO . - "ISI Investigador ID"@es-GO . - "editor de"@es-GO . - "otro"@es-GO . - "aplastar"@es-GO . - "puntuaci\u00F3n"@es-GO . - "High School Student Papel"@es-GO . - "Junta Americana de Cirug\u00EDa Neurol\u00F3gica"@es-GO . - "\u00E1rea"@es-GO . - "realiza un estudio en humanos"@es-GO . - "documento"@es-GO . - "NIH Manuscrito C\u00F3digo de identificaci\u00F3n del sistema"@es-GO . - "protocolo se dio cuenta por"@es-GO . - "visi\u00F3n general de ense\u00F1anza"@es-GO . - "tiene categor\u00EDa"@es-GO . - "contribuyente"@es-GO . - "Papel Principal Investigador"@es-GO . - "notas \u00C1rea pa\u00EDs"@es-GO . - "nota"@es-GO . - "tiene valor monetario"@es-GO . - "tribunal"@es-GO . - "contribuyente"@es-GO . - "nameShortEN"@es-GO . - "foto"@es-GO . - "nationalityAR"@es-GO . - "competencia"@es-GO . - "asignado por"@es-GO . - "documento recopilada"@es-GO . - "unidad de superficie del pa\u00EDs"@es-GO . - "SKOS (Simple Knowledge Organization System )"@es-GO . - "Met"@es-GO . - "Etiqueta Medici\u00F3n"@es-GO . - "art\u00EDculo de revista"@es-GO . - "nameOfficialFR"@es-GO . - "servicio"@es-GO . - "Obsolescencia Motivo Especificaci\u00F3n"@es-GO . - "distribuye"@es-GO . - "calendario"@es-GO . - "objetivo alcanzado por la operaci\u00F3n"@es-GO . - "versi\u00F3n"@es-GO . - "Asesoramiento Proceso"@es-GO . - "Contacto Qualifier"@es-GO . - "tiene URL"@es-GO . - "tiene estad\u00EDsticas"@es-GO . - "Servicio de Apoyo"@es-GO . - "Fecha / hora de intervalo"@es-GO . - "aniversario"@es-GO . - "SICI"@es-GO . - "Conferencia Poster"@es-GO . - "listo para su lanzamiento"@es-GO . - "emisor"@es-GO . - "cap\u00EDtulo"@es-GO . - "cat\u00E1logo"@es-GO . - "tiene salida"@es-GO . - "Servicio de Formaci\u00F3n"@es-GO . - "Serie de eventos"@es-GO . - "habitaci\u00F3n"@es-GO . - "Fuente de informaci\u00F3n bibliogr\u00E1fica"@es-GO . - "colega"@es-GO . - "documentaci\u00F3n para"@es-GO . - "subvenci\u00F3n subcontratos"@es-GO . - "sitio web"@es-GO . - "International Standard Serial Number (ISSN )"@es-GO . - "formato de datos de laboratorio"@es-GO . - "tiene requirment elegibilidad"@es-GO . - "de salida se especifica de"@es-GO . - "ofertas"@es-GO . - "Regi\u00F3n subnacional"@es-GO . - "entidad geopol\u00EDtica"@es-GO . - "consorcio"@es-GO . - "Fase 4 Ensayo Cl\u00EDnico"@es-GO . - "etiqueta definida por el usuario"@es-GO . - "unidad de superficie"@es-GO . - "tiene apodo"@es-GO . - "Especificaciones del Plan"@es-GO . - "codeUN"@es-GO . - "Junta Americana de Radiolog\u00EDa"@es-GO . - "conocido"@es-GO . - "t\u00E9rmino etiqueta"@es-GO . - "premio u honor patrocinadores"@es-GO . - "Regi\u00F3n espacial"@es-GO . - "Prestaci\u00F3n de Servicios de laboratorio"@es-GO . - "traductor"@es-GO . - "Servicio de An\u00E1lisis"@es-GO . - "Facultad Miembro Em\u00E9rito"@es-GO . - "Geo"@es-GO . - "proyecto"@es-GO . - "estudio recuento de la poblaci\u00F3n"@es-GO . - "ubicaci\u00F3n geogr\u00E1fica de"@es-GO . - "tiene agente"@es-GO . - "Electronic International Standard Serial Number ( EISSN )"@es-GO . - "equipo"@es-GO . - "L\u00EDder Papel"@es-GO . - "g\u00E9nero"@es-GO . - "Junta Americana de Dermatolog\u00EDa"@es-GO . - "AUT\u00D3NOMOS"@es-GO . - "tiene formato"@es-GO . - "universidad"@es-GO . - "landAreaYear"@es-GO . - "No Permanente Papel Residente"@es-GO . - "Regi\u00F3n geogr\u00E1fica"@es-GO . - "enfoque geogr\u00E1fico"@es-GO . - "Fuente de referencia"@es-GO . - "nameListIT"@es-GO . - "informaci\u00F3n de contacto"@es-GO . - "beneficiario"@es-GO . - "peri\u00F3dico"@es-GO . - "PubMed Identificador"@es-GO . - "discurso"@es-GO . - "International Standard Book Number (ISBN ) 10"@es-GO . - "desconocido"@es-GO . - "se da cuenta de"@es-GO . - "bibliotecario Posici\u00F3n"@es-GO . - "construcci\u00F3n"@es-GO . - "t\u00EDtulo relacionado"@es-GO . - "nameCurrencyES"@es-GO . - "ORCID iD"@es-GO . - "tiene traducci\u00F3n"@es-GO . - "ubicaci\u00F3n"@es-GO . - "Comunicado de prensa"@es-GO . - "macho"@es-GO . - "inherente a"@es-GO . - "departamento o nombre de la escuela dentro de la instituci\u00F3n"@es-GO . - "Documento legal Case"@es-GO . - "ASIN"@es-GO . - "estudio en humanos realizado por"@es-GO . - "Kind VCard"@es-GO . - "Rol de empleado"@es-GO . - "Facultad relaci\u00F3n de tutor\u00EDa"@es-GO . - "Junta Americana de Medicina Nuclear"@es-GO . - "fase"@es-GO . - "visi\u00F3n general de investigaci\u00F3n"@es-GO . - "tesis"@es-GO . - "Vitro Ontolog\u00EDa P\u00FAblica"@es-GO . - "serie"@es-GO . - "objetivo alcanzado por"@es-GO . - "T\u00EDtulo que otorga"@es-GO . - "n\u00FAmero de plazas"@es-GO . - "papel"@es-GO . - "agriculturalAreaYear"@es-GO . - "Scalar Datum Medici\u00F3n"@es-GO . - "Dise\u00F1o del estudio"@es-GO . - "Licenciado Asesoramiento Relaci\u00F3n"@es-GO . - "tiene el n\u00FAmero de acceso"@es-GO . - "nationalityRU"@es-GO . - "Ontolog\u00EDa Evento"@es-GO . - "calidad"@es-GO . - "Post- Graduate Student Papel Trainee"@es-GO . - "codeUNDP"@es-GO . - "pel\u00EDcula"@es-GO . - "tiene requisito"@es-GO . - "Premio de Honor o"@es-GO . - "lugar de publicaci\u00F3n"@es-GO . - "parientes"@es-GO . - "pa\u00EDs"@es-GO . - "Colaborador Papel"@es-GO . - "Fecha / Hora Valor Precisi\u00F3n"@es-GO . - "Documento de trabajo"@es-GO . - "reactivo"@es-GO . - "direcci\u00F3n de la calle"@es-GO . - "marcador de posici\u00F3n eliminado"@es-GO . - "nota"@es-GO . - "tiene la direcci\u00F3n"@es-GO . - "organizaci\u00F3n affliliated"@es-GO . - "tiene licencia de software"@es-GO . - "transcripci\u00F3n de"@es-GO . - "proporciona fondos para"@es-GO . - "es precursor de"@es-GO . - "FOAF Perfil"@es-GO . - "Junta Americana de Pediatr\u00EDa"@es-GO . - "abreviatura"@es-GO . - "countryArea"@es-GO . - "emergencia"@es-GO . - "Lugar Poblado"@es-GO . - "tiene etiqueta de la unidad de medida"@es-GO . - "Servicio de Almacenamiento de Materiales"@es-GO . - "EAN International Code Council - uniforme ( EAN - UCC ) 13"@es-GO . - "tiene la nacionalidad"@es-GO . - "metadatos incompletos"@es-GO . - "nationalityFR"@es-GO . - "Servicio de Procesamiento de materiales"@es-GO . - "equipo"@es-GO . - "g\u00E9nero"@es-GO . - "fIN"@es-GO . - "implementos"@es-GO . - "curso"@es-GO . - "tiene requisito de residencia"@es-GO . - "manuscrito"@es-GO . - "requisito previo para"@es-GO . - "Ciclo de conferencias"@es-GO . - "n\u00FAmero de patente"@es-GO . - "Financiaci\u00F3n Papel"@es-GO . - "artista"@es-GO . - "localizaci\u00F3n"@es-GO . - "Postdoc"@es-GO . - "Solicitud Calendario"@es-GO . - "Papel Proveedor de servicios"@es-GO . - "Ensayos Cl\u00EDnicos Nacionales n\u00FAmero (NCT )"@es-GO . - "mismo que"@es-GO . - "Mismo Que"@es-GO . - "Junta Americana de Cirug\u00EDa"@es-GO . - "nombre o inicial"@es-GO . - "art\u00EDculo"@es-GO . - "n\u00FAmero por a\u00F1o"@es-GO . - "a\u00F1o escolar"@es-GO . - "texto"@es-GO . - "Servicio de An\u00E1lisis de Datos"@es-GO . - "edici\u00F3n"@es-GO . - "URL"@es-GO . - "museo"@es-GO . - "disputado"@es-GO . - "proporciona servicio"@es-GO . - "valor del a\u00F1o"@es-GO . - "tiene documentaci\u00F3n"@es-GO . - "Zona Horaria"@es-GO . - "cuesti\u00F3n"@es-GO . - "Cuenta con calendario ocupado"@es-GO . - "publicado"@es-GO . - "tiene una lengua materna"@es-GO . - "ejemplo a ser finalmente eliminado"@es-GO . - "instituto"@es-GO . - "detenidamente por hom\u00F3logos"@es-GO . - "hospital"@es-GO . - "esconderse de pantalla"@es-GO . - "Parte del Documento"@es-GO . - "sonido"@es-GO . - "Junta Americana de Medicina de Emergencia"@es-GO . - "Continuant Gen\u00E9ricamente Dependiente"@es-GO . - "nameShortFR"@es-GO . - "asistente Papel"@es-GO . - "grupo"@es-GO . - "zona horaria"@es-GO . - "equipos para"@es-GO . - "costos directos"@es-GO . - "tiene en cuenta"@es-GO . - "Elemento de datos"@es-GO . - "\u00E1rea total del pa\u00EDs"@es-GO . - "traducci\u00F3n de"@es-GO . - "campus"@es-GO . - "ha relacionado"@es-GO . - "unidad de \u00E1rea agr\u00EDcola"@es-GO . - "miembro de"@es-GO . - "c\u00F3nyuge"@es-GO . - "sonido"@es-GO . - "fundaci\u00F3n"@es-GO . - "Inmaterial Entidad"@es-GO . - "actual miembro del"@es-GO . - "reproduce"@es-GO . - "categor\u00EDa"@es-GO . - "t\u00E9rmino"@es-GO . - "relacionados por"@es-GO . - "reproducido en"@es-GO . - "solicitud de calendario"@es-GO . - "tiene t\u00E9cnica de preparaci\u00F3n"@es-GO . - "tiene miembros"@es-GO . - "portador de"@es-GO . - "persona"@es-GO . - "es de unos"@es-GO . - "entrevista"@es-GO . - "apoyada por"@es-GO . - "tiene poblaci\u00F3n de estudio"@es-GO . - "Medici\u00F3n de peso Topic"@es-GO . - "Etiqueta Datum"@es-GO . - "ofrecido por"@es-GO . - "Fase 0"@es-GO . - "patrocinador ID premio"@es-GO . - "Estudio de caso"@es-GO . - "Unidimensional Regi\u00F3n Temporal"@es-GO . - "revisi\u00F3n de los"@es-GO . - "Facultad Papel"@es-GO . - "Junta Americana de Obstetricia y Ginecolog\u00EDa"@es-GO . - "email"@es-GO . - "facilidad para"@es-GO . - "vecino"@es-GO . - "Grado Acad\u00E9mico"@es-GO . - "patente"@es-GO . - "credencial expedida"@es-GO . - "notas \u00C1rea agr\u00EDcolas"@es-GO . - "Papel de Alcance"@es-GO . - "Informaci\u00F3n Directiva Entidad"@es-GO . - "relacionados"@es-GO . - "individual"@es-GO . - "tiene fecha de conteo mundial"@es-GO . - "borrador"@es-GO . - "ni\u00F1o"@es-GO . - "codeAGROVOC"@es-GO . - "asigna"@es-GO . - "base de datos"@es-GO . - "Zero -Dimensional Regi\u00F3n Temporal"@es-GO . - "presentado en"@es-GO . - "tiene valor de conteo mundial"@es-GO . - "Grado Tesis"@es-GO . - "Fase 1 Clinical Trial"@es-GO . - "fuente"@es-GO . - "Medici\u00F3n de la frecuencia Datum"@es-GO . - "relacionados"@es-GO . - "nationalityZH"@es-GO . - "F1000 Enlace"@es-GO . - "director"@es-GO . - "Junta de Revisi\u00F3n Institucional ( IRB ) n\u00FAmero"@es-GO . - "menciones"@es-GO . - "distribuye la financiaci\u00F3n de"@es-GO . - "Tipo de tel\u00E9fono"@es-GO . - "nameShortRU"@es-GO . - "t\u00E9cnica"@es-GO . - "t\u00E9rminos fusionaron"@es-GO . - "Proceso Educativo"@es-GO . - "\u00E1reas de investigaci\u00F3n"@es-GO . - "geogr\u00E1fico"@es-GO . - "audici\u00F3n"@es-GO . - "Junta Americana de Medicina F\u00EDsica y Rehabilitaci\u00F3n"@es-GO . - "compa\u00F1ero de trabajo"@es-GO . - "Secci\u00F3n libro"@es-GO . - "abstracto"@es-GO . - "Workshop Series"@es-GO . - "distribuidor"@es-GO . - "logra objetivo planteado"@es-GO . - "entidad"@es-GO . - "Servicio de Almacenamiento de Datos"@es-GO . - "ID premio local"@es-GO . - "utiliza"@es-GO . - "editor"@es-GO . - "Fax"@es-GO . - "uncurated"@es-GO . - "in\u00E9dito"@es-GO . - "credencial"@es-GO . - "concepto para"@es-GO . - "Servicio de An\u00E1lisis de Materiales"@es-GO . - "rendimiento"@es-GO . - "estudiante"@es-GO . - "clase definida"@es-GO . - "organizaci\u00F3n sucesora"@es-GO . - "GDPYear"@es-GO . - "Scopus ID"@es-GO . - "lugar de publicaci\u00F3n"@es-GO . - "est\u00E1 codificado en"@es-GO . - "Papel miembro"@es-GO . - "v\u00E1lida en"@es-GO . - "Funci\u00F3n de reglamentaci\u00F3n"@es-GO . - "EE.UU. Resident Papel"@es-GO . - "tiene enlace calendario"@es-GO . - "sufijo de nombre honor\u00EDfico"@es-GO . - "p\u00E1gina de inicio"@es-GO . - "foto"@es-GO . - "nutrido calendario"@es-GO . - "c\u00E9lula"@es-GO . - "tiene frecuencia de citaci\u00F3n mundial"@es-GO . - "URI de espacio preferente"@es-GO . - "Posici\u00F3n no acad\u00E9mico"@es-GO . - "Educador Rol"@es-GO . - "nameShortZH"@es-GO . - "No Facultad Acad\u00E9mica"@es-GO . - "Junta Americana de Cirug\u00EDa Tor\u00E1cica"@es-GO . - "parte de"@es-GO . - "breve"@es-GO . - "tiene ubicaci\u00F3n geogr\u00E1fica"@es-GO . - "Relaci\u00F3n Asesoramiento Postdoc o compa\u00F1ero"@es-GO . - "regi\u00F3n temporal"@es-GO . - "Otorgar"@es-GO . - "nameCurrencyEN"@es-GO . - "estudiante licenciado"@es-GO . - "v\u00EDdeo"@es-GO . - "especifica el uso de"@es-GO . - "citar"@es-GO . - "organizaci\u00F3n"@es-GO . - "conferencia"@es-GO . - "Servicio modificaci\u00F3n material"@es-GO . - "taller"@es-GO . - "fecha de nacimiento"@es-GO . - "coden"@es-GO . - "localidad"@es-GO . - "t\u00E9rmino m\u00E1s amplio"@es-GO . - "tiene apellido"@es-GO . - "informaci\u00F3n adicional"@es-GO . - "valor del a\u00F1o - mes - d\u00EDa - hora"@es-GO . - "VIVO Core"@es-GO . - "contenida en"@es-GO . - "Gesti\u00F3n de Riesgos"@es-GO . - "procedimientos de"@es-GO . - "fecha de la publicaci\u00F3n"@es-GO . - "Unidad de medida Label"@es-GO . - "C\u00F3digo de clase / subclase Clasificaci\u00F3n EE.UU. publicada ( CCL )"@es-GO . - "tel\u00E9fono"@es-GO . - "Empresa privada"@es-GO . - "me"@es-GO . - "buscapersonas"@es-GO . - "nationalityIT"@es-GO . - "Licencias"@es-GO . - "apoya"@es-GO . - "Estado o Provincia"@es-GO . - "cesionario de"@es-GO . - "c\u00F3digo postal"@es-GO . - "Descripci\u00F3n corta"@es-GO . - "nameListES"@es-GO . - "superficie total"@es-GO . - "agente"@es-GO . - "elegible para"@es-GO . - "Denotator Tipo"@es-GO . - "tiene miembros"@es-GO . - "contexto para"@es-GO . - "Calendario Enlace"@es-GO . - "Oportunidad de Investigaci\u00F3n"@es-GO . - "peri\u00F3dico"@es-GO . - "posici\u00F3n"@es-GO . - "revisi\u00F3n"@es-GO . - "tiene el n\u00FAmero de inventario"@es-GO . - "Premio de Honor o recibo"@es-GO . - "Bibontology"@es-GO . - "nameCurrencyAR"@es-GO . - "Medida Experiencia"@es-GO . - "Fase 1"@es-GO . - "Papel Editor"@es-GO . - "es la medici\u00F3n de la calidad"@es-GO . - "PIB"@es-GO . - "Rol del Personal"@es-GO . - "Junta Americana de Oftalmolog\u00EDa"@es-GO . - "carta"@es-GO . - "decisi\u00F3n judicial posterior"@es-GO . - "fabricante"@es-GO . - "relaciona"@es-GO . - "traducci\u00F3n"@es-GO . - "tiene latitud m\u00EDnima"@es-GO . - "organizaci\u00F3n predecesora"@es-GO . - "organizativo"@es-GO . - "No aut\u00F3nomo"@es-GO . - "Gu\u00EDa cl\u00EDnica"@es-GO . - "nameShortIT"@es-GO . - "tiene mensajes"@es-GO . - "Nombre del formato"@es-GO . - "Continuant Espec\u00EDficamente Dependiente"@es-GO . - "\u00BFEsta persona es el autor correspondiente ?"@es-GO . - "tiene nombre"@es-GO . - "n\u00FAmero de modelo"@es-GO . - "Proceso de Planificaci\u00F3n"@es-GO . - "designa las"@es-GO . - "Tipo de las relaciones"@es-GO . - "tiene zona horaria"@es-GO . - "direccionamiento"@es-GO . - "colaborador"@es-GO . - "t\u00E9rmino importado"@es-GO . - "Grupo Especial"@es-GO . - "clasificar"@es-GO . - "presentaci\u00F3n"@es-GO . - "contacto"@es-GO . - "codeDBPediaID"@es-GO . - "n\u00FAmero de p\u00E1ginas"@es-GO . - "Organizaci\u00F3n Financiadora"@es-GO . - "Unidad de Cambio"@es-GO . - "populationYear"@es-GO . - "continuant"@es-GO . - "Servicio de Mantenimiento"@es-GO . - "biblioteca"@es-GO . - "territorio"@es-GO . - "extracto"@es-GO . - "en espera de veto definitivo"@es-GO . - "padre"@es-GO . - "apoyada por"@es-GO . - "Servicio de Producci\u00F3n de Materiales"@es-GO . - "Expresi\u00F3n clase llamada"@es-GO . - "Propuesta de Investigaci\u00F3n"@es-GO . - "licencia"@es-GO . - "candidatura grado"@es-GO . - "cesionario"@es-GO . - "EE.UU. Rol Ciudadano"@es-GO . - "Ensayo Cl\u00EDnico Fase 2"@es-GO . - "Library of Congress Control Number ( LCCN )"@es-GO . - "de eRA Commons ID"@es-GO . - "Oficina de Transferencia de Tecnolog\u00EDa"@es-GO . "secci\u00F3n"@es-GO . - "relacionados"@es-GO . - "nameShortAR"@es-GO . - "v\u00EDdeo"@es-GO . - "Nombre de la organizaci\u00F3n"@es-GO . - "suministrados por"@es-GO . - "tiene clave"@es-GO . - "Nombre de unidad organizativa"@es-GO . - "experiencia"@es-GO . - "importe total de la adjudicaci\u00F3n"@es-GO . - "apodo"@es-GO . - "Proyecto de Investigaci\u00F3n"@es-GO . - "base de datos"@es-GO . - "gtin14"@es-GO . - "Dataset"@es-GO . - "Junta Americana de Urolog\u00EDa"@es-GO . - "tiene parte"@es-GO . - "Ontolog\u00EDa geopol\u00EDtica"@es-GO . - "Documento Audiovisual"@es-GO . - "contrato"@es-GO . - "Premio patrocinado por"@es-GO . - "colecci\u00F3n"@es-GO . - "\u00E1rea de investigaci\u00F3n de"@es-GO . "fecha / hora"@es-GO . - "requiere discusi\u00F3n"@es-GO . - "Regi\u00F3n Transnacional"@es-GO . - "art\u00EDculo Editorial"@es-GO . - "nameOfficialES"@es-GO . - "contiene"@es-GO . - "Funci\u00F3n de administrador"@es-GO . - "libro"@es-GO . - "mensajer\u00EDa"@es-GO . - "Fase 3 Ensayo Cl\u00EDnico"@es-GO . - "iniciar"@es-GO . - "tiene la fase"@es-GO . - "Pruebas Entidad"@es-GO . - "prefijo de nombre"@es-GO . - "traductor de"@es-GO . - "tiene c\u00F3digo"@es-GO . - "Rol del estudiante"@es-GO . - "Junta Americana de Medicina Familiar"@es-GO . - "Calendario Ocupado"@es-GO . - "orden de visualizaci\u00F3n preferida"@es-GO . - "logo"@es-GO . - "enlace al calendario"@es-GO . - "evento"@es-GO . - "errata"@es-GO . - "escuela"@es-GO . - "tiene informaci\u00F3n de contacto"@es-GO . - "UPC"@es-GO . - "esp\u00E9cimen biol\u00F3gico"@es-GO . - "imagen"@es-GO . - "International Standard Book Number (ISBN ) 13"@es-GO . - "Otorgamiento de licencias"@es-GO . - "financiaci\u00F3n proporcionada a trav\u00E9s de"@es-GO . - "vigente desde"@es-GO . - "caracter\u00EDsticas"@es-GO . - "tiene contexto"@es-GO . - "proceso"@es-GO . - "proceso"@es-GO . - "deriva de"@es-GO . - "tiene solicitud de calendario"@es-GO . - "nameCurrencyRU"@es-GO . - "tiene restricci\u00F3n"@es-GO . - "tiene un valor"@es-GO . - "La presentaci\u00F3n de Proceso"@es-GO . - "tiene nombre de formato"@es-GO . - "Posici\u00F3n primaria"@es-GO . - "No Facultad Posici\u00F3n Acad\u00E9mica"@es-GO . - "charla Invitada"@es-GO . - "tiene una lengua materna"@es-GO . - "logo"@es-GO . - "la autoridad gobernante"@es-GO . - "Fase 2"@es-GO . - "tiene nombre de la organizaci\u00F3n"@es-GO . - "primer nombre"@es-GO . - "situado en"@es-GO . - "identificador"@es-GO . - "estudiantes de Pregrado"@es-GO . - "exhibir"@es-GO . - "grupo"@es-GO . - "Junta Americana de Cirug\u00EDa Ortop\u00E9dica"@es-GO . - "Curaci\u00F3n Especificaciones Estado"@es-GO . - "proyecto de ley"@es-GO . - "Revisi\u00F3n"@es-GO . - "Papel cl\u00EDnica"@es-GO . - "visi\u00F3n general de divulgaci\u00F3n"@es-GO . - "organizaci\u00F3n"@es-GO . - "valor del a\u00F1o - mes - d\u00EDa"@es-GO . - "codeCurrency"@es-GO . - "notas \u00C1rea de la tierra"@es-GO . - "reportero de la corte"@es-GO . - "editor"@es-GO . - "expediente"@es-GO . - "Reuni\u00F3n"@es-GO . - "amigo"@es-GO . - "tiene funci\u00F3n"@es-GO . - "miembro"@es-GO . - "clave"@es-GO . - "presentado en"@es-GO . - "tiene grano"@es-GO . - "Ubicaci\u00F3n geogr\u00E1fica"@es-GO . - "facilidad"@es-GO . - "superficie"@es-GO . - "v\u00E1lido hasta"@es-GO . - "nameCurrencyFR"@es-GO . - "codeGAUL"@es-GO . - "Servicio proporcionado por"@es-GO . - "unidad de poblaci\u00F3n"@es-GO . - "Departamento Acad\u00E9mico"@es-GO . - "nombre de la organizaci\u00F3n"@es-GO . - "Certificaci\u00F3n"@es-GO . - "Global Conde cita"@es-GO . - "Faculty Position"@es-GO . - "Conclusi\u00F3n Pruebas Entidad"@es-GO . - "divisi\u00F3n plazo"@es-GO . - "Papel del profesor"@es-GO . - "contacto"@es-GO . - "Organizador Papel"@es-GO . - "contribuye a"@es-GO . - "codeISO2"@es-GO . - "tiene tipo de entrada"@es-GO . - "organizaci\u00F3n"@es-GO . - "Junta Americana de Cirug\u00EDa Pl\u00E1stica"@es-GO . - "ninguno"@es-GO . - "Anota"@es-GO . - "ocurrente"@es-GO . - "Servicio de mantenimiento de material"@es-GO . - "programa"@es-GO . - "entrevistador"@es-GO . - "hoja informativa"@es-GO . - "tiene experiencia"@es-GO . - "enfoque geogr\u00E1fico de"@es-GO . - "realiza"@es-GO . - "Muse"@es-GO . - "notas de poblaci\u00F3n"@es-GO . - "sufijo de nombre"@es-GO . - "volumen"@es-GO . - "VCard"@es-GO . - "Texto Phone"@es-GO . - "Ciudadano no estadounidense"@es-GO . - "se da cuenta de protocolo"@es-GO . - "Junta Americana de Alergia e Inmunolog\u00EDa"@es-GO . - "tiene origen conteo mundial"@es-GO . - "visi\u00F3n de conjunto"@es-GO . - "codeFAOTERM"@es-GO . - "PIB a precios corrientes"@es-GO . - "nameOfficialRU"@es-GO . - "continente"@es-GO . - "Estudio humano"@es-GO . - "especialidad"@es-GO . - "miembro de la Facultad"@es-GO . - "nameListEN"@es-GO . - "Online Computer Library Center ( OCLC ) n\u00FAmero"@es-GO . - "est\u00E1ndar"@es-GO . - "Asesor de Papel"@es-GO . - "Organizaci\u00F3n de Investigaci\u00F3n"@es-GO . - "valor del a\u00F1o - mes"@es-GO . - "femenino"@es-GO . - "Regi\u00F3n Transnacional"@es-GO . - "condado"@es-GO . - "c\u00F3digo"@es-GO . - "asociaci\u00F3n"@es-GO . - "tipo"@es-GO . - "t\u00EDtulo"@es-GO . - "nombre"@es-GO . - "especie como"@es-GO . - "tiene moneda"@es-GO . - "ha especificado salida"@es-GO . - "Especificaci\u00F3n Objetivo"@es-GO . - "Posici\u00F3n Postdoctoral"@es-GO . - "tel\u00E9fono"@es-GO . - "funci\u00F3n"@es-GO . - "nameListZH"@es-GO . - "explicativo"@es-GO . - "c\u00F3digo"@es-GO . - "Co- Investigador Principal Rol"@es-GO . - "Pregrado Rol Estudiante"@es-GO . - "colegio"@es-GO . - "Junta Americana de Medicina Interna"@es-GO . - "Estado del documento"@es-GO . - "utilizado para estudiar"@es-GO . - "OBO Foundry"@es-GO . - "estado"@es-GO . - "informaci\u00F3n de contacto para"@es-GO . - "clave"@es-GO . - "palabras clave"@es-GO . - "nameOfficialZH"@es-GO . - "idioma"@es-GO . - "tiene nombre de la unidad organizativa"@es-GO . - "Asistir Proceso"@es-GO . - "nationalityES"@es-GO . - "de salida de"@es-GO . - "entrevistado"@es-GO . - "rechazado"@es-GO . - "Informe"@es-GO . - "Laboratorio Core"@es-GO . - "universal"@es-GO . - "certificado"@es-GO . - "disposici\u00F3n"@es-GO . - "URI"@es-GO . - "tiene restricci\u00F3n geogr\u00E1fica"@es-GO . - "propiedad en desuso"@es-GO . - "final"@es-GO . - "divisi\u00F3n"@es-GO . - "es fabricado por"@es-GO . - "participa en"@es-GO . - "proceso"@es-GO . - "nameCurrencyZH"@es-GO . - "La organizaci\u00F3n de procesos"@es-GO . - "Fase 3"@es-GO . - "agente"@es-GO . - "revocada por"@es-GO . - "Clasificaci\u00F3n Internacional ( ICL ) c\u00F3digo"@es-GO . - "Tema Proceso de medida de peso"@es-GO . - "Entidad material"@es-GO . - "Junta Americana de Otorrinolaringolog\u00EDa"@es-GO . - "n\u00FAmero de licencia"@es-GO . - "\u00E1rea agr\u00EDcola"@es-GO . - "proporciona fondos a trav\u00E9s"@es-GO . - "Post- Bachillerato Trainee"@es-GO . - "utilizado por"@es-GO . - "mensaje instant\u00E1neo"@es-GO . - "Agencia Gubernamental"@es-GO . - "art\u00EDculo Acad\u00E9mico"@es-GO . - "concepto"@es-GO . - "tiene agente de contacto"@es-GO . - "metadatos completos"@es-GO . - "se mide como la calidad"@es-GO . - "mapa"@es-GO . - "estatuto"@es-GO . - "notas del PIB"@es-GO . - "Identificador de Objeto Digital ( DOI)"@es-GO . - "proyecto de investigaci\u00F3n relacionado con"@es-GO . - "Servicio de acceso"@es-GO . - "tiene t\u00EDtulo"@es-GO . - "cap\u00EDtulo"@es-GO . - "nameShortES"@es-GO . - "unidad de PIB"@es-GO . - "fecha"@es-GO . - "poblaci\u00F3n"@es-GO . - "tiene tel\u00E9fono"@es-GO . - "tiene la m\u00E1xima longitud"@es-GO . - "decisi\u00F3n"@es-GO . - "cita"@es-GO . - "No docente"@es-GO . - "nombre adicional"@es-GO . - "documento legal"@es-GO . - "tiene instalaciones"@es-GO . - "tiene tipo de salida"@es-GO . - "cuesti\u00F3n"@es-GO . - "codeISO3"@es-GO . - "profesor Em\u00E9rito"@es-GO . - "Junta Americana de Medicina Preventiva"@es-GO . - "Periodo acad\u00E9mico"@es-GO . - "se define por"@es-GO . - "Los datos acerca de una parte de Ontolog\u00EDa"@es-GO . - "novio"@es-GO . - "Documento de Comunicaci\u00F3n Personal"@es-GO . - "tiene la longitud m\u00EDnima"@es-GO . - "deslizar"@es-GO . - "apodo"@es-GO . - "laboratorio"@es-GO . - "continuant Independiente"@es-GO . - "Puesto de trabajo HR"@es-GO . - "Fecha / hora de intervalo"@es-GO . - "tiene fabricante"@es-GO . - "centro"@es-GO . - "nameOfficialIT"@es-GO . - "que ser sustituido por t\u00E9rmino ontolog\u00EDa externa"@es-GO . - "produce"@es-GO . - "se lleva a cabo por"@es-GO . "P\u00E1gina Web"@es-GO . - "nameOfficialEN"@es-GO . - "es el sucesor de"@es-GO . - "cr\u00E9ditos"@es-GO . - "entrada se ha especificado"@es-GO . - "sitio"@es-GO . - "Junta Americana de Anestesiolog\u00EDa"@es-GO . - "utiliza software"@es-GO . - "Papel Residente Permanente"@es-GO . - "Fecha / Hora Valor"@es-GO . + "valor de tiempo de a\u00F1o - mes - d\u00EDa"@es-GO . + "relaciona"@es-GO . + "audici\u00F3n"@es-GO . + "invitado"@es-GO . + "v\u00EDdeo"@es-GO . + "colecci\u00F3n"@es-GO . + "pel\u00EDcula"@es-GO . + "Audio- Visual Documento"@es-GO . + "Papel cl\u00EDnica"@es-GO . + "n\u00FAmero de p\u00E1ginas"@es-GO . + "Clasificaci\u00F3n internacional de c\u00F3digos ( ICL)"@es-GO . + "libro"@es-GO . + "Grado Acad\u00E9mico"@es-GO . + "N\u00FAmero de Identificaci\u00F3n Est\u00E1ndar Amazon ( ASIN )"@es-GO . + "\u00BFEs esta persona un autor correspondiente ?"@es-GO . + "Formaci\u00F3n Postdoctoral"@es-GO . + "Editado libro"@es-GO . + "extracto"@es-GO . + "el UP"@es-GO . + "Fecha / hora de intervalo"@es-GO . + "gui\u00F3n"@es-GO . + "ejecutante"@es-GO . + "exposici\u00F3n"@es-GO . + "requisito previo para"@es-GO . + "Serie de talleres"@es-GO . + "apoyada por"@es-GO . + "departamento"@es-GO . + "museo"@es-GO . + "caracter\u00EDsticas"@es-GO . + "Documento de Comunicaci\u00F3n Personal"@es-GO . + "mapa"@es-GO . + "NIH Manuscrito Env\u00EDo de ID del sistema"@es-GO . + "enfoque geogr\u00E1fico de"@es-GO . + "n\u00FAmero de licencia"@es-GO . + "citado por"@es-GO . + "Co- Investigador Principal Rol"@es-GO . + "lugar de publicaci\u00F3n"@es-GO . + "art\u00EDculo Acad\u00E9mico"@es-GO . + "nombre o inicial"@es-GO . + "instituto"@es-GO . + "corte"@es-GO . + "base de datos"@es-GO . + "lugar de publicaci\u00F3n de"@es-GO . + "facilidad"@es-GO . + "estatuto"@es-GO . + "Blog del anuncio"@es-GO . + "cuesti\u00F3n"@es-GO . + "estudiante"@es-GO . + "emisor"@es-GO . + "pa\u00EDs"@es-GO . + "transcripci\u00F3n de"@es-GO . "apodo (en desuso )"@es-GO . - "Relaci\u00F3n Asesoramiento Pregrado"@es-GO . - "nameCurrencyIT"@es-GO . - "Ensayos Cl\u00EDnicos"@es-GO . - "presentado"@es-GO . - "Datum Medici\u00F3n"@es-GO . - "documento de Audio"@es-GO . - "nota"@es-GO . - "Fase 0 de Ensayos Cl\u00EDnicos"@es-GO . - "otro"@es-GO . - "adyacente a"@es-GO . - "casa"@es-GO . - "publicaciones apoyo"@es-GO . - "tiene frontera con"@es-GO . - "Regi\u00F3n Econ\u00F3mica"@es-GO . - "Investigador Rol"@es-GO . - "tiene foto"@es-GO . - "URL"@es-GO . - "bibliotecario"@es-GO . - "nameListAR"@es-GO . - "comentario"@es-GO . - "es en el grupo"@es-GO . - "es la plantilla"@es-GO . - "precisi\u00F3n de la fecha / hora"@es-GO . - "ubicaci\u00F3n"@es-GO . - "Asesoramiento Relaci\u00F3n"@es-GO . - "Consejo Americano de Gen\u00E9tica M\u00E9dica"@es-GO . - "Graduate Student Papel"@es-GO . - "fecha de expiraci\u00F3n"@es-GO . - "n\u00FAmero"@es-GO . - "Organizaci\u00F3n cl\u00EDnica"@es-GO . - "identificador del informe"@es-GO . - "nameOfficialAR"@es-GO . + "documentos relacionados"@es-GO . + "campo principal de grado"@es-GO . + "Editor de funciones"@es-GO . + "imagen"@es-GO . + "proporciona fondos para"@es-GO . + "geopol\u00EDtica Entidad"@es-GO . + "cuesti\u00F3n"@es-GO . + "actas"@es-GO . + "conferencia"@es-GO . + "HR puesto de trabajo"@es-GO . + "Estudio de caso"@es-GO . "Unidad de Extensi\u00F3n"@es-GO . - "cuenta de correo electr\u00F3nico"@es-GO . + "subcontratado a trav\u00E9s de"@es-GO . + "Prestaci\u00F3n de Servicios de Laboratorio"@es-GO . + "financiaci\u00F3n proporcionada a trav\u00E9s de"@es-GO . + "Scopus ID"@es-GO . + "ofrecido por"@es-GO . + "cesionarios"@es-GO . + "la candidatura al grado"@es-GO . + "\u00E1reas de investigaci\u00F3n"@es-GO . + "Comunicado de prensa"@es-GO . + "Bibontology"@es-GO . + "Ciclo de Conferencias"@es-GO . + "organizaci\u00F3n sucesora"@es-GO . + "informe"@es-GO . + "T\u00EDtulo que otorga"@es-GO . + "International Standard Book Number (ISBN ) 13"@es-GO . + "ubicaci\u00F3n"@es-GO . + "n\u00FAmero de plazas"@es-GO . + "Estado del documento"@es-GO . + "decisi\u00F3n"@es-GO . + "biblioteca"@es-GO . + "Ubicaci\u00F3n geogr\u00E1fica"@es-GO . + "materia de"@es-GO . + "cita"@es-GO . + "Conjunto de datos"@es-GO . + "contribuyente"@es-GO . + "Art\u00EDculo serie y Contribuci\u00F3n Identificador ( SICI )"@es-GO . + "No docente"@es-GO . + "departamento o nombre de la escuela dentro de la instituci\u00F3n"@es-GO . + "Laboratorio Core"@es-GO . + "t\u00EDtulo relacionado"@es-GO . + "relacionados por"@es-GO . + "cap\u00EDtulo"@es-GO . + "cita"@es-GO . + "p\u00E1gina final"@es-GO . + "cuenta con equipos"@es-GO . + "premio local ID"@es-GO . + "habitaci\u00F3n"@es-GO . + "borrador"@es-GO . + "reportero de la corte"@es-GO . + "publicado EE.UU. Clasificaci\u00F3n Clase / subclase (CCL ) c\u00F3digo"@es-GO . + "peri\u00F3dico"@es-GO . + "traductor"@es-GO . + "Caso de Documentos Legales"@es-GO . + "persona"@es-GO . + "abstracto"@es-GO . + "profesi\u00F3n de escritor"@es-GO . + "competencia"@es-GO . + "relaci\u00F3n"@es-GO . + "A\u00F1o Acad\u00E9mico"@es-GO . + "beneficiario"@es-GO . + "ense\u00F1anza visi\u00F3n general"@es-GO . + "Regi\u00F3n Geogr\u00E1fica"@es-GO . + "traducci\u00F3n"@es-GO . "Serie de Seminarios"@es-GO . - "Informaci\u00F3n de la Entidad contenido"@es-GO . - "Investigaci\u00F3n Electr\u00F3nica Datacapture"@es-GO . - "Autoridad Gobernante"@es-GO . - "Estudio Individual Grupo"@es-GO . + "URI"@es-GO . + "fundaci\u00F3n"@es-GO . + "Residencia M\u00E9dica"@es-GO . + "importe total de la adjudicaci\u00F3n"@es-GO . + "entrevista"@es-GO . + "Graduate Asesoramiento Relaci\u00F3n"@es-GO . + "c\u00F3digo"@es-GO . + "Faculty Position Administrativo"@es-GO . + "asistente Rol"@es-GO . + "visi\u00F3n de conjunto"@es-GO . + "Organizaci\u00F3n Financiadora"@es-GO . + "asignado por"@es-GO . + "Fecha / Hora Valor"@es-GO . + "descripci\u00F3n"@es-GO . + "distribuye la financiaci\u00F3n de"@es-GO . + "nombre de prefijo"@es-GO . + "escuela"@es-GO . "revista"@es-GO . - "nombre de la unidad organizativa"@es-GO . - "revisado en"@es-GO . + "Posici\u00F3n bibliotecario"@es-GO . + "fecha de emisi\u00F3n"@es-GO . + "proyecto final de carrera"@es-GO . + "Secci\u00F3n libro"@es-GO . + "organizaci\u00F3n predecesora"@es-GO . + "legislaci\u00F3n"@es-GO . + "Organizador Papel"@es-GO . + "F1000 Enlace"@es-GO . + "reproduce"@es-GO . + "Posici\u00F3n no acad\u00E9mico"@es-GO . + "presentado en evento"@es-GO . + "proporciona fondos a trav\u00E9s"@es-GO . + "invertido por"@es-GO . + "Documento de trabajo"@es-GO . + "Presentaci\u00F3n"@es-GO . + "Premio de Honor o"@es-GO . + "sitio web"@es-GO . + "profesor Em\u00E9rito"@es-GO . + "editorial"@es-GO . + "anota"@es-GO . + "comit\u00E9"@es-GO . + "Serie de eventos"@es-GO . + "identificador"@es-GO . + "credencial expedida"@es-GO . + "evento"@es-GO . + "eRA Commons ID"@es-GO . + "licencia"@es-GO . + "Premio patrocinado por"@es-GO . + "Agencia Gubernamental"@es-GO . + "publicado"@es-GO . + "tiene valor"@es-GO . + "Proceso Educativo"@es-GO . + "identificador"@es-GO . + "revisi\u00F3n"@es-GO . + "Postdoctorado o Fellow Asesoramiento Relaci\u00F3n"@es-GO . + "Papel del profesor"@es-GO . + "visi\u00F3n general de divulgaci\u00F3n"@es-GO . + "apoyada por"@es-GO . + "fecha / hora precisi\u00F3n"@es-GO . + "editor"@es-GO . + "Outreach proveedor de funciones"@es-GO . + "nota"@es-GO . + "Funci\u00F3n de administrador"@es-GO . + "Faculty Position"@es-GO . + "International Standard Book Number (ISBN ) 10"@es-GO . + "EAN International- Uniform Code Council (EAN- UCC) 13"@es-GO . + "Vitro Ontolog\u00EDa P\u00FAblica"@es-GO . + "edificio"@es-GO . + "manual"@es-GO . + "palabras clave"@es-GO . + "rechazado"@es-GO . + "International Standard Serial Number (ISSN )"@es-GO . + "concepto asociado"@es-GO . + "valor del a\u00F1o"@es-GO . + "continente"@es-GO . + "Propuesta de Investigaci\u00F3n"@es-GO . + "orden de visualizaci\u00F3n preferida"@es-GO . + "discurso"@es-GO . + "informaci\u00F3n de contacto"@es-GO . + "divisi\u00F3n"@es-GO . + "director"@es-GO . + "patente"@es-GO . + "tiene prerrequisito"@es-GO . + "revisi\u00F3n de"@es-GO . + "costos directos"@es-GO . + "enfoque geogr\u00E1fico"@es-GO . + "campus"@es-GO . + "centro"@es-GO . + "abstracto"@es-GO . + "tiene organizaci\u00F3n afiliada"@es-GO . + "distribuidor"@es-GO . + "Regi\u00F3n subnacional"@es-GO . + "asociaci\u00F3n"@es-GO . + "manuscrito"@es-GO . + "No Facultad Acad\u00E9mica Posici\u00F3n"@es-GO . + "Proceso Asistir"@es-GO . + "identificador de informe"@es-GO . + "diapositiva"@es-GO . + "Documento de la Conferencia"@es-GO . + "Revisor Rol"@es-GO . + "n\u00FAmero de patente"@es-GO . + "documento Audio"@es-GO . + "n\u00FAmero de cap\u00EDtulo"@es-GO . + "Conferencia invitada"@es-GO . "aceptado"@es-GO . + "internado"@es-GO . + "Empresa privada"@es-GO . + "tiene valor monetario"@es-GO . + "revisado en"@es-GO . + "soportes"@es-GO . + "agente"@es-GO . + "contrato"@es-GO . + "documento legal"@es-GO . + "Papel miembro"@es-GO . + "Fuente de referencia"@es-GO . + "cat\u00E1logo"@es-GO . + "decisi\u00F3n judicial posterior"@es-GO . + "equipo"@es-GO . + "actas"@es-GO . + "tiene traducci\u00F3n"@es-GO . + "subcontratos otorgan"@es-GO . + "laboratorio"@es-GO . + "Premio o del recibo de Honor"@es-GO . + "revista"@es-GO . + "Conferencia Poster"@es-GO . + "breve"@es-GO . + "empresa"@es-GO . + "taller"@es-GO . + "Posici\u00F3n Postdoctoral"@es-GO . + "traductor de"@es-GO . + "organizaci\u00F3n"@es-GO . + "curso"@es-GO . + "documento Collected"@es-GO . + "hoja informativa"@es-GO . + "aconsejado Rol"@es-GO . + "actas de"@es-GO . + "visi\u00F3n general de investigaci\u00F3n"@es-GO . + "informaci\u00F3n adicional"@es-GO . + "pares revisado"@es-GO . + "art\u00EDculo Editorial"@es-GO . + "reuni\u00F3n"@es-GO . + "distribuye"@es-GO . + "tiene \u00E1rea tem\u00E1tica"@es-GO . + "t\u00E9rmino etiqueta"@es-GO . + "rendimiento"@es-GO . + "Lugar Poblado"@es-GO . + "rango"@es-GO . + "credencial"@es-GO . + "condado"@es-GO . + "Facultad relaci\u00F3n de mentor\u00EDa"@es-GO . + "cesionario de la patente"@es-GO . + "equipo"@es-GO . + "Miembro Em\u00E9rito de la Facultad"@es-GO . + "FileByteStream"@es-GO . + "posici\u00F3n"@es-GO . + "Presentador Rol"@es-GO . + "relaci\u00F3n"@es-GO . + "Estado o Provincia"@es-GO . + "fecha de presentaci\u00F3n"@es-GO . + "est\u00E1ndar"@es-GO . + "serie"@es-GO . + "coden"@es-GO . + "N\u00FAmero Online Computer Library Center ( OCLC )"@es-GO . + "miembro de la Facultad"@es-GO . + "certificado"@es-GO . + "p\u00E1gina de inicio"@es-GO . + "peri\u00F3dico"@es-GO . + "ofertas"@es-GO . + "publicaciones apoyadas u otras obras"@es-GO . + "Vitro internos"@es-GO . + "PubMed ID"@es-GO . + "equipos para"@es-GO . + "fecha de expiraci\u00F3n"@es-GO . + "publicado en"@es-GO . + "\u00E1rea de investigaci\u00F3n de"@es-GO . + "bibliotecario"@es-GO . + "Investigador Rol"@es-GO . + "proceso de organizaci\u00F3n"@es-GO . + "Proceso de Presentaci\u00F3n"@es-GO . + "estado"@es-GO . + "reproducido en"@es-GO . + "proyecto"@es-GO . + "valor de fecha / hora"@es-GO . + "entrevistador"@es-GO . + "contribuye a"@es-GO . + "presentado"@es-GO . + "tipo de t\u00E9rmino"@es-GO . + "expediente"@es-GO . + "Proceso de Asesoramiento"@es-GO . + "Departamento Acad\u00E9mico"@es-GO . + "hospital"@es-GO . + "volumen"@es-GO . + "traducci\u00F3n de"@es-GO . + "L\u00EDder Papel"@es-GO . + "Descripci\u00F3n corta"@es-GO . + "edici\u00F3n"@es-GO . + "premio patrocinador ID"@es-GO . + "Relaci\u00F3n Asesoramiento"@es-GO . + "de referencia del documento"@es-GO . + "Investigador Principal Rol"@es-GO . + "colegio"@es-GO . + "Estudiantes de Posgrado"@es-GO . + "tiene colaborador"@es-GO . + "comienzo"@es-GO . + "FOAF ( Friend of a Friend)"@es-GO . + "Organizaci\u00F3n cl\u00EDnica"@es-GO . + "programa"@es-GO . + "editor"@es-GO . + "ORCID iD"@es-GO . + "Periodo acad\u00E9mico"@es-GO . + "n\u00FAmero"@es-GO . + "Asesor Rol"@es-GO . + "presentaci\u00F3n"@es-GO . + "Rol Cr\u00EDtico"@es-GO . + "afirmada por"@es-GO . + "N\u00FAmero Mundial de Art\u00EDculo Comercial ( GTIN- 14 )"@es-GO . + "in\u00E9dito"@es-GO . + "Postdoctorado"@es-GO . + "Posici\u00F3n primaria"@es-GO . + "concepto para"@es-GO . + "en prensa"@es-GO . + "localizador"@es-GO . + "Blog"@es-GO . + "Researcher Rol"@es-GO . + "elegibilidad credencial alcanzado"@es-GO . + "presentado en"@es-GO . + "autoridad de gobierno para"@es-GO . + "valor del a\u00F1o - mes"@es-GO . + "grupo"@es-GO . + "art\u00EDculo"@es-GO . + "bibliotecario Em\u00E9rito"@es-GO . + "consorcio"@es-GO . + "subvenci\u00F3n"@es-GO . + "Relaci\u00F3n Asesoramiento Pregrado"@es-GO . + "Estudiantes de Pregrado"@es-GO . + "universidad"@es-GO . + "cesionario"@es-GO . + "cr\u00E9ditos"@es-GO . + "v\u00E1lida en"@es-GO . + "valor del a\u00F1o - mes - d\u00EDa"@es-GO . + "contribuyente"@es-GO . + "Organizaci\u00F3n de Estudiantes"@es-GO . + "esconderse de pantalla"@es-GO . + "entrevistado"@es-GO . + "No Facultad Acad\u00E9mica"@es-GO . + "carta"@es-GO . + "tiene instalaciones"@es-GO . + "PubMed Central ID"@es-GO . + "Fecha / hora Valor de precisi\u00F3n"@es-GO . + "Biblioteca del Congreso N\u00FAmero de control ( LCCN )"@es-GO . + "tesis"@es-GO . + "puntuaci\u00F3n"@es-GO . + "abreviatura"@es-GO . + "autoridad de gobierno"@es-GO . + "editor de"@es-GO . + "documento"@es-GO . + "Identificador de Objetos Digitales (DOI )"@es-GO . + "proyecto de ley"@es-GO . + "intervalo de fecha / hora"@es-GO . + "final"@es-GO . + "ISI Researcher ID"@es-GO . + "premio u honor patrocinadores"@es-GO . + "C\u00F3digo Universal de Producto ( UPC)"@es-GO . + "Licencias"@es-GO . + "Certificaci\u00F3n"@es-GO . + "Electronic International Standard Serial Number ( EISSN )"@es-GO . + "Organizaci\u00F3n de Investigaci\u00F3n"@es-GO . diff --git a/languages/es_GO/themes/wilma/i18n/all_es_GO.properties b/languages/es_GO/themes/wilma/i18n/all_es_GO.properties index d784a516..15e845cc 100644 --- a/languages/es_GO/themes/wilma/i18n/all_es_GO.properties +++ b/languages/es_GO/themes/wilma/i18n/all_es_GO.properties @@ -109,7 +109,7 @@ websites = Websites advisee_label = etiqueta aconsejado advisor_label = etiqueta asesor candidate = candidato -candidate = candidatura +candidacy = candidacy advisingRel_label = Etiqueta de advertencia editor_abbreviated = Ed. @@ -230,10 +230,10 @@ fill_in_data = Rellene los datos help_capitalized = Ayudar fill_in_template_with_data = Complete la plantilla con sus datos. Puede completar varias plantillas si desea cosechar varios archivos a la vez. step_three = Paso 3 -upload_capitalized = Subir -uploaded_files = Archivos cargados upload_files = Cargar archivo(s) upload_completed_templates = Sube tu plantilla completa(s). +upload_capitalized = Subir +uploaded_files = Archivos cargados step_four = Paso 4 harvest_capitalized = Cosecha click_to_harvest = Haga clic en el botón para cosechar su archivo(s). @@ -682,8 +682,8 @@ or_add_new_one = o añadir uno nuevo. vocabulary_service_unavailable = Se ha encontrado un error en la ejecución de esta búsqueda. no_serch_results_found = No se han encontrado resultados de búsqueda. label_type = Label (Tipo) -definition_capitalized = Definición label_altLabels = Label (Etiquetas alternos) +definition_capitalized = Definición best_match = Mejor resultado select_term_from_results = Por favor, seleccione al menos un término de los resultados de búsqueda de búsqueda. select_vocabulary_source_to_search = Por favor, seleccione al menos una fuente externa vocabulario para buscar. @@ -828,10 +828,10 @@ enter_telephone_number = Por favor, introduzca un valor en el campo Número de t email_address = Dirección de Correo Electrónico email_address_for = dirección de correo electrónico para enter_email_address = Por favor, introduzca un valor en el campo Dirección de Correo Electrónico. -first_name = Primer nombre -last_name = Apellido full_name = Nombre completo full_name_for = nombre completo de +first_name = Primer nombre +last_name = Apellido title_not_found = Título no encontrada. speeches_capitalized = Discursos theses_capitalized = Tesis @@ -876,4 +876,4 @@ administering_organization_for = administración de la organización para missing_credential = falta credencial grant_administered_by = conceder administrado por missing_grant = falta de subvención -editor_of_entry = editor de para \ No newline at end of file +editor_of_entry = editor de para From 4d69707397c66cd2cc211d759eb127e6c5ded5f7 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Mon, 9 Dec 2013 17:29:03 -0500 Subject: [PATCH 15/33] Holly made some more test case changes related to RC 4 --- .../AddNonPersonThings/CreateActivity.html | 105 +- .../AddNonPersonThings/CreateCourse.html | 506 +++++-- .../AddNonPersonThings/CreateEquipment.html | 132 +- .../AddNonPersonThings/CreateEvent.html | 130 +- .../AddNonPersonThings/CreateLocation.html | 114 +- .../CreateOrganization.html | 369 +++-- .../suites/CreatePeople/AddFacultyInfo.html | 1282 +++++++++-------- .../suites/CreatePeople/AddFacultyInfo2.html | 34 +- .../CreatePeople/AssociateLibToFac.html | 7 +- .../suites/CreatePeople/EditFacultyInfo.html | 165 ++- .../CreatePeople/PublicFacultyInfo.html | 32 +- .../CreatePeople/SearchFacultyInfo.html | 7 +- .../AddMuseumArchDetails.html | 2 +- .../AddMuseumVisitingHours.html | 30 +- .../AddObjPropVisitingHours.html | 27 +- .../DeleteObjPropVisitingHours.html | 12 +- .../EditObjPropVisitingHours.html | 4 +- .../LinkedOpenData/CheckDataHiding.html | 101 +- .../suites/LinkedOpenData/TestRDFAccept.html | 632 +++++++- .../LinkedOpenData/TestUserCreated.html | 49 +- .../LinkedOpenData/TestVariousRequests.html | 78 +- .../suites/ShortViews/CheckResults.html | 7 +- .../ShortViews/CreateTestDepartments.html | 11 +- 23 files changed, 2675 insertions(+), 1161 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html index 8f30b4c9..5e61d975 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html @@ -478,7 +478,7 @@ verifyTextPresent - Add new entry for: local award id + Add new entry for: local award ID @@ -587,7 +587,93 @@ Primate Elderly Care + + + clickAndWait + css=a.add-BFO_0000051 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Habitat Research Grant + + + clickAndWait + id=submit + + + + assertTitle + Primate Elderly Care + + + + clickAndWait + css=a.add-BFO_0000050 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Survival Planning Grant + + + clickAndWait + id=submit + + + + assertTitle + Primate Elderly Care + + + + clickAndWait + css=a.add-supportedInformationResource + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Info + + + clickAndWait + id=submit + + + + assertTitle + Primate Elderly Care + + + + verifyTextPresent + Primate Elderly Care + + + + verifyTextPresent + Grant + + verifyTextPresent Purpose of grant is to determine the appropriate environment, physical activity, and diet for primates as they age. @@ -603,6 +689,11 @@ link=Elderly Care + + verifyElementPresent + link=Primate Research Laboratory + + verifyElementPresent link=Primate Colleges of the World @@ -625,7 +716,12 @@ verifyElementPresent - link=Primate Health Check + link=Primate Habitat Research Grant + + + + verifyElementPresent + link=Primate Survival Planning Grant @@ -653,6 +749,11 @@ P999-1234 + + verifyElementPresent + link=Primate Info + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index 97115bf5..fb56fb58 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -157,7 +157,7 @@ Introduction to Primate Health - + clickAndWait //h3[@id='description']/a/img @@ -193,11 +193,6 @@ Introduction to Primate Health - - click - //div[@id='wrapper-content']/ul/li[10] - - clickAndWait css=a.add-offeredBy > img.add-individual @@ -210,7 +205,7 @@ verifyTextPresent - Add an entry to: offered by + Select an existing Organization for Introduction to Primate Health @@ -248,42 +243,6 @@ Introduction to Primate Health - - clickAndWait - //h3[@id='contactInformation']/a/img - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: contact information - - - - waitForElementPresent - tinymce - - - - type - tinymce - ME Tarzan at metarzan@primates.edu or 555-555-5553 - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - clickAndWait //h3[@id='geographicFocus']/a/img @@ -314,43 +273,6 @@ Introduction to Primate Health - - - clickAndWait - xpath=(//img[@alt='add'])[14] - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Geographic Location for Introduction to Primate Health - - - - type - id=object - Libe - - - click - id=ui-active-menuitem - - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - clickAndWait //h3[@id='dateTimeInterval']/a @@ -406,58 +328,11 @@ Introduction to Primate Health - - clickAndWait - //h3[@id='presents']/a/img + click + //div[@id='wrapper-content']/ul/li[8] - - assertTitle - Edit - - - - select - typeOfNew - label=Webpage (bibo) - - - verifyTextPresent - Select an existing Document for Introduction to Primate Health - - - - clickAndWait - id=offerCreate - - - - assertTitle - Edit - - - - verifyTextPresent - Create "related documents" entry for Introduction to Primate Health - - - - type - name - http://primatehealthintro.cornell.edu - - - clickAndWait - submit - - - - assertTitle - Introduction to Primate Health - - - clickAndWait css=a.add-BFO_0000051 > img.add-individual @@ -533,6 +408,269 @@ Introduction to Primate Health + + clickAndWait + css=a.add-BFO_0000050 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Health and Fitness + + + clickAndWait + id=submit + + + + assertTitle + Introduction to Primate Health + + + + clickAndWait + xpath=(//img[@alt='add'])[7] + + + + assertTitle + Edit + + + + select + id=typeOfNew + label=Seminar Series (vivo) + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + type + id=name + Primate Health Talks + + + clickAndWait + id=submit + + + + assertTitle + Introduction to Primate Health + + + + + click + css=li.nonSelectedGroupTab.clickable + + + + clickAndWait + //h3[@id='presents']/a/img + + + + assertTitle + Edit + + + + select + typeOfNew + label=Webpage (bibo) + + + verifyTextPresent + Select an existing Document for Introduction to Primate Health + + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + verifyTextPresent + Create "related documents" entry for Introduction to Primate Health + + + + type + name + http://primatehealthintro.cornell.edu + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + + + clickAndWait + css=a.add-RO_0002234 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Happenings + + + clickAndWait + id=submit + + + + assertTitle + Introduction to Primate Health + + + + + click + //div[@id='wrapper-content']/ul/li[6] + + + + clickAndWait + //h3[@id='contactInformation']/a/img + + + + assertTitle + Edit + + + + verifyTextPresent + Add new entry for: contact information + + + + waitForElementPresent + tinymce + + + + type + tinymce + ME Tarzan at metarzan@primates.edu or 555-555-5553 + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + + + clickAndWait + xpath=(//img[@alt='add'])[14] + + + + assertTitle + Edit + + + + verifyTextPresent + Select an existing Geographic Location for Introduction to Primate Health + + + + type + id=object + Libe + + + click + id=ui-active-menuitem + + + + clickAndWait + submit + + + + assertTitle + Introduction to Primate Health + + + + clickAndWait + css=a.add-RO_0001025 > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + type + id=name + Primate Memorial Building + + + clickAndWait + id=submit + + + + assertTitle + Introduction to Primate Health + + + + + click + //div[@id='wrapper-content']/ul/li[8] + + clickAndWait //h3[@id='courseCredits']/a/img @@ -563,10 +701,45 @@ Introduction to Primate Health + + clickAndWait + css=a.add-hasPrerequisite > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Introduction to Primates + + + clickAndWait + id=submit + + + + assertTitle + Introduction to Primate Health + + + + click + //div[@id='wrapper-content']/ul/li[10] + + verifyTextPresent - Primate College of America + Introduction to Primate Health + + + + verifyTextPresent + Course @@ -575,23 +748,8 @@ - verifyTextPresent - Introduction to Primate Health - - - - verifyTextPresent - ME Tarzan at metarzan@primates.edu or 555-555-5553 - - - - verifyTextPresent - Africa - - - - verifyTextPresent - Liberia + verifyElementPresent + link=Primate College of America @@ -600,23 +758,63 @@ - verifyTextPresent - http://primatehealthintro.cornell.edu + verifyElementPresent + link=Primate Health and Fitness + + + + verifyElementPresent + link=Primate Health Check + + + + verifyElementPresent + link=Primate Health Talks + + + + verifyElementPresent + link=Animal Health + + + + verifyElementPresent + link=Introduction to Primate Health + + + + verifyElementPresent + link=Africa + + + + verifyElementPresent + link=Primate Happenings + + + + verifyElementPresent + link=http://primatehealthintro.cornell.edu verifyTextPresent - Introduction to Primate Health + ME Tarzan at metarzan@primates.edu or 555-555-5553 - verifyTextPresent - Primate Health Check + verifyElementPresent + link=Primate Memorial Building - verifyTextPresent - Animal Health + verifyElementPresent + link=Liberia + + + + verifyElementPresent + link=Introduction to Primates diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index b8e91221..2eb0932d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -160,7 +160,7 @@ click - //div[@id='wrapper-content']/ul/li[6] + //div[@id='wrapper-content']/ul/li[8] @@ -285,10 +285,116 @@ Primate Research Lab Room 123 + + + clickAndWait + css=a.add-ERO_0000070 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Research Laboratory + + + clickAndWait + id=submit + + + + assertTitle + Primate Feeder + + + + clickAndWait + css=a.add-RO_0003001 > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Primate Feeder + + + + clickAndWait + css=a.add-RO_0003000 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Feeder + + + clickAndWait + id=submit + + + + assertTitle + Primate Feeder + + + + clickAndWait + css=a.add-OBI_0000304 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate College of America + + + clickAndWait + id=submit + + + + assertTitle + Primate Feeder + + - verifyTextPresent - Primate Research Lab Room 123 + verifyElementPresent + link=Primate Research Laboratory + + + + verifyElementPresent + link=Primate Research Laboratory + + + + verifyElementPresent + link=Portable Primate Habitat @@ -296,6 +402,26 @@ link=Primate Feeder + + verifyElementPresent + link=Primate Feeder + + + + verifyElementPresent + link=Primate College of America + + + + verifyTextPresent + Animal Diet + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index 77ce6cd6..86d1b4f6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -380,15 +380,34 @@ Select an existing Facility for Primate Health Conference - - - + select + id=typeOfNew + label=Facility (vivo) + + + clickAndWait + id=offerCreate + assertTitle + Edit + + + type + id=name + State Fair Park + + + clickAndWait + id=submit + + + assertTitle + Primate Health Conference @@ -481,7 +500,7 @@ verifyTextPresent - Add an entry to: includes event + Select an existing Event for Primate Health Conference @@ -584,10 +603,86 @@ Primate Health Conference + + + clickAndWait + css=a.add-BFO_0000050 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Health and Fitness + + + clickAndWait + id=submit + + + + assertTitle + Primate Health Conference + + + + clickAndWait + xpath=(//img[@alt='add'])[6] + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Primate Health Conference + + + + clickAndWait + css=a.add-RO_0002234 > img.add-individual + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Happenings + + + clickAndWait + id=submit + + + + assertTitle + Primate Health Conference + + verifyTextPresent - PrimHConf + Primate Health Conference + + + + verifyTextPresent + Conference @@ -595,16 +690,31 @@ First annual conference for those interested in the general health of primates. + + verifyTextPresent + PrimHConf + + verifyTextPresent January 5, 2011 - January 9, 2011 + + verifyElementPresent + link=Primate Health and Fitness + + verifyElementPresent link=Primate Health Check + + verifyElementPresent + link=Primate Health Talks + + verifyElementPresent link=Animal Health @@ -620,6 +730,11 @@ link=Kenya + + verifyElementPresent + link=Primate Happenings + + verifyElementPresent link=http://primatehealthintro.cornell.edu @@ -630,6 +745,11 @@ info@primateconf.org + + verifyElementPresent + link=State Fair Park + + verifyElementPresent link=Congo diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index 9496851c..f8e2cde3 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -138,7 +138,7 @@ verifyTextPresent - Please enter a value in the name field. + Please enter a value in the Name field. @@ -158,14 +158,9 @@ - - click - //div[@id='wrapper-content']/ul/li[6] - - clickAndWait - //h3[@id='hasRoom']/a/img + css=a.add-BFO_0000051 > img.add-individual @@ -210,7 +205,7 @@ clickAndWait - //h3[@id='geographicallyContains']/a/img + css=a.add-BFO_0000050 > img.add-individual @@ -225,8 +220,8 @@ select - typeOfNew - label=Campus (vivo) + id=typeOfNew + label=Geographic Location (vivo) clickAndWait @@ -238,19 +233,14 @@ Edit - - verifyTextPresent - Create "geographically contains" entry for Jane Memorial Building - - type - name - Primate Research Laboratory + id=name + Primate Quad clickAndWait - submit + id=submit @@ -261,7 +251,7 @@ clickAndWait - //h3[@id='locationOfEquipment']/a/img + css=a.add-RO_0001015 > img.add-individual @@ -271,7 +261,7 @@ verifyTextPresent - Add an entry to: location of equipment + Select an existing Material Entity for Jane Memorial Building @@ -284,9 +274,10 @@ Jane Memorial Building + clickAndWait - css=a.add-geographicLocationOf > img.add-individual + xpath=(//img[@alt='add'])[3] @@ -295,15 +286,60 @@ - type - id=object - Primate Research labor + select + id=objectVar + label=Primate Heart Health - click - id=ui-active-menuitem + clickAndWait + id=submit + + assertTitle + Jane Memorial Building + + + + clickAndWait + xpath=(//h3[@id='RO_0001015']/a)[3] + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate University of America + + + clickAndWait + id=submit + + + + assertTitle + Jane Memorial Building + + + + clickAndWait + xpath=(//img[@alt='add'])[5] + + + + assertTitle + Edit + + + + select + id=objectVar + label=Primate Health Check + clickAndWait id=submit @@ -316,23 +352,33 @@ - verifyTextPresent - Primate Research Laboratory + verifyElementPresent + link=Portable Primate Habitat - verifyTextPresent - Lab Admin Office + verifyElementPresent + link=Primate Heart Health - verifyTextPresent - Primate Research Laboratory + verifyElementPresent + link=Primate University of America - verifyTextPresent - Portable Primate Habitat + verifyElementPresent + link=Primate Health Check + + + + verifyElementPresent + link=Lab Admin Office + + + + verifyElementPresent + link=Primate Quad diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index c3255de2..bbad9e32 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -198,16 +198,6 @@ Primate College of America - - selectWindow - null - - - - click - css=li.nonSelectedGroupTab.clickable - - clickAndWait css=a.add-offers > img.add-individual @@ -248,16 +238,6 @@ Edit - - clickAndWait - //h3[@id='hasPredecessorOrganization']/a/img - - - - assertTitle - Edit - - select id=typeOfNew @@ -554,11 +534,6 @@ submit - - clickAndWait - link=Cancel - - assertTitle Primate College of America @@ -817,12 +792,12 @@ type - id=title + id=name Primate Info clickAndWait - submit + id=submit @@ -937,16 +912,6 @@ Edit - - clickAndWait - //h3[@id='hasGeographicLocation']/a/img - - - - assertTitle - Edit - - type id=object @@ -970,7 +935,7 @@ clickAndWait - xpath=(//img[@alt='add'])[33] + xpath=(//img[@alt='add'])[34] @@ -1045,7 +1010,7 @@ clickAndWait - xpath=(//img[@alt='add'])[34] + xpath=(//img[@alt='add'])[35] @@ -1279,7 +1244,7 @@ select id=typeOfNew - label=Blog (vivo) + label=Blog Posting (vivo) clickAndWait @@ -1411,22 +1376,31 @@ Edit + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + type + id=name + Human and Ape Brain Comparison + + + clickAndWait + id=submit + + assertTitle Primate College of America - - - - - - - - - - - click //div[@id='wrapper-content']/ul/li[10] @@ -1635,24 +1609,14 @@ Person, Polly, Dr. 1999 - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyTextPresent - Primate Research Laboratory Laboratory - - verifyElementPresent link=Primate History Library - verifyTextPresent - Primate History Library Library + verifyElementPresent + link=Primate Research Laboratory @@ -1670,11 +1634,6 @@ link=Primate History Library - - verifyTextPresent - Primate History Library Library - - verifyElementPresent link=Primates-r-us @@ -1731,11 +1690,6 @@ link=Primate Info - - verifyTextPresent - Primate Info Database - - verifyTextPresent invited talk @@ -1787,15 +1741,9 @@ link=Primate Survival Planning Grant - - - - - - - - + verifyElementPresent + link=Human and Ape Brain Comparison @@ -1820,13 +1768,18 @@ - verifyElementPresent - link=Introduction to Primates + verifyTextPresent + Primate Health Check Sponsor 2008 - 2010 - verifyTextPresent - Primate Health Check Sponsor 2008 - 2010 + verifyElementPresent + link=Portable Primate Habitat + + + + verifyElementPresent + link=Introduction to Primates @@ -1890,32 +1843,260 @@ link=Primate Colleges of the World - + click //div[@id='wrapper-content']/ul/li[14] + + verifyTextPresent + PCoA + + + + verifyTextPresent + 1959 - + + + + verifyElementPresent + link=B.S. Bachelor of Science + + + + verifyElementPresent + link=Primate Student of the Year + + + + verifyElementPresent + link=Best Primate College + + + + verifyTextPresent + faculty administrative position + + + + verifyElementPresent + link=Person, Polly + + + + verifyTextPresent + Person, Polly, Dr. 1999 - + + + + verifyElementPresent + link=Primate History Library + + + + verifyElementPresent + link=Primate Research Laboratory + + + + verifyElementPresent + link=Primates-r-us + + + + verifyTextPresent + Primates-r-us Founder 2010 - + + + + verifyElementPresent + link=Primate History Library + + + + verifyElementPresent + link=Primates-r-us + + + + verifyElementPresent + link=Primate Colleges of the World + + + + verifyTextPresent + Primate Colleges of the World Member 2009 - + + + + verifyElementPresent + link=Primate Heart Health + + + + verifyTextPresent + Primate Heart Health Founder 2010 - + + + + verifyElementPresent + link=New Primate Students + + + + verifyTextPresent + New Primate Students 2003 - 2006 + + + + verifyElementPresent + link=Primates in the Wild + + + + verifyTextPresent + Primates in the Wild 1997 - + + + + verifyElementPresent + link=Primate Info + + + + verifyTextPresent + invited talk + + + + verifyElementPresent + link=Primate Health and Fitness + + + + verifyTextPresent + Primate Health and Fitness, Organizer 2008 + + + + verifyElementPresent + link=Primate Happenings + + + + verifyElementPresent + link=USA222333444555 + + + + verifyElementPresent + link=Primate Heart Health + + + + verifyElementPresent + link=Primate Habitat Research Grant + + + + verifyElementPresent + link=Primate Habitat Research Grant + + + + verifyElementPresent + link=Primate Survival Planning Grant + + + + verifyElementPresent + link=Human and Ape Brain Comparison + + + + verifyTextPresent + Gorillas + + + + verifyElementPresent + link=Gorilla Moving Company + + + + verifyElementPresent + link=Primate Health Check + + + + verifyTextPresent + Primate Health Check Sponsor 2008 - 2010 + + verifyElementPresent link=Portable Primate Habitat + + verifyElementPresent + link=Introduction to Primates + + verifyTextPresent - Portable Primate Habitat - - - - - - - + 555-555-5555 + verifyTextPresent + 555-555-5554 + + + verifyTextPresent + info@primates.edu + + + verifyTextPresent + 1234 Northern African Nation + + + + verifyTextPresent + Morocco City + + + + verifyTextPresent + 1234567890 + + + + verifyTextPresent + Morocco + + + + verifyElementPresent + link=northern Africa + + + + verifyElementPresent + link=Primate College of New York + + + + verifyElementPresent + link=Primate University of America + + + + verifyElementPresent + link=Primate Colleges of the World diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index e6be06f0..e56942e7 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -90,7 +90,7 @@ Faculty, Jane - + clickAndWait //h2[@id='hasResearchArea']/a/img @@ -356,76 +356,6 @@ Faculty, Jane - - selectWindow - null - - - - click - //div[@id='wrapper-content']/ul/li[18] - - - - clickAndWait - //h3[@id='hasCollaborator']/a/img - - - - assertTitle - Edit - - - - type - id=object - Librar - - - click - id=ui-active-menuitem - - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='researchOverview']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - I study monkeys, of course. - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.add-geographicFocus > img.add-individual @@ -456,166 +386,6 @@ Faculty, Jane - - clickAndWait - xpath=(//img[@alt='add'])[26] - - - - assertTitle - Edit - - - - select - id=selector - label=Postdoc or Fellow Advising Relationship - - - type - id=advisee - Smith - - - type - id=firstName - Joe - - - type - id=SubjectArea - Primates-R-Us Fellowship - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='teachingOverview']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - I teach monkeys to communicate. - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='outreachOverview']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - I travel the country teaching monkeys in zoos how to communicate. - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - xpath=(//img[@alt='add'])[36] - - - - assertTitle - Edit - - - - type - id=award - Monkey Trainer of the Year - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual - - - - assertTitle - Edit - - - - type - id=firstName - Jane - - - type - id=middleName - Elizabeth - - - type - id=lastName - Faculty - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait xpath=(//img[@alt='add'])[4] @@ -641,31 +411,6 @@ Faculty, Jane - - clickAndWait - xpath=(//img[@alt='add'])[39] - - - - assertTitle - Edit - - - - type - id=telephoneNumber - 607-244-4444 - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.add-ARG_2000028 > img.add-individual @@ -688,7 +433,7 @@ clickAndWait - css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual + xpath=(//img[@alt='add'])[3] @@ -698,28 +443,8 @@ type - id=streetAddressOne - The Jungle - - - type - id=city - Congo City - - - type - id=state - Congola State - - - type - id=postalCode - 1234567890 - - - type - id=countryEditMode - Democratic Republic of Congo + id=emailAddress + jfac@gmail.com clickAndWait @@ -731,9 +456,15 @@ Faculty, Jane + + + click + css=li.nonSelectedGroupTab.clickable + + clickAndWait - css=#ARG_2000028-Name-List > li > a.edit-ARG_2000028 > img.edit-individual + //h3[@id='hasCollaborator']/a/img @@ -743,313 +474,23 @@ type - id=prefix - Ms. + id=object + Librar - type - id=suffix - III - - - clickAndWait - id=submit + click + id=ui-active-menuitem - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='orcidId']/a/img - - - - type - id=orcidId - 1234 - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='researcherId']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - 123456789 - clickAndWait submit + - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='scopusId']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - 5678 - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - //h3[@id='freetextKeyword']/a/img - - - - assertTitle - Edit - - - - waitForElementPresent - tinymce - - - - type - tinymce - Apes - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - - clickAndWait - css=a.add-eligibleFor > img.add-individual - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Credential for Faculty, Jane - - - - clickAndWait - link=Cancel - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.add-eligibleFor > img.add-individual - - - - assertTitle - Edit - - - - verifyTextPresent - Select an existing Credential for Faculty, Jane - - - - clickAndWait - id=offerCreate - - - - assertTitle - Edit - - - - clickAndWait - link=Cancel - - - - clickAndWait - css=a.add-eligibleFor > img.add-individual - - - - select - id=typeOfNew - label=Credential (vivo) - - - clickAndWait - id=offerCreate - - - - assertTitle - Edit - - - - type - name - Primate Expert Association - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual - - - - assertTitle - Edit - - - - select - id=typeSelector - label=License - - - type - id=credential - Licensed Primate Expert - - - clickAndWait - css=input.submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.add-eRACommonsId > img.add-individual - - - - assertTitle - Edit - - - - clickAndWait - link=Cancel - - - - pause - 10000 - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.add-eRACommonsId > img.add-individual - - - - assertTitle - Edit - - - - verifyTextPresent - Add new entry for: eRA Commons ID - - - - waitForElementPresent - tinymce - - - - type - tinymce - ABC123987 - - - clickAndWait - submit - - - - assertTitle - Faculty, Jane + click + //div[@id='wrapper-content']/ul/li[4] @@ -1092,32 +533,6 @@ Faculty, Jane - - - clickAndWait - xpath=(//img[@alt='add'])[3] - - - - assertTitle - Edit - - - - type - id=emailAddress - jfac@gmail.com - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait xpath=(//img[@alt='add'])[11] @@ -1258,9 +673,86 @@ Faculty, Jane + + + click + //div[@id='wrapper-content']/ul/li[6] + + + + assertTitle + Faculty, Jane + + clickAndWait - css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual + //h3[@id='researchOverview']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + I study monkeys, of course. + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //h3[@id='freetextKeyword']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + Apes + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + + click + //div[@id='wrapper-content']/ul/li[8] + + + + clickAndWait + xpath=(//img[@alt='add'])[26] @@ -1270,27 +762,93 @@ select - id=typeSelector - label=Conference Poster + id=selector + label=Postdoc or Fellow Advising Relationship type - id=activity - Variety of Apes in Africa + id=advisee + Smith type - id=startField-year - 1983 + id=firstName + Joe type - id=endField-year - 1983 + id=SubjectArea + Primates-R-Us Fellowship clickAndWait - id=submit + css=input.submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //h3[@id='teachingOverview']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + I teach monkeys to communicate. + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + + click + //div[@id='wrapper-content']/ul/li[10] + + + + clickAndWait + //h3[@id='outreachOverview']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + I travel the country teaching monkeys in zoos how to communicate. + + + clickAndWait + submit @@ -1338,6 +896,46 @@ Faculty, Jane + + clickAndWait + css=#serviceGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual + + + + assertTitle + Edit + + + + select + id=typeSelector + label=Conference Poster + + + type + id=activity + Variety of Apes in Africa + + + type + id=startField-year + 1983 + + + type + id=endField-year + 1983 + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + clickAndWait xpath=(//img[@alt='add'])[28] @@ -1433,6 +1031,157 @@ id=submit + + + click + //div[@id='wrapper-content']/ul/li[12] + + + + clickAndWait + xpath=(//img[@alt='add'])[36] + + + + assertTitle + Edit + + + + type + id=award + Monkey Trainer of the Year + + + clickAndWait + css=input.submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-eligibleFor > img.add-individual + + + + assertTitle + Edit + + + + verifyTextPresent + Select an existing Credential for Faculty, Jane + + + + clickAndWait + link=Cancel + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-eligibleFor > img.add-individual + + + + assertTitle + Edit + + + + verifyTextPresent + Select an existing Credential for Faculty, Jane + + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + clickAndWait + link=Cancel + + + + clickAndWait + css=a.add-eligibleFor > img.add-individual + + + + select + id=typeOfNew + label=Credential (vivo) + + + clickAndWait + id=offerCreate + + + + assertTitle + Edit + + + + type + name + Primate Expert Association + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual + + + + assertTitle + Edit + + + + select + id=typeSelector + label=License + + + type + id=credential + Licensed Primate Expert + + + clickAndWait + css=input.submit + + + + assertTitle + Faculty, Jane + + clickAndWait css=#backgroundGroup > article.property > #RO_0000053 > a.add-RO_0000053 > img.add-individual @@ -1478,6 +1227,293 @@ Faculty, Jane + + + click + //div[@id='wrapper-content']/ul/li[14] + + + + clickAndWait + css=#ARG_2000028-Name-List > li > a.edit-ARG_2000028 > img.edit-individual + + + + assertTitle + Edit + + + + type + id=firstName + Jane + + + type + id=middleName + Elizabeth + + + type + id=lastName + Faculty + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + xpath=(//img[@alt='add'])[41] + + + + assertTitle + Edit + + + + type + id=telephoneNumber + 607-244-4444 + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=article.property > #ARG_2000028 > a.add-ARG_2000028 > img.add-individual + + + + assertTitle + Edit + + + + type + id=streetAddressOne + The Jungle + + + type + id=city + Congo City + + + type + id=state + Congola State + + + type + id=postalCode + 1234567890 + + + type + id=countryEditMode + Democratic Republic of Congo + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=#ARG_2000028-Name-List > li > a.edit-ARG_2000028 > img.edit-individual + + + + assertTitle + Edit + + + + type + id=prefix + Ms. + + + type + id=suffix + III + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + + click + //div[@id='wrapper-content']/ul/li[16] + + + + clickAndWait + //h3[@id='orcidId']/a/img + + + + type + id=orcidIdDisplay + 1234 + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //h3[@id='researcherId']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + 123456789 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //h3[@id='scopusId']/a/img + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + 5678 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-eRACommonsId > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + link=Cancel + + + + pause + 10000 + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-eRACommonsId > img.add-individual + + + + assertTitle + Edit + + + + verifyTextPresent + Add new entry for: eRA Commons ID + + + + waitForElementPresent + tinymce + + + + type + tinymce + ABC123987 + + + clickAndWait + submit + + + + assertTitle + Faculty, Jane + + clickAndWait css=a.add-ARG_0000197 > img.add-individual @@ -1539,6 +1575,7 @@ Faculty, Jane + verifyTextPresent Faculty, Jane @@ -1745,6 +1782,16 @@ link=Monkey Trainer of the Year + + verifyTextPresent + Adams, Amy, 2013 - + + + + verifyElementPresent + link=Adams, Amy + + click @@ -1794,7 +1841,7 @@ verifyElementPresent - link=exact:file:///C:/xampp/1234 + link=http://orcid.org/1234 @@ -1948,6 +1995,11 @@ link=Monkey Trainer of the Year + + verifyElementPresent + link=Adams, Amy + + verifyTextPresent Ms. Jane Elizabeth Faculty, III @@ -1985,7 +2037,7 @@ verifyElementPresent - link=exact:file:///C:/xampp/1234 + link=http://orcid.org/1234 diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index b1a74098..c3a14148 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -273,7 +273,7 @@ clickAndWait - xpath=(//img[@alt='add'])[39] + xpath=(//img[@alt='add'])[41] @@ -738,11 +738,6 @@ link=Primate Experts - - verifyElementPresent - link=Chimp Lover for Life - - verifyElementPresent link=Ape Trainer of the Decade @@ -753,6 +748,26 @@ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association + + verifyElementPresent + link=Professional Ape Trainer Association + + + + verifyElementPresent + link=Chimp Lover for Life + + + + verifyElementPresent + link=Adams, Amy + + + + verifyTextPresent + Adams, Amy, 2013 - + + verifyTextPresent Mrs. Jane E. Faculty, Jr. @@ -815,7 +830,12 @@ verifyElementPresent - link=exact:http://orcid.org/file:///C:/xampp/11111 + link=http://orcid.org/11111 + + + + verifyElementPresent + link=http://orcid.org/454545 diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 8f4a0b9b..83f02d8f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -158,12 +158,7 @@ - refreshAndWait - 10000 - - - - refreshAndWait + pause 10000 diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 4f3248c8..de3cc773 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -116,6 +116,11 @@ id=showAddFormButton + + assertConfirmation + Are you sure you want to remove this term? + + assertTitle Edit @@ -309,7 +314,7 @@ select id=typeOfNew - label=Geopolitical Entity (vivo) + label=County (vivo) clickAndWait @@ -629,7 +634,7 @@ type id=orcidIdDisplay - file:///C:/xampp/11111 + 11111 clickAndWait @@ -772,6 +777,51 @@ Faculty, Jane + + clickAndWait + css=a.delete-relatedBy > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertConfirmation + Are you sure you want to remove this license? + + + + assertTitle + Faculty, Jane + + clickAndWait css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual @@ -802,26 +852,6 @@ Faculty, Jane - - clickAndWait - css=a.delete-relatedBy > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.edit-eRACommonsId > img.edit-individual @@ -854,7 +884,62 @@ clickAndWait - css=a.edit-assigneeFor > img.edit-individual + xpath=(//img[@alt='edit this entry'])[13] + + + + assertTitle + Edit + + + + clickAndWait + id=delete + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-assigneeFor > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertConfirmation + Are you sure you want to remove this patent? + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-assigneeFor > img.add-individual @@ -887,26 +972,6 @@ Faculty, Jane - - clickAndWait - xpath=(//img[@alt='delete this entry'])[13] - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait @@ -1118,6 +1183,16 @@ link=Professional Ape Trainer Association + + verifyTextPresent + Adams, Amy, 2013 - + + + + verifyElementPresent + link=Adams, Amy + + verifyTextPresent Mrs. Jane E. Faculty, Jr. @@ -1159,8 +1234,8 @@ - verifyTextPresent - 11111 + verifyElementPresent + link=http://orcid.org/11111 diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index e4175003..404d207c 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -161,6 +161,11 @@ link=CIT Homepage + + click + //div[@id='wrapper-content']/ul/li[18] + + verifyElementPresent link=Librarian, Lily Lou @@ -286,11 +291,6 @@ link=Primate Experts - - verifyElementPresent - link=Chimp Lover for Life - - verifyElementPresent link=Ape Trainer of the Decade @@ -301,6 +301,21 @@ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association + + verifyElementPresent + link=Chimp Lover for Life + + + + verifyElementPresent + link=Adams, Amy + + + + verifyTextPresent + Adams, Amy, 2013 - + + verifyTextPresent Mrs. Jane E. Faculty, Jr. @@ -363,7 +378,12 @@ verifyElementNotPresent - link=exact:http://orcid.org/file:///C:/xampp/11111 + link=http://orcid.org/11111 + + + + verifyElementNotPresent + link=http://orcid.org/454545 diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index fdfb5bb3..42c75973 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -176,6 +176,11 @@ link=Primate Feeding + + verifyTextPresent + Primate Feeding Training Service + + verifyElementPresent link=Primate Reactions @@ -351,7 +356,7 @@ verifyTextPresent - Mozamia Country + Mozamia County diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html index a61fb1b3..82187480 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumArchDetails.html @@ -108,7 +108,7 @@ click - //div[@id='wrapper-content']/ul/li[18] + //div[@id='wrapper-content']/ul/li[16] diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html index bb693e0b..049c34e0 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html @@ -11,7 +11,7 @@ AddMuseumVisitingHours - + deleteAllVisibleCookies @@ -102,23 +102,13 @@ - clickAndWait - //h3[@id='visitingHours']/a/img + selectWindow + null - - assertTitle - Edit - - - - select - typeOfNew - label=Date/Time Interval (vivo) - clickAndWait - id=offerCreate + css=a.add-yearFounded > img.add-individual @@ -128,12 +118,12 @@ type - name - 10am-4pm + id=startField-year + 1959 clickAndWait - submit + id=submit @@ -141,10 +131,10 @@ Johnson Art Museum - + - verifyElementPresent - link=10am-4pm + verifyTextPresent + 1959 - diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html index c314572c..bf47f792 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html @@ -11,7 +11,7 @@ AddObjPropVisitingHours - + deleteAllVisibleCookies @@ -83,7 +83,7 @@ verifyElementNotPresent - link=visiting hours + link=year founded @@ -115,12 +115,12 @@ type name=LocalName - visitingHours + yearFounded type name=DomainPublic - visiting hours + year founded select @@ -130,12 +130,12 @@ type name=LocalNameInverse - visitingHoursFor + yearFoundedFor type name=RangePublic - visiting hours for + year founded for select @@ -167,6 +167,11 @@ name=OfferCreateNewOption + + type + name=CustomEntryForm + edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeIntervalFormGenerator + clickAndWait primaryAction @@ -180,7 +185,7 @@ verifyTextPresent - visiting hours (bibo) + year founded (bibo) @@ -200,12 +205,12 @@ verifyTextPresent - visitingHours + yearFounded verifyTextPresent - visiting hours + year founded @@ -240,7 +245,7 @@ verifyTextPresent - (unspecified) + edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeIntervalFormGenerator @@ -255,7 +260,7 @@ verifyTextPresent - http://purl.org/ontology/bibo/visitingHours + http://purl.org/ontology/bibo/yearFounded diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html index 58ee4708..7505509a 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html @@ -11,7 +11,7 @@ DeleteObjPropVisitingHours - + deleteAllVisibleCookies @@ -80,16 +80,16 @@ VIVO - + verifyElementPresent - link=visiting hours (bibo) + link=year founded (bibo) - + clickAndWait - link=visiting hours (bibo) + link=year founded (bibo) @@ -131,7 +131,7 @@ verifyTextNotPresent - visiting hours (bibo) + year founded (bibo) diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html index 94e096ea..80c11c1c 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html +++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html @@ -11,7 +11,7 @@ EditObjPropVisitingHours - + deleteAllVisibleCookies @@ -83,7 +83,7 @@ clickAndWait - link=visiting hours (bibo) + link=year founded (bibo) diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html index 72f3b950..02744c34 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html @@ -32,73 +32,22 @@ VIVO - - clickAndWait - link=Log in - - - - assertTitle - Log in to VIVO - - - - type - id=loginName - testAdmin@cornell.edu - - - type - id=loginPassword - Password - - - clickAndWait - name=loginForm - - - - assertTitle - VIVO - - + open /vivo/individual/lodFacultyMember/lodFacultyMember.rdf - - - pause 10000 - - verifyTextPresent - vivo:eRACommonsId - - - - verifyTextNotPresent - vivo:scopusId - - - - - - clickAndWait - link=Log out - - - - verifyTextNotPresent - Scopus Id - - + + + @@ -142,51 +91,37 @@ + open /vivo/individual/lodFacultyMember/lodFacultyMember.rdf - - - pause 10000 - - verifyTextPresent - vivo:eRACommonsId - - - - verifyTextPresent - vivo:scopusId - - - - - - - - - verifyTextNotPresent - Scopus Id - - + + + - - clickAndWait - link=Log out - - open /vivo/ + + assertTitle + VIVO + + + + clickAndWait + link=Log out + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html index c79731c3..61c18360 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html @@ -68,36 +68,656 @@ /vivo/TestLinkedOpenData.html - - pause - 10000 + verifyTextPresent + Test the Linked Open Data requests verifyTextPresent - ????? + Try various accept headers + verifyElementPresent + id=RDFXML_button + + + verifyElementPresent + id=N3_button + + + verifyElementPresent + id=TTL_button + + + + verifyElementPresent + id=JSONLD_button + + + + verifyTextPresent + Try non-existent URI with RDFXML accept header + + + + verifyElementPresent + id=BOGUS_URI_button + + + + verifyElementPresent + id=BOGUS_ACCEPT_button + + + + verifyElementPresent + id=BOGUS_FORMAT_button + + + + verifyElementPresent + id=BOGUS_EXTENSION_button + + + + verifyTextPresent + Response data + + + + verifyElementPresent + id=CLEAR_button + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text - clickAndWait - link=Log out + click + id=RDFXML_button + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/rdf+xml + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + <rdf:RDF xmlns:vitro-public="http://vitro.mannlib.cornell.edu/ns/vitro/public#" xmlns:c4o="http://purl.org/spar/c4o/" xmlns:geo="http://aims.fao.org/aos/geopolitical.owl#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:obo="http://purl.obolibrary.org/obo/" xmlns:ocrer="http://purl.org/net/OCRe/research.owl#" xmlns:event="http://purl.org/NET/c4dm/event.owl#" + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=N3_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/n3 + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + @prefix ocresd: <http://purl.org/net/OCRe/study_design.owl#> . @prefix geo: <http://aims.fao.org/aos/geopolitical.owl#> . @prefix foaf: <http://xmlns.com/foaf/0.1/> . @prefix scires: <http://vivoweb.org/ontology/scientific-research#> . @prefix cito: <http://purl.org/spar/cito/> . @prefix fabio: <http://purl.org/spar/fabio/> . @prefix vcard: <http://www.w3.org/2006/vcard/ns#> . + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=TTL_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/turtle + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + @prefix ocresd: <http://purl.org/net/OCRe/study_design.owl#> . @prefix geo: <http://aims.fao.org/aos/geopolitical.owl#> . @prefix foaf: <http://xmlns.com/foaf/0.1/> . @prefix scires: <http://vivoweb.org/ontology/scientific-research#> . @prefix cito: <http://purl.org/spar/cito/> . @prefix fabio: <http://purl.org/spar/fabio/> . @prefix vcard: <http://www.w3.org/2006/vcard/ns#> . + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=JSONLD_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/json + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=BOGUS_URI_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 404 + + + + verifyTextPresent + MIME type is text/html + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Individual Not Found</title> <!-- vitro base styles (application-wide) --> <link + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=BOGUS_ACCEPT_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/html + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Example, Bad </title> <!-- vitro base styles (application-wide) --> <link + + + + verifyTextPresent + Mr. Bad Example + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=BOGUS_FORMAT_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/html + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Example, Bad </title> <!-- vitro base styles (application-wide) --> <link + + + + verifyTextPresent + Mr. Bad Example + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=BOGUS_EXTENSION_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 404 + + + + verifyTextPresent + MIME type is text/html + + + + verifyTextPresent + Text is: + + + + verifyTextNotPresent + No text + + + + verifyTextPresent + <!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Individual Not Found</title> <!-- vitro base styles (application-wide) --> <link + + + + verifyTextNotPresent + Mr. Bad Example + + + + verifyTextPresent + Individual not found + + + + + click + id=CLEAR_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + open /vivo/ + + clickAndWait + link=Log out + + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html index 52117c10..e3924e5e 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestUserCreated.html @@ -67,16 +67,55 @@ /vivo/display/lodFacultyMember - - + - pause - 10000 + assertTitle + Example, Bad verifyTextPresent - ????? + Faculty Member + + + + verifyTextPresent + Not someone on whom you should base your actions. + + + + verifyElementPresent + link=Slashdot + + + + click + //div[@id='wrapper-content']/ul/li[18] + + + + verifyElementPresent + link=Department of Redundancy Department + + + + verifyTextPresent + Department of Redundancy Department Bozo 1992 - + + + + verifyTextPresent + Mr. Bad Example + + + + verifyTextPresent + My_eRA_ID + + + + verifyElementPresent + link=10982375409 diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html index 2736a519..63dd3d95 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html @@ -69,17 +69,12 @@ - pause 10000 - - verifyTextPresent - ????? - - + open @@ -87,17 +82,12 @@ - pause 10000 - - verifyTextPresent - ????? - - + open @@ -105,18 +95,18 @@ - - pause 10000 + verifyTextPresent - ????? + [{"@id":"http://localhost:8080/vivo/individual/lodFacultyMember/lodFacultyMember.jsonld","http://purl.org/dc/elements/1.1/rights":[{"@id":"http://vivo.mydomain.edu/termsOfUse"}],"http://purl.org/dc/elements/1.1/date": + open @@ -124,16 +114,16 @@ - - pause 10000 + + verifyTextPresent - ????? + [{"@id":"http://localhost:8080/vivo/display/lodFacultyMember","http://purl.org/dc/elements/1.1/rights":[{"@id":"http://vivo.mydomain.edu/termsOfUse"}],"http://purl.org/dc/elements/1.1/date":[{"@value":"2013-12-09T15:25:39","@type":"http: @@ -143,18 +133,13 @@ - - pause 10000 - - verifyTextPresent - ????? - - + + open @@ -162,18 +147,13 @@ - - pause 10000 - - verifyTextPresent - ????? - - + + open @@ -181,18 +161,13 @@ - - pause 10000 - - verifyTextPresent - ????? - - + + open @@ -200,24 +175,35 @@ - - pause 10000 - - verifyTextPresent - ????? - - + + open /vivo/display/bogus?format=jsonld + + assertTitle + Individual Not Found + + + + verifyTextPresent + Individual not found: + + + + verifyTextPresent + This id is the id of the entity to query for. netid also works. + + + clickAndWait link=Log out diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html index b77f786a..aac871d3 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html +++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html @@ -289,10 +289,15 @@ - clickAndWait + click link=Person (5) + + pause + 5000 + + verifyElementPresent link=Baker, Able diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html index 29210b35..acf6fcad 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html @@ -107,7 +107,7 @@ clickAndWait - css=a.add-RO_0001025 > img.add-individual + xpath=(//img[@alt='add'])[38] @@ -234,17 +234,12 @@ clickAndWait - link=Campus + link=Building assertTitle - Campus - - - - verifyElementPresent - link=Building A + Building From 2b132e46c92a3d58eb0929955311f11b48255387 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Mon, 9 Dec 2013 17:37:32 -0500 Subject: [PATCH 16/33] Holly renamed 4 test cases due to change from testing visiting hours to testing year founded. --- ...MuseumVisitingHours.html => AddMuseumYearFounded.html} | 0 ...jPropVisitingHours.html => AddObjPropYearFounded.html} | 0 ...opVisitingHours.html => DeleteObjPropYearFounded.html} | 0 ...PropVisitingHours.html => EditObjPropYearFounded.html} | 0 .../acceptance-tests/suites/CreateProperties/Suite.html | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename utilities/acceptance-tests/suites/CreateProperties/{AddMuseumVisitingHours.html => AddMuseumYearFounded.html} (100%) rename utilities/acceptance-tests/suites/CreateProperties/{AddObjPropVisitingHours.html => AddObjPropYearFounded.html} (100%) rename utilities/acceptance-tests/suites/CreateProperties/{DeleteObjPropVisitingHours.html => DeleteObjPropYearFounded.html} (100%) rename utilities/acceptance-tests/suites/CreateProperties/{EditObjPropVisitingHours.html => EditObjPropYearFounded.html} (100%) diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html similarity index 100% rename from utilities/acceptance-tests/suites/CreateProperties/AddMuseumVisitingHours.html rename to utilities/acceptance-tests/suites/CreateProperties/AddMuseumYearFounded.html diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html similarity index 100% rename from utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html rename to utilities/acceptance-tests/suites/CreateProperties/AddObjPropYearFounded.html diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html similarity index 100% rename from utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropVisitingHours.html rename to utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html similarity index 100% rename from utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html rename to utilities/acceptance-tests/suites/CreateProperties/EditObjPropYearFounded.html diff --git a/utilities/acceptance-tests/suites/CreateProperties/Suite.html b/utilities/acceptance-tests/suites/CreateProperties/Suite.html index c27dea3d..6db3b565 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/Suite.html +++ b/utilities/acceptance-tests/suites/CreateProperties/Suite.html @@ -11,15 +11,15 @@ RebuildSearchIndex AddPropertyGroupPlace ChangePlaceDisplayRank -AddObjPropVisitingHours -EditObjPropVisitingHours +AddObjPropYearFounded +EditObjPropYearFounded AddMuseum -AddMuseumVisitingHours +AddMuseumYearFounded AddDataPropArchDetails AddMuseumArchDetails DeleteMuseum DeleteDataPropArchDetails -DeleteObjPropVisitingHours +DeleteObjPropYearFounded DeletePropertyGroupPlace From 1b934b6176cf9a2bb30a0c946342b75b0e794863 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Mon, 9 Dec 2013 18:46:18 -0500 Subject: [PATCH 17/33] Further tweaks to display, domain and range settings for properties that had been missing inverse property statements. Setting skos:related to be an owl:SymmetricProperty --- rdf/tbox/filegraph/object-properties.owl | 25 +++++-- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 72 +++++++++++++++----- 2 files changed, 73 insertions(+), 24 deletions(-) diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index d59bc291..bd028855 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -97,7 +97,10 @@ - + + + + @@ -110,6 +113,8 @@ http://unstats.un.org/unsd/methods/m49/m49chang.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm + + @@ -122,6 +127,8 @@ United Nations Statistics Division http://unstats.un.org/unsd/methods/m49/m49chang.htm http://unstats.un.org/unsd/methods/m49/m49chang.htm http://unstats.un.org/unsd/methods/m49/m49chgef.htm + + @@ -242,7 +249,7 @@ - + Brian Druker has expertise in cancer research. PERSON: Melissa Haendel PERSON: Melissa Haendel @@ -771,7 +778,7 @@ there is a measurement process p that has specified output m, a measurement datu - + Alan Ruttenberg Liju Fan c is_manufactured_by o means that there was a process p in which c was built in which a person, or set of people or machines did the work(bore the "Manufacturer Role", and those people/and or machines were members or of directed by the organization to do this. @@ -1202,11 +1209,12 @@ there is a measurement process p that has specified output m, a measurement datu - Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . http://purl.org/ontology/bibo/ Relates a translated document to the original document. stable + + @@ -1214,6 +1222,8 @@ there is a measurement process p that has specified output m, a measurement datu + + @@ -1403,6 +1413,8 @@ there is a measurement process p that has specified output m, a measurement datu Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html . + + @@ -1524,6 +1536,7 @@ there is a measurement process p that has specified output m, a measurement datu + @@ -1625,9 +1638,9 @@ there is a measurement process p that has specified output m, a measurement datu - + - + diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 28aaa3ff..2e6c7ee0 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -2033,7 +2033,10 @@ vivo:courseCredits vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "Number of credits assigned a course by an learning institution."^^xsd:string . + "Number of credits assigned a course by an learning institution."^^xsd:string ; + vitro:inPropertyGroupAnnot + . + vcard:note rdfs:label "note"@en-US . @@ -2370,6 +2373,8 @@ vivo:grantSubcontractedThrough vitro:publicDescriptionAnnot "This relates a grant to the organization awarding the sub-contract for the grant."^^xsd:string ; vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean . obo:ERO_0001260 @@ -2959,12 +2964,16 @@ obo:ERO_0000395 geo:isSuccessorOf rdfs:label "is successor of"@en-US ; + vitro:displayRankAnnot + "92"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . geo:agriculturalAreaUnit rdfs:label "agricultural area unit"@en-US ; @@ -3021,12 +3030,20 @@ vivo:hasPrerequisite rdfs:label "has prerequisite"@en-US ; vitro:fullPropertyNameAnnot "hasPrerequisite"^^xsd:string ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "40"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:Database rdfs:label "Database"@en-US ; @@ -3269,12 +3286,16 @@ obo:RO_0002233 geo:isPredecessorOf rdfs:label "is predecessor of"@en-US ; + vitro:displayRankAnnot + "94"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:EmeritusLibrarian rdfs:label "Librarian Emeritus"@en-US ; @@ -3429,7 +3450,7 @@ bibo:translationOf vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot - "50"^^xsd:int ; + "52"^^xsd:int ; vitro:fullPropertyNameAnnot "translation of"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -3472,7 +3493,11 @@ geo:hasBorderWith vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:displayRankAnnot + "69"^^xsd:int ; + vitro:inPropertyGroupAnnot + . bibo:performer rdfs:label "performer"@en-US ; @@ -3584,13 +3609,18 @@ geo:validUntil . geo:hasMember - rdfs:label "has member"@en-US ; + rdfs:label "has member country or territory"@en-US ; + vitro:displayRankAnnot + "65"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + bibo:eissn rdfs:label "Electronic International Standard Serial Number (EISSN)"@en-US ; @@ -4211,13 +4241,18 @@ geo:validSince . geo:isInGroup - rdfs:label "is in group"@en-US ; + rdfs:label "in geographic grouping"@en-US ; + vitro:displayRankAnnot + "67"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + vivo:EditorialArticle rdfs:label "Editorial Article"@en-US ; @@ -5845,7 +5880,7 @@ vivo:prerequisiteFor vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot - "40"^^xsd:int ; + "42"^^xsd:int ; vitro:fullPropertyNameAnnot "prerequisite for"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -5855,7 +5890,11 @@ vivo:prerequisiteFor vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . bibo:isbn13 rdfs:label "International Standard Book Number (ISBN) 13"@en-US ; @@ -5946,6 +5985,8 @@ vivo:translatorOf vitro:publicDescriptionAnnot "This relates something as the translator of an information resource."^^xsd:string ; vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean . bibo:Document @@ -6155,7 +6196,7 @@ vivo:hasTranslation vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot - "50"^^xsd:int ; + "51"^^xsd:int ; vitro:fullPropertyNameAnnot "has translation"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -7691,11 +7732,6 @@ geo:HDIYear vitro:hiddenFromDisplayBelowRoleLevelAnnot . -geo:isInGroup - vitro:hiddenFromDisplayBelowRoleLevelAnnot - . - - geo:hasMaxLatitude vitro:hiddenFromDisplayBelowRoleLevelAnnot . From c8d6132eb403a2d02435a337d3223b44a499143a Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Tue, 10 Dec 2013 08:08:38 -0500 Subject: [PATCH 18/33] =?UTF-8?q?minor=20tweaks=20plus=20adding=20date/tim?= =?UTF-8?q?e=20value=20custom=20form=20annotations=20to=20date=20filed,=20?= =?UTF-8?q?date=20issued,=20globalcountdate,=20date=20expires=20that=20don?= =?UTF-8?q?=E2=80=99t=20q=20quite=20work=20yet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 26 +++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index b0255c72..d3a91ef4 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -320,13 +320,13 @@ vivo:GovernmentAgency . skos:narrower - rdfs:label "narrower term"@en-US ; + rdfs:label "narrower concept"@en-US ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot - "50"^^xsd:int ; + "52"^^xsd:int ; vitro:fullPropertyNameAnnot "narrower term"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -338,7 +338,9 @@ skos:narrower vitro:publicDescriptionAnnot "This relates a term that is narrower in meaning (i.e. more specific) to another term that is broader in meaning, where the scope (meaning) of narrower term falls completely within the scope of the broader term."^^xsd:string ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:affiliatedOrganization rdfs:label "has affiliated organization"@en-US ; @@ -1224,6 +1226,8 @@ obo:IAO_0000007 vivo:expirationDate rdfs:label "expiration date"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot @@ -5120,6 +5124,8 @@ bibo:Interview rdfs:label "has global count date"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -5320,13 +5326,13 @@ vivo:termLabel . skos:related - rdfs:label "related"@en-US ; + rdfs:label "related concept"@en-US ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot - "60"^^xsd:int ; + "54"^^xsd:int ; vitro:fullPropertyNameAnnot "related"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -5338,7 +5344,9 @@ skos:related vitro:publicDescriptionAnnot "This indicates when a term is related to another term in the same vocabulary."^^xsd:string ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . obo:BFO_0000148 rdfs:label "Zero-Dimensional Temporal Region"@en-US . @@ -6248,6 +6256,8 @@ geo:nameShortES vivo:dateIssued rdfs:label "date issued"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot @@ -7101,6 +7111,8 @@ vcard:hasSound vivo:dateFiled rdfs:label "date filed"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot @@ -7653,6 +7665,8 @@ vcard:OrganizationUnitName vivo:dateTime rdfs:label "date/time"@en-US , "date/time"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot From 62ac5106da7848261648bb91606eb859aab31a09 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Tue, 10 Dec 2013 09:55:28 -0500 Subject: [PATCH 19/33] changed label from broader term to broader concept --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index d3a91ef4..77c12f0f 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -4991,7 +4991,7 @@ obo:ERO_0001245 "true"^^xsd:boolean . skos:broader - rdfs:label "broader term"@en-US ; + rdfs:label "broader concept"@en-US ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot From 3564cb78aad1ed6a8ec434a6c1581692cad0307f Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 10 Dec 2013 11:37:57 -0500 Subject: [PATCH 20/33] VIVO-581 Add a diagnostic page --- productMods/WEB-INF/web.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index af9f9bdf..c294bd6a 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -664,6 +664,15 @@ /admin/showAuth + + ShowConfiguration + edu.cornell.mannlib.vitro.webapp.controller.admin.ShowConfiguration + + + ShowConfiguration + /admin/showConfiguration + + StartupStatus edu.cornell.mannlib.vitro.webapp.controller.admin.StartupStatusController From 220194dc731fdebea1b36492c047ebcd74a3657f Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 10 Dec 2013 12:42:45 -0500 Subject: [PATCH 21/33] VIVO-637 date time generator changes for various date time properties --- .../edit/forms/dateTimeValueForm.ftl | 3 +-- rdf/display/everytime/vivoListViewConfig.rdf | 21 +++++++++++++++++++ rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 10 ++++----- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl index 48439917..f0598f44 100644 --- a/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl +++ b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl @@ -51,8 +51,7 @@ ${i18n().cancel_link}

    -${stylesheets.add('', - '')} +${stylesheets.add('')} ${scripts.add('', '')} \ No newline at end of file diff --git a/rdf/display/everytime/vivoListViewConfig.rdf b/rdf/display/everytime/vivoListViewConfig.rdf index d085c9b2..42ef84f7 100644 --- a/rdf/display/everytime/vivoListViewConfig.rdf +++ b/rdf/display/everytime/vivoListViewConfig.rdf @@ -34,6 +34,27 @@ listViewConfig-dateTimeValue.xml + + + listViewConfig-dateTimeValue.xml + + + + listViewConfig-dateTimeValue.xml + + + + listViewConfig-dateTimeValue.xml + + + + listViewConfig-dateTimeValue.xml + + + + listViewConfig-dateTimeValue.xml + + listViewConfig-dateTimeValue.xml diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 77c12f0f..c6618463 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -60,7 +60,7 @@ vivo:offeredBy vivo:dateTimeValue rdfs:label "date/time value"@en-US ; vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -1227,7 +1227,7 @@ obo:IAO_0000007 vivo:expirationDate rdfs:label "expiration date"@en-US ; vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot @@ -5125,7 +5125,7 @@ bibo:Interview rdfs:label "has global count date"@en-US ; vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -6257,7 +6257,7 @@ geo:nameShortES vivo:dateIssued rdfs:label "date issued"@en-US ; vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot @@ -7112,7 +7112,7 @@ vcard:hasSound vivo:dateFiled rdfs:label "date filed"@en-US ; vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot From dce8cc39af54301d647a8788543c1fff8f4a102c Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 10 Dec 2013 14:16:17 -0500 Subject: [PATCH 22/33] VIVO-592 --- rdf/tbox/filegraph/object-properties3.owl | 9 --------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 4 ---- 2 files changed, 13 deletions(-) diff --git a/rdf/tbox/filegraph/object-properties3.owl b/rdf/tbox/filegraph/object-properties3.owl index 73dce86b..8de53c94 100644 --- a/rdf/tbox/filegraph/object-properties3.owl +++ b/rdf/tbox/filegraph/object-properties3.owl @@ -610,15 +610,6 @@ - - - - - - - - - diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index c6618463..fdc05654 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -5124,8 +5124,6 @@ bibo:Interview rdfs:label "has global count date"@en-US ; - vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -7665,8 +7663,6 @@ vcard:OrganizationUnitName vivo:dateTime rdfs:label "date/time"@en-US , "date/time"@en-US ; - vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot From ba63872b8faf2fde8e32a6286ce39a8e6d53d155 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 10 Dec 2013 15:47:21 -0500 Subject: [PATCH 23/33] VIVO-637 --- rdf/tbox/filegraph/data-properties.owl | 18 ----------------- rdf/tbox/filegraph/object-properties.owl | 21 ++++++++++++++++++++ rdf/tbox/filegraph/object-properties3.owl | 11 ---------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 4 ++++ 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/rdf/tbox/filegraph/data-properties.owl b/rdf/tbox/filegraph/data-properties.owl index b7eaf46e..4655c000 100644 --- a/rdf/tbox/filegraph/data-properties.owl +++ b/rdf/tbox/filegraph/data-properties.owl @@ -1621,15 +1621,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - The date on which the global citation count of the cited entity was recorded from a named bibliographic information source. - - - - @@ -1668,15 +1659,6 @@ modern society using the world of Star trek. Los Angeles Times, March - - - - - - - - - diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index bd028855..2f935ace 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -1264,6 +1264,15 @@ there is a measurement process p that has specified output m, a measurement datu + + + + + + + + + @@ -1276,6 +1285,18 @@ there is a measurement process p that has specified output m, a measurement datu + + + + + + + + The date on which the global citation count of the cited entity was recorded from a named bibliographic information source. + + + + diff --git a/rdf/tbox/filegraph/object-properties3.owl b/rdf/tbox/filegraph/object-properties3.owl index 8de53c94..faaa8265 100644 --- a/rdf/tbox/filegraph/object-properties3.owl +++ b/rdf/tbox/filegraph/object-properties3.owl @@ -752,17 +752,6 @@ - - - - - The date on which the global citation count of the cited entity was recorded from a named bibliographic information source. - - - - - - diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index fdc05654..312850e6 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -5124,6 +5124,8 @@ bibo:Interview rdfs:label "has global count date"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -7663,6 +7665,8 @@ vcard:OrganizationUnitName vivo:dateTime rdfs:label "date/time"@en-US , "date/time"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimePropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot From 42c50be5d647a7dee4657dc99733d71ef0fb9e34 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 10 Dec 2013 16:51:45 -0500 Subject: [PATCH 24/33] list view tweak for VIVO-632 --- productMods/config/listViewConfig-advisorIn.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index 25146b7a..c1d1157a 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -30,7 +30,8 @@ ?advisorRole core:relatedBy ?advisingRel . LET ( ?localName := afn:localname(?advisingRel) ) OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } - OPTIONAL { ?advisingRel core:relates ?advisee . + OPTIONAL { ?advisingRel core:relates ?adviseeRole . + ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . ?advisee a foaf:Person . ?advisee rdfs:label ?adviseeLabel } @@ -115,7 +116,8 @@ ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?advisee . + ?advisingRel core:relates ?adviseeRole . + ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . ?advisee a foaf:Person . ?advisee rdfs:label ?adviseeLabel . ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . @@ -134,7 +136,9 @@ ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?advisee . + ?advisingRel core:relates ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . ?advisee a foaf:Person . ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . ?adviseeRole a core:AdviseeRole . From c9d45ae965796c6bb76ece02353e5c7125fdff4d Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 10 Dec 2013 17:06:51 -0500 Subject: [PATCH 25/33] VIVO-639 --- productMods/config/listViewConfig-adviseeIn.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/productMods/config/listViewConfig-adviseeIn.xml b/productMods/config/listViewConfig-adviseeIn.xml index 3a38a1f1..397e2545 100644 --- a/productMods/config/listViewConfig-adviseeIn.xml +++ b/productMods/config/listViewConfig-adviseeIn.xml @@ -30,7 +30,8 @@ ?adviseeRole core:relatedBy ?advisingRel . LET ( ?localName := afn:localname(?advisingRel) ) OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } - OPTIONAL { ?advisingRel core:relates ?advisor . + OPTIONAL { ?advisingRel core:relates ?advisorRole . + ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . ?advisor a foaf:Person . ?advisor rdfs:label ?advisorLabel } @@ -108,7 +109,8 @@ ?adviseeRole a core:AdviseeRole . ?adviseeRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?advisor . + ?advisingRel core:relates ?advisorRole . + ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . ?advisor a foaf:Person . ?advisor rdfs:label ?advisorLabel . ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . @@ -127,7 +129,9 @@ ?adviseeRole a core:AdviseeRole . ?adviseeRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?advisor . + ?advisingRel core:relates ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . ?advisor a foaf:Person . ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . ?advisorRole a core:AdvisorRole . From d9f7fae757d14d5409409405c3aa3c62ce423192 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Tue, 10 Dec 2013 18:20:03 -0500 Subject: [PATCH 26/33] Holly made final RC 4 changes to test cases --- .../suites/CreatePeople/AddFacultyInfo.html | 6 +- .../suites/CreatePeople/AddFacultyInfo2.html | 76 ++++++++++++++++++ .../suites/CreatePeople/EditFacultyInfo.html | 80 +++++++------------ .../CreatePeople/PublicFacultyInfo.html | 20 +++++ .../CreatePeople/SearchFacultyInfo.html | 11 +++ 5 files changed, 140 insertions(+), 53 deletions(-) diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index e56942e7..b2cafe9b 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -661,7 +661,7 @@ select id=objectVar - label=Ape Week + label=Primate Reactions clickAndWait @@ -1675,7 +1675,7 @@ verifyElementPresent - css=#translatorOf-IAO_0000030-List > li > a[title="name"] + css=#translatorOf-Document-List > li > a[title="name"] @@ -1912,7 +1912,7 @@ verifyElementPresent - css=#translatorOf-IAO_0000030-List > li > a[title="name"] + css=#translatorOf-Document-List > li > a[title="name"] diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index c3a14148..6ce11766 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -512,6 +512,67 @@ Faculty, Jane + + + clickAndWait + css=a.add-ARG_0000197 > img.add-individual + + + + assertTitle + Edit + + + + waitForElementPresent + tinymce + + + + type + tinymce + 2727272727272727 + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.add-hasCollaborator > img.add-individual + + + + assertTitle + Edit + + + + type + id=object + Librar + + + click + id=ui-active-menuitem + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + clickAndWait @@ -613,6 +674,16 @@ link=CIT Homepage + + verifyElementPresent + link=Adams, John + + + + verifyTextPresent + Adams, John  Faculty Member Emeritus + + verifyElementPresent link=Librarian, Lily Lou @@ -868,6 +939,11 @@ link=987654321 + + verifyTextPresent + 2727272727272727 + + verifyTextPresent 976976976976 diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index de3cc773..d992d3b3 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -261,9 +261,34 @@ Edit + + selectWindow + null + + + + select + id=typeOfNew + label=Faculty Member Emeritus (vivo) + clickAndWait - submit + id=offerCreate + + + + assertTitle + Edit + + + + type + id=name + Adams, John + + + clickAndWait + id=submit @@ -366,11 +391,6 @@ css=a.edit-teachingOverview > img.edit-individual - - assertTitle - Edit - - waitForElementPresent tinymce @@ -799,7 +819,7 @@ clickAndWait - css=#backgroundGroup > article.property > #relatedBy > a.add-relatedBy > img.add-individual + css=a.delete-relatedBy > img.delete-individual @@ -812,11 +832,6 @@ id=submit - - assertConfirmation - Are you sure you want to remove this license? - - assertTitle Faculty, Jane @@ -882,36 +897,6 @@ Faculty, Jane - - clickAndWait - xpath=(//img[@alt='edit this entry'])[13] - - - - assertTitle - Edit - - - - clickAndWait - id=delete - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - clickAndWait css=a.delete-assigneeFor > img.delete-individual @@ -927,11 +912,6 @@ id=submit - - assertConfirmation - Are you sure you want to remove this patent? - - assertTitle Faculty, Jane @@ -1050,12 +1030,12 @@ verifyElementPresent - link=Librarian, Lily Lou + link=Adams, John verifyTextPresent - Librarian, Lily Lou  Assistant Librarian + Adams, John  Faculty Member Emeritus @@ -1090,7 +1070,7 @@ verifyElementPresent - css=#translatorOf-IAO_0000030-List > li > a[title="name"] + css=#translatorOf-Document-List > li > a[title="name"] diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index 404d207c..d6e06752 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -166,6 +166,16 @@ //div[@id='wrapper-content']/ul/li[18] + + verifyElementPresent + link=Adams, John + + + + verifyTextPresent + Adams, John  Faculty Member Emeritus + + verifyElementPresent link=Librarian, Lily Lou @@ -301,6 +311,11 @@ Ape Trainer of the Decade, conferred by Professional Ape Trainer Association + + verifyElementPresent + link=Professional Ape Trainer Association + + verifyElementPresent link=Chimp Lover for Life @@ -416,6 +431,11 @@ link=987654321 + + verifyTextPresent + 2727272727272727 + + verifyTextPresent 976976976976 diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 42c75973..7fac3e5a 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -400,6 +400,17 @@ Faculty, Jane Assistant Professor + + + type + querytext + human + + + clickAndWait + //input[@value='Search'] + + open From c28a73b324ad87b88e49de154aaa64ed5b404779 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 11 Dec 2013 11:48:27 -0500 Subject: [PATCH 27/33] list view config change for VIVO-641 --- productMods/config/listViewConfig-default.xml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/productMods/config/listViewConfig-default.xml b/productMods/config/listViewConfig-default.xml index 7b550b8c..fffafac3 100644 --- a/productMods/config/listViewConfig-default.xml +++ b/productMods/config/listViewConfig-default.xml @@ -34,16 +34,12 @@ ?object a foaf:Person . ?object vitro:mostSpecificType ?typeUri . ?typeUri rdfs:label ?type . - # Display only a mostSpecificType that belongs to a classgroup. - ?typeUri vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup } OPTIONAL { ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . ?titleObj vcard:title ?title - } - + } OPTIONAL { ?object a ?subclass } @@ -62,6 +58,7 @@ CONSTRUCT { ?subject ?property ?object . + ?object a ?objectType . ?object a ?subclass . ?object rdfs:label ?label . } WHERE { @@ -69,7 +66,8 @@ ?subject ?property ?object . } UNION { ?subject ?property ?object . - ?object a ?subclass . + ?object a ?objectType . + ?object a ?subclass . } UNION { ?subject ?property ?object . ?object rdfs:label ?label . @@ -87,8 +85,6 @@ CONSTRUCT { ?subject ?property ?object . ?object vitro:mostSpecificType ?typeUri . - ?typeUri vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup . ?typeUri rdfs:label ?type . ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . @@ -96,10 +92,10 @@ } WHERE { { ?subject ?property ?object . + } UNION { + ?subject ?property ?object . ?object vitro:mostSpecificType ?typeUri . ?typeUri rdfs:label ?type . - ?typeUri vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup } UNION { ?subject ?property ?object . ?object obo:ARG_2000028 ?vcard . From d840c08d274296910acc441c948d8b7ffb44d187 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 11 Dec 2013 12:01:02 -0500 Subject: [PATCH 28/33] turned collation on for advisees faux property VIVO-640 --- rdf/display/everytime/PropertyConfig.n3 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index d96824b5..97ae1e8e 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -524,6 +524,8 @@ local:adviseeRoleContext a :ConfigContext ; local:adviseeRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-adviseeIn.xml"^^xsd:string ; :displayName "advisee of" ; + vitro:collateBySubclassAnnot + "true"^^xsd:boolean; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; From 0986361e774c45e38108f641e56509ab3072656c Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 11 Dec 2013 12:41:57 -0500 Subject: [PATCH 29/33] VIVO-644 --- productMods/config/listViewConfig-default.xml | 3 - .../listViewConfig-fauxPropertyDefault.xml | 107 ++++++++++++++++++ rdf/display/everytime/PropertyConfig.n3 | 86 +++++++------- 3 files changed, 150 insertions(+), 46 deletions(-) create mode 100644 productMods/config/listViewConfig-fauxPropertyDefault.xml diff --git a/productMods/config/listViewConfig-default.xml b/productMods/config/listViewConfig-default.xml index fffafac3..be2ea6ba 100644 --- a/productMods/config/listViewConfig-default.xml +++ b/productMods/config/listViewConfig-default.xml @@ -24,7 +24,6 @@ ?title WHERE { ?subject ?property ?object . - ?object a ?objectType LET (?localName := afn:localname(?object)) OPTIONAL { ?object rdfs:label ?label } @@ -58,7 +57,6 @@ CONSTRUCT { ?subject ?property ?object . - ?object a ?objectType . ?object a ?subclass . ?object rdfs:label ?label . } WHERE { @@ -66,7 +64,6 @@ ?subject ?property ?object . } UNION { ?subject ?property ?object . - ?object a ?objectType . ?object a ?subclass . } UNION { ?subject ?property ?object . diff --git a/productMods/config/listViewConfig-fauxPropertyDefault.xml b/productMods/config/listViewConfig-fauxPropertyDefault.xml new file mode 100644 index 00000000..5d54b0e0 --- /dev/null +++ b/productMods/config/listViewConfig-fauxPropertyDefault.xml @@ -0,0 +1,107 @@ + + + + + + + + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + PREFIX obo: <http://purl.obolibrary.org/obo/> + PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> + + SELECT ?subclass + ?object + ?label + ?localName + ?type + ?objectType + ?title WHERE { + + ?subject ?property ?object . + ?object a ?objectType + LET (?localName := afn:localname(?object)) + + OPTIONAL { ?object rdfs:label ?label } + + OPTIONAL { + # Get mostSpecificType only for Persons + ?object a foaf:Person . + ?object vitro:mostSpecificType ?typeUri . + ?typeUri rdfs:label ?type . + } + + OPTIONAL { ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title + } + + + OPTIONAL { ?object a ?subclass } + FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + + + # Order by ?type is important, because if the object has more than one mostSpecificType, + # they all get returned, but postprocessing culls out all but one. Ordering by ?type + # will ensure that at least we'll get the same one every time. + } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type + + + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + CONSTRUCT { + ?subject ?property ?object . + ?object a ?subclass . + ?object rdfs:label ?label . + } WHERE { + { + ?subject ?property ?object . + } UNION { + ?subject ?property ?object . + ?object a ?subclass . + } UNION { + ?subject ?property ?object . + ?object rdfs:label ?label . + } + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + PREFIX obo: <http://purl.obolibrary.org/obo/> + PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> + + CONSTRUCT { + ?subject ?property ?object . + ?object vitro:mostSpecificType ?typeUri . + ?typeUri rdfs:label ?type . + ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title + } WHERE { + { + ?subject ?property ?object . + } UNION { + ?subject ?property ?object . + ?object vitro:mostSpecificType ?typeUri . + ?typeUri rdfs:label ?type . + } UNION { + ?subject ?property ?object . + ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title + } + } + + + + diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 97ae1e8e..1b0cc716 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -982,7 +982,7 @@ local:credentialOfContext a :ConfigContext ; :qualifiedBy vivo:IssuedCredential . local:credentialOfConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "credential of" ; vitro:displayRankAnnot 6; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -996,7 +996,7 @@ local:documentHasPartContext a :ConfigContext ; :qualifiedBy . local:documentHasPartConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has document part" ; vitro:displayRankAnnot 51; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1012,7 +1012,7 @@ local:documentPartOfContext a :ConfigContext ; :qualifiedBy . local:documentPartOfConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "part of other document" ; vitro:displayRankAnnot 52; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1028,7 +1028,7 @@ local:geographicLocationContainsLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:geographicLocationContainsLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has part" ; vitro:displayRankAnnot 81; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1044,7 +1044,7 @@ local:geographicLocationWithinLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:geographicLocationWithinLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "part of" ; vitro:displayRankAnnot 82; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1060,7 +1060,7 @@ local:hasSubOrganizationContext a :ConfigContext ; :qualifiedBy . local:hasSubOrganizationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has sub-organization" ; vitro:displayRankAnnot 15; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1076,7 +1076,7 @@ local:subOrganizationWithinContext a :ConfigContext ; :qualifiedBy . local:subOrganizationWithinConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "organization within" ; vitro:displayRankAnnot 20; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1092,7 +1092,7 @@ local:eventWithinContext a :ConfigContext ; :qualifiedBy . local:eventWithinConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "occurs within event" ; vitro:displayRankAnnot 15; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1108,7 +1108,7 @@ local:includesEventContext a :ConfigContext ; :qualifiedBy . local:includesEventConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "includes event" ; vitro:displayRankAnnot 16; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1124,7 +1124,7 @@ local:inEventSeriesContext a :ConfigContext ; :qualifiedBy . local:inEventSeriesConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "in event series" ; vitro:displayRankAnnot 17; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1140,7 +1140,7 @@ local:eventsForSeriesContext a :ConfigContext ; :qualifiedBy . local:eventsForSeriesConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "events in this series" ; vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1156,7 +1156,7 @@ local:eventLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:eventLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "held in geographic location" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1172,7 +1172,7 @@ local:eventInFacilityContext a :ConfigContext ; :qualifiedBy vivo:Facility . local:eventInFacilityConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "held in facility" ; vitro:displayRankAnnot 29; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1188,7 +1188,7 @@ local:agentInGeoLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:agentInGeoLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "geographic location" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1204,7 +1204,7 @@ local:agentInFacilityContext a :ConfigContext ; :qualifiedBy vivo:Facility . local:agentInFacilityConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "located in facility" ; vitro:displayRankAnnot 32; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1220,7 +1220,7 @@ local:materialEntityInFacilityContext a :ConfigContext ; :qualifiedBy vivo:Facility . local:materialEntityInFacilityConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "housed in facility" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1236,7 +1236,7 @@ local:hasRoomContext a :ConfigContext ; :qualifiedBy vivo:Room . local:hasRoomConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "rooms" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1252,7 +1252,7 @@ local:roomWithinBuildingContext a :ConfigContext ; :qualifiedBy vivo:Building . local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "within building" ; vitro:displayRankAnnot 23; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1269,7 +1269,7 @@ local:geographicLocationContainsBuildingContext a :ConfigContext ; :qualifiedBy vivo:Building . local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "location of facility" ; vitro:displayRankAnnot 85; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1285,7 +1285,7 @@ local:siteGeographicallyWithinGeoLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:siteGeographicallyWithinGeoLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "geographically within" ; vitro:displayRankAnnot 40; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1301,7 +1301,7 @@ local:facilitySiteOfEventContext a :ConfigContext ; :qualifiedBy . ## was ## Independent Continuant local:facilitySiteOfEventConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "facility for event" ; vitro:displayRankAnnot 22; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1317,7 +1317,7 @@ local:facilitySiteOfAgentContext a :ConfigContext ; :qualifiedBy . ## was ## Independent Continuant local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "facility for person, group, or organization" ; vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1334,7 +1334,7 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; # :qualifiedBy . ## Material Entity #local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; -# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; # :displayName "uses specimen, equipment, instrument, organism, reagent, or software" ; # vitro:displayRankAnnot 85; # vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1350,7 +1350,7 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; # :qualifiedBy vivo:Project . #local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; -# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; # :displayName "used by project" ; # vitro:displayRankAnnot 85; # vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1366,7 +1366,7 @@ local:facilityLocationOfEquipmentContext a :ConfigContext ; :qualifiedBy . ## Material Entity local:facilityLocationOfEquipmentConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "location of equipment or instrument" ; vitro:displayRankAnnot 14; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1382,7 +1382,7 @@ local:facilityLocationOfServiceContext a :ConfigContext ; :qualifiedBy . local:facilityLocationOfServiceConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "facility for service" ; vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1399,7 +1399,7 @@ local:courseOfferedByContext a :ConfigContext ; :qualifiedBy . local:courseOfferedByConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offered by" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1415,7 +1415,7 @@ local:orgOffersCourseContext a :ConfigContext ; :qualifiedBy vivo:Course . local:orgOffersCourseConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offers course" ; vitro:displayRankAnnot 90; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1431,7 +1431,7 @@ local:collegeOffersDegreeContext a :ConfigContext ; :qualifiedBy vivo:AcademicDegree . local:collegeOffersDegreeConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offers degree" ; vitro:displayRankAnnot 12; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1445,7 +1445,7 @@ local:deptOffersDegreeContext a :ConfigContext ; :qualifiedBy vivo:AcademicDegree . local:deptOffersDegreeConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offers degree" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1459,7 +1459,7 @@ local:uniOffersDegreeContext a :ConfigContext ; :qualifiedBy vivo:AcademicDegree . local:uniOffersDegreeConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offers degree" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1473,7 +1473,7 @@ local:labOffersServiceContext a :ConfigContext ; :qualifiedBy . local:labOffersServiceConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "offers service" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1488,7 +1488,7 @@ local:grantAwardedByContext a :ConfigContext ; :qualifiedBy . local:grantAwardedByConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "awarded by" ; vitro:displayRankAnnot 14; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1503,7 +1503,7 @@ local:grantSubjectAreaContext a :ConfigContext ; :qualifiedBy . local:grantSubjectAreaConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has subject area" ; vitro:displayRankAnnot 10; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1517,7 +1517,7 @@ local:grantHasSubgrantContext a :ConfigContext ; :qualifiedBy vivo:Grant . local:grantHasSubgrantConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has sub grant" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1533,7 +1533,7 @@ local:grantIsSubgrantOfContext a :ConfigContext ; :qualifiedBy vivo:Grant . local:grantIsSubgrantOfConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "sub grant of" ; vitro:displayRankAnnot 32; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1549,7 +1549,7 @@ local:grantGeographicFocusContext a :ConfigContext ; :qualifiedBy vivo:GeographicRegion . local:grantGeographicFocusConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "geographic focus" ; vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1565,7 +1565,7 @@ local:awardOrHonorReceiptsContext a :ConfigContext ; :qualifiedBy . local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "receipts" ; vitro:displayRankAnnot 3; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1579,7 +1579,7 @@ local:awardReceiptsContext a :ConfigContext ; :qualifiedBy . local:awardReceiptsConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "receipt of" ; vitro:displayRankAnnot 1; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1593,7 +1593,7 @@ local:awardReceiptsAwardForContext a :ConfigContext ; :qualifiedBy . local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "award or honor for" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1621,7 +1621,7 @@ local:awardConferredByContext a :ConfigContext ; :qualifiedBy . local:awardConferredByConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "award conferred by" ; vitro:displayRankAnnot 3; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1635,7 +1635,7 @@ local:orgAwardsGrantContext a :ConfigContext ; :qualifiedBy . local:orgAwardsGrantConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "awards grant" ; vitro:displayRankAnnot 60; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; @@ -1650,7 +1650,7 @@ local:addressLocationContext a :ConfigContext ; :qualifiedBy vivo:GeographicLocation . local:addressLocationConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :listViewConfigFile "listViewConfig-fauxPropertyDefault.xml"^^xsd:string ; :displayName "has geographic location" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; From 5dd460d8dee6333faa352226e190879af5d795d6 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 11 Dec 2013 16:25:56 -0500 Subject: [PATCH 30/33] VIVO-643 create first and last names and vcard when adding a missing individual that is a foaf:Person --- .../forms/defaultAddMissingIndividualForm.ftl | 83 +++ .../defaultAddMissingIndividualFormUtils.js | 44 ++ ...aultAddMissingIndividualFormGenerator.java | 548 ++++++++++++++++++ 3 files changed, 675 insertions(+) create mode 100644 productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl create mode 100644 productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js create mode 100644 src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java diff --git a/productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl new file mode 100644 index 00000000..3f59ff78 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl @@ -0,0 +1,83 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#import "lib-vivo-form.ftl" as lvf> + +<#assign formTitle> + "${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName} + +<#if editConfiguration.objectUri?has_content> + <#assign formTitle>${i18n().edit_capitalized} ${formTitle} + <#assign submitLabel>${i18n().save_changes} +<#else> + <#assign formTitle>${i18n().create_capitalized} ${formTitle} + <#assign submitLabel>${i18n().create_capitalized} "${editConfiguration.propertyPublicDomainTitle}" ${i18n().entry} + +<#assign isPersonType = editConfiguration.pageData.isPersonType /> +<#--Get existing value for specific data literals and uris--> +<#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName")/> +<#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName")/> +<#assign middleNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "middleName")/> +<#assign labelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "label")/> + +<#assign requiredHint = " *" /> + +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + + +

    ${formTitle}

    + +<#if submissionErrors?has_content > + + + +
    +<#if isPersonType = "true"> +

    + + +

    + +

    + + +

    + +

    + + +

    + + +<#else> +

    + + +

    + + + +

    + + or + ${i18n().cancel_link} +

    +
    + +${stylesheets.add('')} +${scripts.add('')} \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js b/productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js new file mode 100644 index 00000000..b89dbb63 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/js/defaultAddMissingIndividualFormUtils.js @@ -0,0 +1,44 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +var missingIndividualFormUtils = { + + onLoad: function(mode,country) { + this.initObjectReferences(); + this.bindEventListeners(); + }, + + initObjectReferences: function() { + this.form = $('#editForm'); + + // The external auth ID field and messages + this.fName = $('#firstName'); + this.lName = $('#lastName'); + this.mName = $('#middleName'); + this.rdfsLabel = $('#label'); + this.submitButton = $('#submit'); + }, + + bindEventListeners: function() { + this.idCache = {}; + + this.form.submit(function() { + missingIndividualFormUtils.buildRDFSLabel(); + missingIndividualFormUtils.submitButton.attr("disabled",true); + }); + + }, + + buildRDFSLabel: function() { + if ( this.fName.length > 0 ) { + var label = this.lName.val() + ", " + this.fName.val(); + if(this.mName.length > 0) { + label += " " + this.mName.val(); + } + this.rdfsLabel.val(label); + } + }, +} + +$(document).ready(function() { + missingIndividualFormUtils.onLoad(); +}); diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java new file mode 100644 index 00000000..d5e0b336 --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java @@ -0,0 +1,548 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpSession; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.hp.hpl.jena.ontology.OntModel; +import com.hp.hpl.jena.rdf.model.Literal; +import com.hp.hpl.jena.rdf.model.Model; + +import edu.cornell.mannlib.vitro.webapp.beans.Individual; +import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; +import edu.cornell.mannlib.vitro.webapp.beans.VClass; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; +import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.DefaultAddMissingIndividualFormModelPreprocessor; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; + +/** + * Generates the edit configuration for a default property form. + * + */ +public class DefaultAddMissingIndividualFormGenerator implements EditConfigurationGenerator { + + private Log log = LogFactory.getLog(DefaultAddMissingIndividualFormGenerator.class); + private boolean isObjectPropForm = false; + private String subjectUri = null; + private String predicateUri = null; + private String objectUri = null; + + private String template = "defaultAddMissingIndividualForm.ftl"; + private static String createCommand = "create"; + private static String objectVarName = "newIndividual"; + private static HashMap defaultsForXSDtypes ; + static { + defaultsForXSDtypes = new HashMap(); + //defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00"); + defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now"); + } + + //Method which checks whether this particular generator should be employed + public static boolean isCreateNewIndividual(VitroRequest vreq, HttpSession session) { + String command = vreq.getParameter("cmd"); + String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + //This method also looks at domain and range uris and so is different than just getting the + //object property based on predicate uri alone + ObjectProperty objProp = EditConfigurationUtils.getObjectPropertyForPredicate(vreq, + predicateUri); + if(objProp != null) { + return(objProp.getOfferCreateNewOption() && + ( + (command != null && command.equals(createCommand)) || + objProp.getSelectFromExisting() == false + ) + ); + } + return false; + } + @Override + public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) { + EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo(); + + //process subject, predicate, object parameters + this.initProcessParameters(vreq, session, editConfiguration); + + //Assumes this is a simple case of subject predicate var + editConfiguration.setN3Required(this.generateN3Required(vreq)); + + //n3 optional + editConfiguration.setN3Optional(this.generateN3Optional(vreq)); + + + editConfiguration.setNewResources(this.generateNewResources(vreq)); + //In scope + this.setUrisAndLiteralsInScope(editConfiguration); + + //on Form + this.setUrisAndLiteralsOnForm(editConfiguration, vreq); + + editConfiguration.setFilesOnForm(new ArrayList()); + + //Sparql queries + this.setSparqlQueries(editConfiguration); + + //set fields + setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq)); + + //form specific data + addFormSpecificData(editConfiguration, vreq); + + //add preprocesoors + addPreprocessors(vreq, editConfiguration); + + prepareForUpdate(vreq, session, editConfiguration); + + //Form title and submit label now moved to edit configuration template + //TODO: check if edit configuration template correct place to set those or whether + //additional methods here should be used and reference instead, e.g. edit configuration template could call + //default obj property form.populateTemplate or some such method + //Select from existing also set within template itself + setTemplate(editConfiguration, vreq); + + editConfiguration.addValidator(new AntiXssValidation()); + + //edit key now set in the edit request dispatch controller + return editConfiguration; + } + + private Map generateNewResources(VitroRequest vreq) { + HashMap newResources = new HashMap(); + //Null triggers default namespace + newResources.put(objectVarName, null); + newResources.put("newVcardInd", null); + newResources.put("newVcardName", null); + return newResources; + } + //Need to replace edit key + //TODO:Check if we need to recheck forward to create new or assume that is the case since + //we're using this generator + //In this case we always set a new edit key as the original jsp checked 'isForwardToCreateNew' + //which condition would require that an entirely new edit key be created + private void setEditKey(HttpSession session, EditConfigurationVTwo editConfiguration, VitroRequest vreq) { + String editKey = EditConfigurationVTwo.newEditKey(session); + editConfiguration.setEditKey(editKey); + } + + private void setTemplate(EditConfigurationVTwo editConfiguration, + VitroRequest vreq) { + editConfiguration.setTemplate(template); + + } + + //Initialize setup: process parameters + //Doesn't look like we need to set up separate processing for data property form + private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) { + String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq); + + subjectUri = EditConfigurationUtils.getSubjectUri(vreq); + predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + + editConfiguration.setFormUrl(formUrl); + + + editConfiguration.setUrlPatternToReturnTo("/individual"); + + editConfiguration.setVarNameForSubject("subject"); + editConfiguration.setSubjectUri(subjectUri); + editConfiguration.setEntityToReturnTo(subjectUri); + editConfiguration.setVarNameForPredicate("predicate"); + editConfiguration.setPredicateUri(predicateUri); + + + //this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method + //pretends this is a data property editing statement and throws an error + //"object" : [ "newIndividual" , "${objectUriJson}" , "URI"], + if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) { + //not concerned about remainder, can move into default obj prop form if required + this.isObjectPropForm = true; + this.initObjectParameters(vreq); + this.processObjectPropForm(vreq, editConfiguration); + } else { + log.error("Add missing individual called for a data property instead of object property"); + } + } + + + + + + private void initObjectParameters(VitroRequest vreq) { + //in case of object property + String thisObjectUri = EditConfigurationUtils.getObjectUri(vreq); + if(thisObjectUri != null && !thisObjectUri.isEmpty()) { + objectUri = EditConfigurationUtils.getObjectUri(vreq); + } + //otherwise object uri will stay null - since don't want to set it to empty string + } + + //this particular form uses a different var name for object "newIndividual" + private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) { + editConfiguration.setVarNameForObject(objectVarName); + //If is replace with new, set Object resource to null + if(isReplaceWithNew(vreq)) { + editConfiguration.setObject(null); + } else { + editConfiguration.setObject(objectUri); + } + //this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method + //pretends this is a data property editing statement and throws an error + //TODO: Check if null in case no object uri exists but this is still an object property + } + + + + //Get N3 required + //Handles both object and data property + private List generateN3Required(VitroRequest vreq) { + List n3ForEdit = new ArrayList(); + n3ForEdit.add(getN3PrefixesAsString() + "\n" + getN3ForName()); + n3ForEdit.add("?subject ?predicate ?" + objectVarName + " ."); + n3ForEdit.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getRangeClassUri(vreq) + "> . "); + return n3ForEdit; + } + + private List getN3Prefixes() { + List prefixStrings = new ArrayList(); + prefixStrings.add("@prefix rdf: ."); + prefixStrings.add("@prefix rdfs: ."); + prefixStrings.add("@prefix vcard: ."); + return prefixStrings; + } + + private String getN3PrefixesAsString() { + String prefixes = StringUtils.join(getN3Prefixes(), "\n"); + return prefixes; + } + + private String getN3ForName() { + return "?" + objectVarName + " rdfs:label ?label ."; + } + + private List generateN3Optional(VitroRequest vreq) { + //flag uri and asserted types need to be added here + List n3Optional = new ArrayList(); + n3Optional.add("?" + objectVarName + " ?inverseProp ?subject ."); + //asserted types string buffer is empty in the original jsp + //TODO: Review original comments in jsp to see what could go here + //n3Optional.add(getN3AssertedTypes(vreq)); + n3Optional.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getFlagURI(vreq) + "> . "); + n3Optional.add(getN3PrefixesAsString() + + "?" + objectVarName + " ?newVcardInd . \n" + + " ?newVcardInd ?" + objectVarName + " . \n" + + " ?newVcardInd a vcard:Individual . \n" + + " ?newVcardInd vcard:hasName ?newVcardName . \n" + + " ?newVcardName a vcard:Name . \n" + + " ?newVcardName vcard:givenName ?firstName . \n" + + " ?newVcardName vcard:familyName ?lastName . \n"); + n3Optional.add(getN3PrefixesAsString() + + "?" + objectVarName + " ?newVcardInd . \n" + + " ?newVcardInd a vcard:Individual . \n" + + " ?newVcardInd vcard:hasName ?newVcardName . \n" + + " ?newVcardName a vcard:Name . \n" + + " ?newVcardName ?middleName ."); + return n3Optional; + + } + + private String getFlagURI(VitroRequest vreq) { + WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + String flagURI = wdf.getVClassDao().getTopConcept().getURI(); + return flagURI; + } + private String getN3AssertedTypes(VitroRequest vreq) { + return null; + } + //Set queries + private String retrieveQueryForInverse () { + String queryForInverse = "PREFIX owl: " + + " SELECT ?inverse_property " + + " WHERE { ?inverse_property owl:inverseOf ?predicate } "; + return queryForInverse; + } + + private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration) { + HashMap> urisInScope = new HashMap>(); + //Add subject uri and predicate turo to uris in scope + urisInScope.put(editConfiguration.getVarNameForSubject(), + Arrays.asList(new String[]{editConfiguration.getSubjectUri()})); + urisInScope.put(editConfiguration.getVarNameForPredicate(), + Arrays.asList(new String[]{editConfiguration.getPredicateUri()})); + editConfiguration.setUrisInScope(urisInScope); + editConfiguration.setLiteralsInScope(new HashMap>()); + } + + //n3 should look as follows + //?subject ?predicate ?objectVar + + private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) { + List urisOnForm = new ArrayList(); + List literalsOnForm = new ArrayList(); + literalsOnForm.add("label"); + literalsOnForm.add("firstName"); + literalsOnForm.add("middleName"); + literalsOnForm.add("lastName"); + editConfiguration.setUrisOnform(urisOnForm); + editConfiguration.setLiteralsOnForm(literalsOnForm); + } + + + //This is for various items + private void setSparqlQueries(EditConfigurationVTwo editConfiguration) { + //Sparql queries defining retrieval of literals etc. + editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap()); + + Map urisInScope = new HashMap(); + urisInScope.put("inverseProp", this.retrieveQueryForInverse()); + editConfiguration.setSparqlForAdditionalUrisInScope(urisInScope); + + editConfiguration.setSparqlForExistingLiterals(generateSparqlForExistingLiterals()); + editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris()); + } + + + //Sparql queries + + + private HashMap generateSparqlForExistingUris() { + HashMap map = new HashMap(); + return map; + } + + private HashMap generateSparqlForExistingLiterals() { + HashMap map = new HashMap(); + String query = "PREFIX rdfs: "; + query += "SELECT ?existingName WHERE { ?" + objectVarName + " rdfs:label ?existingName . }"; + map.put("name", query); + return map; + } + + + private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) { + Map fields = new HashMap(); + if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) { + + //make name field + FieldVTwo labelField = new FieldVTwo(); + labelField.setName("label"); + + FieldVTwo firstNameField = new FieldVTwo(); + firstNameField.setName("firstName"); + + FieldVTwo middleNameField = new FieldVTwo(); + middleNameField.setName("middleName"); + + FieldVTwo lastNameField = new FieldVTwo(); + lastNameField.setName("lastName"); + + List validators = new ArrayList(); + validators.add("nonempty"); + if(!isPersonType(vreq)) { + labelField.setValidators(validators); + } + if(isPersonType(vreq)) { + firstNameField.setValidators(validators); + lastNameField.setValidators(validators); + } + + fields.put(labelField.getName(), labelField); + fields.put(firstNameField.getName(), firstNameField); + fields.put(middleNameField.getName(), middleNameField); + fields.put(lastNameField.getName(), lastNameField); + + } else { + log.error("Is not object property so fields not set"); + } + + editConfiguration.setFields(fields); + } + + private String getRangeClassUri(VitroRequest vreq) { + Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq); + ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq); + + WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + if( prop.getRangeVClassURI() == null ) { + // If property has no explicit range, we will use e.g. owl:Thing. + // Typically an allValuesFrom restriction will come into play later. + VClass top = wdf.getVClassDao().getTopConcept(); + prop.setRangeVClassURI(top.getURI()); + } + + VClass rangeClass = null; + String typeOfNew = getTypeOfNew(vreq); + if(typeOfNew != null ) + rangeClass = wdf.getVClassDao().getVClassByURI( typeOfNew ); + if( rangeClass == null ){ + rangeClass = wdf.getVClassDao().getVClassByURI(prop.getRangeVClassURI()); + if( rangeClass == null ) throw new Error ("Cannot find class for range for property. Looking for " + prop.getRangeVClassURI() ); + } + return rangeClass.getURI(); + } + + private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) { + //Here, retrieve model from + OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel(); + //if object property + if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){ + Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq); + if(!isReplaceWithNew(vreq) && + (isForwardToCreateButEdit(vreq) || + objectIndividual != null) + ) { + editConfiguration.prepareForObjPropUpdate(model); + } else { + //new object to be created + editConfiguration.prepareForNonUpdate( model ); + } + } else { + log.error("Data property not object property so update can't be done correctly"); + + } + } + + private void addPreprocessors(VitroRequest vreq, EditConfigurationVTwo editConfiguration) { + if(isReplaceWithNew(vreq)) { + //String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); + //String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + //String objectUri = EditConfigurationUtils.getObjectUri(vreq); + editConfiguration.addModelChangePreprocessor( + new DefaultAddMissingIndividualFormModelPreprocessor( + subjectUri, predicateUri, objectUri)); + + } + } + + //Command processing + private boolean isTypeOfNew(VitroRequest vreq) { + String typeOfNew = getTypeOfNew(vreq); + return (typeOfNew != null && !typeOfNew.isEmpty()); + } + + private String getTypeOfNew(VitroRequest vreq) { + return vreq.getParameter("typeOfNew"); + } + // The default object proepty form offers the option to create a new item + // instead of selecting from existing individuals in the system. + // This is where the request to create a new indivdiual is handled. + //We don't really need this again b/c we wouldn't be using this generator unless we want + //to create a new individual so commenting out for now + /* + private boolean isForwardToCreateNew(VitroRequest vreq) { + String command = vreq.getParameter("cmd"); + ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq); + if(hasCustomForm(objectProp)) { + return false; + } + + boolean isForwardToCreateNew = + ( objectProp != null && objectProp.getOfferCreateNewOption() ) + && ( objectProp.getSelectFromExisting() == false + || "create".equals(command)); + + return isForwardToCreateNew; + + } + + private boolean hasCustomForm(ObjectProperty objectProp) { + return( objectProp != null && + objectProp.getCustomEntryForm() != null && + !objectProp.getCustomEntryForm().isEmpty()); + + }*/ + + private boolean isReplaceWithNew(VitroRequest vreq) { + ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq); + boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq); + String command = vreq.getParameter("cmd"); + return (isEditOfExistingStmt + && "create".equals(command)) + && (objectProp != null) + && (objectProp.getOfferCreateNewOption() == true); + } + + private boolean isForwardToCreateButEdit(VitroRequest vreq) { + boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq); + ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq); + String command = vreq.getParameter("cmd"); + return (isEditOfExistingStmt + && (! "create".equals(command)) + && (objectProp != null) + && (objectProp.getOfferCreateNewOption() == true) + && (objectProp.getSelectFromExisting() == false) + ); + } + + //Form specific data + public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) { + HashMap formSpecificData = new HashMap(); + formSpecificData.put("typeName", getTypeName(vreq)); + //Put in whether or not person type + if(isPersonType(vreq)) { + //Doing this b/c unsure how freemarker will handle boolean value from JAVA + formSpecificData.put("isPersonType", "true"); + } else { + formSpecificData.put("isPersonType", "false"); + + } + editConfiguration.setFormSpecificData(formSpecificData); + } + + private String getTypeName(VitroRequest vreq) { + String typeOfNew = getTypeOfNew(vreq); + VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew); + return type.getName(); + } + + public String getFOAFPersonClassURI() { + return "http://xmlns.com/foaf/0.1/Person"; + } + + public boolean isPersonType(VitroRequest vreq) { + WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + Boolean isPersonType = Boolean.FALSE; + String foafPersonType = getFOAFPersonClassURI(); + String typeOfNew = getTypeOfNew(vreq); + List superTypes = wdf.getVClassDao().getAllSuperClassURIs(typeOfNew); + //add the actual type as well so we can add that for the list to be checked + superTypes.add(typeOfNew); + if( superTypes != null ){ + for( String typeUri : superTypes){ + if( foafPersonType.equals(typeUri)) { + isPersonType = Boolean.TRUE; + break; + } + } + } + return isPersonType; + } + + //Is edit of existing statement only applicable to object properties + private boolean isEditOfExistingStatement(VitroRequest vreq) { + //TODO: Check if also applicable to data property, currently returning false + if(EditConfigurationUtils.isDataProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) { + return false; + } + Individual object = EditConfigurationUtils.getObjectIndividual(vreq); + return (object != null); + + } + + + + +} From 80f53240a76c3c51277b3b9c2ae4679136aa3c98 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Thu, 12 Dec 2013 07:32:52 -0500 Subject: [PATCH 31/33] =?UTF-8?q?added=20restriction=20on=20=E2=80=9Crelat?= =?UTF-8?q?ed=20technique=E2=80=9D=20so=20that=20the=20property=20will=20a?= =?UTF-8?q?ppear=20for=20Material=20Entities=20(equipment=20and=20instrume?= =?UTF-8?q?nts).=20Made=20related=20technique=20visible=20and=20editable?= =?UTF-8?q?=20in=20property=20group=20overview.=20Put=20Technique=20into?= =?UTF-8?q?=20a=20class=20group=20(=E2=80=98research=E2=80=99).=20Put=20Su?= =?UTF-8?q?bnationalRegion=20into=20the=20class=20group=20=E2=80=9Clocatio?= =?UTF-8?q?ns=E2=80=9D.=20Put=20vivo:database=20in=20class=20group=20?= =?UTF-8?q?=E2=80=98research=E2=80=99=20(not=20ero:Database).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rdf/tbox/filegraph/research-resource.owl | 7 +++++++ rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/rdf/tbox/filegraph/research-resource.owl b/rdf/tbox/filegraph/research-resource.owl index 997bd64d..1718a798 100644 --- a/rdf/tbox/filegraph/research-resource.owl +++ b/rdf/tbox/filegraph/research-resource.owl @@ -55,6 +55,13 @@ + + + + + + + A flow cytometer. Material entity that is designed to have a function and play a role in scientific investigation. PERSON: Melissa Haendel diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 312850e6..b2e38164 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -523,7 +523,8 @@ vivo:relates rdfs:label "relates"@en-US . obo:ERO_0000007 - rdfs:label "Technique"@en-US . + rdfs:label "Technique"@en-US ; + vitro:inClassGroup . vcard:hasCalendarLink rdfs:label "has calendar link"@en-US . @@ -536,7 +537,8 @@ vivo:SubnationalRegion vitro:displayLimitAnnot "-1"^^xsd:int ; vitro:displayRankAnnot - "-1"^^xsd:int ; + "10"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -2452,7 +2454,15 @@ obo:ARG_2000083 rdfs:label "American Board of Plastic Surgery"@en-US . obo:ERO_0000398 - rdfs:label "is performed by"@en-US . + rdfs:label "is performed by"@en-US ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean . vcard:hasCalenderBusy rdfs:label "has calendar busy"@en-US . @@ -4445,6 +4455,8 @@ geo:nameShortAR "5"^^xsd:int ; vitro:displayRankAnnot "5"^^xsd:int ; + vitro:inClassGroup + ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot From 646776ebe93a4ece9cb29f89b3a9dc7c20fd7ebc Mon Sep 17 00:00:00 2001 From: tworrall Date: Thu, 12 Dec 2013 13:41:35 -0500 Subject: [PATCH 32/33] corected a typo --- config/example.runtime.properties | 480 +++++++++++++++--------------- 1 file changed, 240 insertions(+), 240 deletions(-) diff --git a/config/example.runtime.properties b/config/example.runtime.properties index e6092d54..27d28184 100644 --- a/config/example.runtime.properties +++ b/config/example.runtime.properties @@ -1,240 +1,240 @@ -# ----------------------------------------------------------------------------- -# -# VIVO runtime properties -# -# This file is provided as example.runtime.properties. -# -# Save a copy of this file as runtime.properties in your Vitro home directory, -# and edit the properties as needed for your installation. -# -# ----------------------------------------------------------------------------- - -# -# This namespace will be used when generating URIs for objects created in the -# editor. In order to serve linked data, the default namespace must be composed -# as follows (optional elements in parentheses): -# -# scheme + server_name (+ port) (+ servlet_context) + "/individual/" -# -# For example, Cornell's default namespace is: -# -# http://vivo.cornell.edu/individual/ -# -Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/ - -# -# URL of Solr context used in local VIVO search. This will usually consist of: -# scheme + server_name + port + vivo_webapp_name + "solr" -# In the standard installation, the Solr context will be on the same server as VIVO, -# and in the same Tomcat instance. The path will be the VIVO webapp.name (specified -# above) + "solr" -# Example: -# vitro.local.solr.url = http://localhost:8080/vivosolr -vitro.local.solr.url = http://localhost:8080/vivosolr - -# -# Email parameters which VIVO can use to send mail. If these are left empty, -# the "Contact Us" form will be disabled and users will not be notified of -# changes to their accounts. -# -email.smtpHost = smtp.mydomain.edu -email.replyTo = vivoAdmin@mydomain.edu - -# -# The basic parameters for a database connection. Change the end of the -# URL to reflect your database name (if it is not "vitrodb"). Change the username -# and password to match the authorized database user you created. -# -VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb -VitroConnection.DataSource.username = vitrodbUsername -VitroConnection.DataSource.password = vitrodbPassword - -# -# The maximum number of active connections in the database connection pool. -# Increase this value to support a greater number of concurrent page requests. -# -VitroConnection.DataSource.pool.maxActive = 40 - -# -# The maximum number of database connections that will be allowed -# to remain idle in the connection pool. Default is 25% -# of the maximum number of active connections. -# -VitroConnection.DataSource.pool.maxIdle = 10 - -# -# Parameters to change in order to use VIVO with a database other than -# MySQL. -# -VitroConnection.DataSource.dbtype = MySQL -VitroConnection.DataSource.driver = com.mysql.jdbc.Driver -VitroConnection.DataSource.validationQuery = SELECT 1 - -# -# Optional URI of a SPARQL endpoint from which VIVO should display data. -# If set, VIVO will use this endpoint as its triple store instead of the -# SDB database. -# -#VitroConnection.DataSource.endpointURI = - -# -# Optional URI to use for modifying the above endpoint via SPARQL UPDATE. -# This setting is only necessary if the endpoint does not support updates via -# its main URI. (This may be done for access control purposes.) -# If the endpointURI above is not set, this setting has no effect. -# -#VitroConnection.DataSource.updateEndpointURI = - -# -# The email address of the root user for the VIVO application. The password -# for this user is initially set to "rootPassword", but you will be asked to -# change the password the first time you log in. -# -rootUser.emailAddress = vivo_root@mydomain.edu - -# -# How is a logged-in user associated with a particular Individual? One way is -# for the Individual to have a property whose value is the username of the user. -# This value should be the URI for that property. -# -selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId - -# -# If an external authentication system like Shibboleth or CUWebAuth is to be -# used, this property says which HTTP header will contain the user ID from -# the authentication system. If such a system is not to be used, leave this -# commented out. Consult the installation instructions for more details. -# -#externalAuth.netIdHeaderName = remote_userID - -# -# The temporal graph visualization can require extensive machine resources. -# This can have a particularly noticeable impact on memory usage if -# - The organization tree is deep, -# - The number of grants and publications is large. -# VIVO 1.3 release mitigates this problem by the way of a caching mechanism & -# hence we can safely set this to be enabled by default. -# -visualization.temporal = enabled - -# -# The temporal graph visualization is used to compare different organizations/people -# within an organization on parameters like number of publications or grants. -# By default, the app will attempt to make its best guess at the top level -# organization in your instance. If you're unhappy with this selection, uncomment out -# the property below and set it to the URI of the organization individual you want to -# identify as the top level organization. It will be used as the default whenever the -# temporal graph visualization is rendered without being passed an explicit org. -# For example, to use "Ponce School of Medicine" as the top organization: -# visualization.topLevelOrg = http://vivo.psm.edu/individual/n2862 -# -# visualization.topLevelOrg = http://vivo.mydomain.edu/individual/topLevelOrgURI - -# -# Absolute path on the server of the Harvester root directory. -# You must include the final slash. -# Setting a value for harvester.location indicates that the Harvester is installed at -# this path. This will enable the Harvester functions in the Ingest Tools page. -# -# harvester.location = /usr/local/vivo/harvester/ - -# -# Default type(s) for Google Refine Reconciliation Service -# The format for this property is id, name; id1, name1; id2, name2 etc. -# See Service Metadata from this page http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi -# for more information. -Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; \ - http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; \ - http://purl.org/NET/c4dm/event.owl#Event, event:Event; \ - http://vivoweb.org/ontology/core#Location, core:Location; \ - http://xmlns.com/foaf/0.1/Organization, foaf:Organization; \ - http://xmlns.com/foaf/0.1/Person, foaf:Person; \ - http://purl.obolibrary.org/obo/IAO_0000030, obo:IAO_0000030 - -# -# Types of individual for which we can create proxy editors. -# If this is omitted, defaults to http://www.w3.org/2002/07/owl#Thing -# -proxy.eligibleTypeList = http://xmlns.com/foaf/0.1/Person, http://xmlns.com/foaf/0.1/Organization - -# -# Show only the most appropriate data values based on the Accept-Language -# header supplied by the browser. Default is false if not set. -# -# RDFService.languageFilter = false - -# -# Force VIVO to use a specific language or Locale instead of those -# specified by the browser. This affects RDF data retrieved from the model, -# if RDFService.languageFilter is true. This also affects the text of pages -# that have been modified to support multiple languages. -# -# languages.forceLocale = en_US - -# -# A list of supported languages or Locales that the user may choose to -# use instead of the one specified by the browser. Selection images must -# be available in the i18n/images directory of the theme. This affects -# RDF data retrieved from the model, if RDFService.languageFilter is true. -# This also affects the text of pages that have been modified to support -# multiple languages. -# -# This should not be used with languages.forceLocale, which will override it. -# -# languages.selectableLocales = en_US, es_GO - -# -# Tell VIVO to generate HTTP headers on its responses to facilitate caching the -# profile pages that it creates. -# -# For more information, see -# https://wiki.duraspace.org/display/VIVO/Use+HTTP+caching+to+improve+performance -# -# Developers will likely want to leave caching disabled, since a change to a -# Freemarker template or to a Java class would not cause the page to be -# considered stale. -# -# http.createCacheHeaders = true - -# -# For OpenSocial integration -# The base URL of the ORNG Shindig server. Usually, this is the same host and port -# number as VIVO itself, with a context path of "shindigorng". -# -#OpenSocial.shindigURL = http://localhost:8080/shindigorng - -# -# For OpenSocial integration -# The host name and port number of the service that provides security tokens for VIVO and -# Shindig to share. For now, the host name must be the actual host, not "localhost" or "127.0.0.1" -# The port number must be 8777 -# -#OpenSocial.tokenService = myhost.mydomain.edu:8777 - -# -# For OpenSocial integration -# The path to the key file that will be used qwhen generating security tokens for VIVO and -# shindig to share. -# -#OpenSocial.tokenKeyFile = /usr/local/vivo/data/shindig/openssl/securitytokenkey.txt - -# -# For OpenSocial integration -# Only set sandbox to True for dev/test environments. Comment out or set to False in production -# -#OpenSocial.sandbox = True - -# MultiViews -# VIVO supports the simultaneous use of a full foaf:Person profile page view and a "quick" page -# view that emphasizes the individual's webpage presence. Implementing this feature requires an -# installation to develop a web service that captures images of web pages or to use an existing -# service outside of VIVO. For more information on implementing multiple profile pages, refer to -# this wiki page: https://wiki.duraspace.org/display/VIVO/Multiple+foaf%3APerson+Profile+Pages. -#MultiViews.profilePageTypes=enabled - -# Geo Focus Maps -# When the following flag is set to enabled, the VIVO home page displays a global map highlighting the -# geographical focus of foaf:person individuals. For information on the maps, refer to this wiki page: -# https://wiki.duraspace.org/display/VIVO/Home+Page+Customizations#HomePageCustomizations-TheGeographicFocusMap -#homePage.geoFocusMaps=enabled - +# ----------------------------------------------------------------------------- +# +# VIVO runtime properties +# +# This file is provided as example.runtime.properties. +# +# Save a copy of this file as runtime.properties in your Vitro home directory, +# and edit the properties as needed for your installation. +# +# ----------------------------------------------------------------------------- + +# +# This namespace will be used when generating URIs for objects created in the +# editor. In order to serve linked data, the default namespace must be composed +# as follows (optional elements in parentheses): +# +# scheme + server_name (+ port) (+ servlet_context) + "/individual/" +# +# For example, Cornell's default namespace is: +# +# http://vivo.cornell.edu/individual/ +# +Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/ + +# +# URL of Solr context used in local VIVO search. This will usually consist of: +# scheme + server_name + port + vivo_webapp_name + "solr" +# In the standard installation, the Solr context will be on the same server as VIVO, +# and in the same Tomcat instance. The path will be the VIVO webapp.name (specified +# above) + "solr" +# Example: +# vitro.local.solr.url = http://localhost:8080/vivosolr +vitro.local.solr.url = http://localhost:8080/vivosolr + +# +# Email parameters which VIVO can use to send mail. If these are left empty, +# the "Contact Us" form will be disabled and users will not be notified of +# changes to their accounts. +# +email.smtpHost = smtp.mydomain.edu +email.replyTo = vivoAdmin@mydomain.edu + +# +# The basic parameters for a database connection. Change the end of the +# URL to reflect your database name (if it is not "vitrodb"). Change the username +# and password to match the authorized database user you created. +# +VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb +VitroConnection.DataSource.username = vitrodbUsername +VitroConnection.DataSource.password = vitrodbPassword + +# +# The maximum number of active connections in the database connection pool. +# Increase this value to support a greater number of concurrent page requests. +# +VitroConnection.DataSource.pool.maxActive = 40 + +# +# The maximum number of database connections that will be allowed +# to remain idle in the connection pool. Default is 25% +# of the maximum number of active connections. +# +VitroConnection.DataSource.pool.maxIdle = 10 + +# +# Parameters to change in order to use VIVO with a database other than +# MySQL. +# +VitroConnection.DataSource.dbtype = MySQL +VitroConnection.DataSource.driver = com.mysql.jdbc.Driver +VitroConnection.DataSource.validationQuery = SELECT 1 + +# +# Optional URI of a SPARQL endpoint from which VIVO should display data. +# If set, VIVO will use this endpoint as its triple store instead of the +# SDB database. +# +#VitroConnection.DataSource.endpointURI = + +# +# Optional URI to use for modifying the above endpoint via SPARQL UPDATE. +# This setting is only necessary if the endpoint does not support updates via +# its main URI. (This may be done for access control purposes.) +# If the endpointURI above is not set, this setting has no effect. +# +#VitroConnection.DataSource.updateEndpointURI = + +# +# The email address of the root user for the VIVO application. The password +# for this user is initially set to "rootPassword", but you will be asked to +# change the password the first time you log in. +# +rootUser.emailAddress = vivo_root@mydomain.edu + +# +# How is a logged-in user associated with a particular Individual? One way is +# for the Individual to have a property whose value is the username of the user. +# This value should be the URI for that property. +# +selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId + +# +# If an external authentication system like Shibboleth or CUWebAuth is to be +# used, this property says which HTTP header will contain the user ID from +# the authentication system. If such a system is not to be used, leave this +# commented out. Consult the installation instructions for more details. +# +#externalAuth.netIdHeaderName = remote_userID + +# +# The temporal graph visualization can require extensive machine resources. +# This can have a particularly noticeable impact on memory usage if +# - The organization tree is deep, +# - The number of grants and publications is large. +# VIVO 1.3 release mitigates this problem by the way of a caching mechanism & +# hence we can safely set this to be enabled by default. +# +visualization.temporal = enabled + +# +# The temporal graph visualization is used to compare different organizations/people +# within an organization on parameters like number of publications or grants. +# By default, the app will attempt to make its best guess at the top level +# organization in your instance. If you're unhappy with this selection, uncomment out +# the property below and set it to the URI of the organization individual you want to +# identify as the top level organization. It will be used as the default whenever the +# temporal graph visualization is rendered without being passed an explicit org. +# For example, to use "Ponce School of Medicine" as the top organization: +# visualization.topLevelOrg = http://vivo.psm.edu/individual/n2862 +# +# visualization.topLevelOrg = http://vivo.mydomain.edu/individual/topLevelOrgURI + +# +# Absolute path on the server of the Harvester root directory. +# You must include the final slash. +# Setting a value for harvester.location indicates that the Harvester is installed at +# this path. This will enable the Harvester functions in the Ingest Tools page. +# +# harvester.location = /usr/local/vivo/harvester/ + +# +# Default type(s) for Google Refine Reconciliation Service +# The format for this property is id, name; id1, name1; id2, name2 etc. +# See Service Metadata from this page http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi +# for more information. +Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; \ + http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; \ + http://purl.org/NET/c4dm/event.owl#Event, event:Event; \ + http://vivoweb.org/ontology/core#Location, core:Location; \ + http://xmlns.com/foaf/0.1/Organization, foaf:Organization; \ + http://xmlns.com/foaf/0.1/Person, foaf:Person; \ + http://purl.obolibrary.org/obo/IAO_0000030, obo:IAO_0000030 + +# +# Types of individual for which we can create proxy editors. +# If this is omitted, defaults to http://www.w3.org/2002/07/owl#Thing +# +proxy.eligibleTypeList = http://xmlns.com/foaf/0.1/Person, http://xmlns.com/foaf/0.1/Organization + +# +# Show only the most appropriate data values based on the Accept-Language +# header supplied by the browser. Default is false if not set. +# +# RDFService.languageFilter = false + +# +# Force VIVO to use a specific language or Locale instead of those +# specified by the browser. This affects RDF data retrieved from the model, +# if RDFService.languageFilter is true. This also affects the text of pages +# that have been modified to support multiple languages. +# +# languages.forceLocale = en_US + +# +# A list of supported languages or Locales that the user may choose to +# use instead of the one specified by the browser. Selection images must +# be available in the i18n/images directory of the theme. This affects +# RDF data retrieved from the model, if RDFService.languageFilter is true. +# This also affects the text of pages that have been modified to support +# multiple languages. +# +# This should not be used with languages.forceLocale, which will override it. +# +# languages.selectableLocales = en_US, es_GO + +# +# Tell VIVO to generate HTTP headers on its responses to facilitate caching the +# profile pages that it creates. +# +# For more information, see +# https://wiki.duraspace.org/display/VIVO/Use+HTTP+caching+to+improve+performance +# +# Developers will likely want to leave caching disabled, since a change to a +# Freemarker template or to a Java class would not cause the page to be +# considered stale. +# +# http.createCacheHeaders = true + +# +# For OpenSocial integration +# The base URL of the ORNG Shindig server. Usually, this is the same host and port +# number as VIVO itself, with a context path of "shindigorng". +# +#OpenSocial.shindigURL = http://localhost:8080/shindigorng + +# +# For OpenSocial integration +# The host name and port number of the service that provides security tokens for VIVO and +# Shindig to share. For now, the host name must be the actual host, not "localhost" or "127.0.0.1" +# The port number must be 8777 +# +#OpenSocial.tokenService = myhost.mydomain.edu:8777 + +# +# For OpenSocial integration +# The path to the key file that will be used qwhen generating security tokens for VIVO and +# shindig to share. +# +#OpenSocial.tokenKeyFile = /usr/local/vivo/data/shindig/openssl/securitytokenkey.txt + +# +# For OpenSocial integration +# Only set sandbox to True for dev/test environments. Comment out or set to False in production +# +#OpenSocial.sandbox = True + +# MultiViews +# VIVO supports the simultaneous use of a full foaf:Person profile page view and a "quick" page +# view that emphasizes the individual's webpage presence. Implementing this feature requires an +# installation to develop a web service that captures images of web pages or to use an existing +# service outside of VIVO. For more information on implementing multiple profile pages, refer to +# this wiki page: https://wiki.duraspace.org/display/VIVO/Multiple+foaf%3APerson+Profile+Pages. +#multiViews.profilePageTypes=enabled + +# Geo Focus Maps +# When the following flag is set to enabled, the VIVO home page displays a global map highlighting the +# geographical focus of foaf:person individuals. For information on the maps, refer to this wiki page: +# https://wiki.duraspace.org/display/VIVO/Home+Page+Customizations#HomePageCustomizations-TheGeographicFocusMap +#homePage.geoFocusMaps=enabled + From 69d5ece4e9db1b70468847fae60e08d69f0bf1d0 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Thu, 12 Dec 2013 16:46:52 -0500 Subject: [PATCH 33/33] Holly made changes to the test cases as a result of testing RC 5 --- .../CheckBrowseOptions.html | 577 ++-- .../AddNonPersonThings/CheckIndexView.html | 193 +- .../AddNonPersonThings/CheckPublicView.html | 2030 ++++++--------- .../AddNonPersonThings/CreateCourse.html | 21 +- .../AddNonPersonThings/CreateEquipment.html | 101 +- .../AddNonPersonThings/CreateEvent.html | 4 +- .../AddNonPersonThings/CreateLocation.html | 4 +- .../CreateOrganization.html | 34 +- .../AddNonPersonThings/CreateTopic.html | 10 +- .../AddNonPersonThings/DeleteIndexStuff.html | 1663 +++++++++--- .../TestMenuManagement.html | 237 +- .../VerifyAllThingsSearchable.html | 356 ++- .../suites/CreatePeople/AddFacultyInfo.html | 39 +- .../suites/CreatePeople/AddFacultyInfo2.html | 9 +- .../CreatePeople/AssociateLibToFac.html | 5 + .../CreatePeople/DeleteFacultyInfo.html | 2311 ++++++++++------- .../suites/CreatePeople/EditFacultyInfo.html | 73 +- .../CreatePeople/PublicFacultyInfo.html | 9 +- .../CreatePeople/SearchFacultyInfo.html | 145 +- .../DeleteDataPropArchDetails.html | 2 +- .../DeleteObjPropYearFounded.html | 2 +- .../DeletePropertyGroupPlace.html | 2 +- .../suites/InitialSetup/EditSiteInfo.html | 8 +- .../suites/ProxyEditing/DeleteNewUsers.html | 65 +- .../ProxyEditing/ValidateAdminProxy2.html | 2 +- .../suites/SelfEditing/AddSelfEditorId.html | 51 - .../suites/SelfEditing/AddSelfEditorId2.html | 208 ++ .../SelfEditing/CreateNewSelfEditorUser.html | 7 +- .../SelfEditing/CreateNewSelfEditorUser2.html | 192 ++ .../suites/SelfEditing/Suite.html | 4 +- 30 files changed, 5044 insertions(+), 3320 deletions(-) create mode 100644 utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html create mode 100644 utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html index 51a69df8..71a27555 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html @@ -23,7 +23,7 @@ /vivo/ - + clickAndWait link=Home @@ -36,47 +36,92 @@ verifyElementPresent - link=Activities (4) + link=Books + + + + verifyTextPresent + 1  Books verifyElementPresent - link=Courses (1) + link=Grants + + + + verifyTextPresent + 3  Grants + + + + clickAndWait + link=View all ... + + + + assertTitle + Research verifyElementPresent - link=Events (4) + link=Article (1) verifyElementPresent - link=Organizations (5) + link=Award or Honor (2) verifyElementPresent - link=Equipment (2) + link=Blog Posting (1) verifyElementPresent - link=Research (12) + link=Book (1) verifyElementPresent - link=Locations (321) + link=Concept (7) - click - link=Activities (4) + verifyElementPresent + link=Database (1) - pause - 5000 + verifyElementPresent + link=Grant (3) + + + + verifyElementPresent + link=Human Study (1) + + + + verifyElementPresent + link=Patent (1) + + + + verifyElementPresent + link=Proceedings (1) + + + + verifyElementPresent + link=Webpage (1) + + + + clickAndWait + link=Home @@ -84,239 +129,16 @@ VIVO + verifyTextPresent - Agreement + No faculty members found. + verifyTextPresent - Service - - - - click - link=Courses (1) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - Course - - - - click - link=Events (4) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - Conference - - - - verifyTextPresent - Invited Talk - - - - verifyTextPresent - Presentation - - - - click - link=Organizations (5) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - College - - - - verifyTextPresent - Consortium - - - - verifyTextPresent - Laboratory - - - - verifyTextPresent - Library - - - - click - link=Equipment (2) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - Equipment - - - - click - link=Research (12) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - Award or Honor - - - - verifyTextPresent - Book - - - - verifyTextPresent - Concept - - - - verifyTextPresent - Database - - - - verifyTextPresent - Grant - - - - verifyTextPresent - Proceedings - - - - verifyTextPresent - Webpage - - - - click - link=Locations (321) - - - - pause - 5000 - - - - assertTitle - VIVO - - - - verifyTextPresent - Address - - - - verifyTextPresent - Building - - - - verifyTextPresent - Campus - - - - verifyTextPresent - Continent - - - - verifyTextPresent - Country - - - - verifyTextPresent - Facility - - - - verifyTextPresent - Geographic Location - - - - verifyTextPresent - Geographic Region - - - - verifyTextPresent - Room - - - - verifyTextPresent - State Or Province - - - - verifyTextPresent - Transnational Region + No academic departments found. @@ -325,11 +147,21 @@ link=People + + pause + 5000 + + verifyElementPresent link=Person (1) + + pause + 5000 + + verifyElementPresent link=Person, Polly @@ -348,7 +180,12 @@ verifyElementPresent - link=College (1) + link=College (2) + + + + verifyElementPresent + link=Company (1) @@ -368,7 +205,12 @@ verifyElementPresent - link=Organization (5) + link=Organization (7) + + + + verifyElementPresent + link=University (1) @@ -381,11 +223,31 @@ 5000 + + verifyElementPresent + link=Primate College of New York + + verifyElementPresent link=Primate College of America + + click + link=Company (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Primates-r-us + + click //li[@id='consortium']/a @@ -446,6 +308,11 @@ link=Primate College of America + + verifyElementPresent + link=Primate College of New York + + verifyElementPresent link=Primate Colleges of the World @@ -461,6 +328,11 @@ link=Primate Research Laboratory + + verifyElementPresent + link=Primate University of America + + verifyElementPresent link=Primates-r-us @@ -491,6 +363,11 @@ link=Primate College of America + + verifyElementPresent + link=Primate College of New York + + verifyElementPresent link=Primate Colleges of the World @@ -506,11 +383,31 @@ link=Primate Research Laboratory + + verifyElementPresent + link=Primate University of America + + verifyElementPresent link=Primates-r-us + + click + link=University (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Primate University of America + + clickAndWait @@ -522,6 +419,21 @@ Research + + verifyElementPresent + link=Article (1) + + + + verifyElementPresent + link=Award or Honor (2) + + + + verifyElementPresent + link=Blog Posting (1) + + verifyElementPresent link=Book (1) @@ -529,7 +441,7 @@ verifyElementPresent - link=Concept (5) + link=Concept (7) @@ -542,6 +454,16 @@ link=Grant (3) + + verifyElementPresent + link=Human Study (1) + + + + verifyElementPresent + link=Patent (1) + + verifyElementPresent link=Proceedings (1) @@ -552,6 +474,41 @@ link=Webpage (1) + + click + link=Article (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Primate Happenings + + + + click + link=Award or Honor (2) + + + + pause + 5000 + + + + verifyElementPresent + link=Best Primate College + + + + verifyElementPresent + link=Primate Student of the Year + + click //li[@id='book']/a @@ -567,11 +524,6 @@ link=PHC Proceedings - - verifyTextPresent - Proceedings - - click //li[@id='concept']/a @@ -592,6 +544,11 @@ link=Ape Health + + verifyElementPresent + link=Best Primate College + + verifyElementPresent link=Elderly Care @@ -607,6 +564,11 @@ link=Primate Health + + verifyElementPresent + link=Primate Student of the Year + + click //li[@id='concept']/a @@ -637,6 +599,11 @@ link=Primate Health + + verifyElementPresent + link=Primate Student of the Year + + click //li[@id='database']/a @@ -677,6 +644,36 @@ link=Primate Survival Planning Grant + + click + link=Human Study (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Human and Ape Brain Comparison + + + + click + link=Patent (1) + + + + pause + 5000 + + + + verifyElementPresent + link=USA222333444555 + + click //li[@id='proceedings']/a @@ -725,7 +722,7 @@ verifyElementPresent - link=Event (4) + link=Event (7) @@ -733,11 +730,26 @@ link=Invited Talk (1) + + verifyElementPresent + link=Performance (1) + + verifyElementPresent link=Presentation (1) + + verifyElementPresent + link=Seminar Series (1) + + + + verifyElementPresent + link=Workshop (1) + + click //li[@id='conference']/a @@ -769,8 +781,13 @@ - verifyTextPresent - Course + verifyElementPresent + link=Introduction to Primates + + + + verifyElementPresent + link=New Primate Students @@ -778,11 +795,6 @@ link=Primate Health and Fitness - - verifyTextPresent - Invited Talk - - verifyElementPresent link=Primate Health Check @@ -794,8 +806,8 @@ - verifyTextPresent - Conference + verifyElementPresent + link=Primates in the Wild @@ -815,7 +827,22 @@ click - //li[@id='presentation']/a + link=Performance (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Primates in the Wild + + + + click + link=Presentation (1) @@ -828,24 +855,9 @@ link=Primate Health and Fitness - - verifyTextPresent - Invited Talk - - click - //li[@id='conference']/a - - - - pause - 5000 - - - - click - link=P + link=Seminar Series (1) @@ -855,7 +867,22 @@ verifyElementPresent - link=Primate Health Conference + link=Primate Health Talks + + + + click + link=Workshop (1) + + + + pause + 5000 + + + + verifyElementPresent + link=New Primate Students diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html index d193d027..b87e6af0 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html @@ -11,11 +11,7 @@ CheckIndexView - - comment - Check index for browse links for roles - - + deleteAllVisibleCookies @@ -31,24 +27,17 @@ VIVO - - comment - No need to login - - - - comment - Navigate to Index - - + + clickAndWait link=Index + - comment - Verify headings appear + verifyTextPresent + people @@ -86,24 +75,35 @@ locations + - comment - Verify counts correct + verifyTextPresent + Person (1) verifyTextPresent - Agreement (3) + Project (1) verifyTextPresent - Service (1) + Research Project (1) verifyTextPresent - Course (1) + Service (2) + + + + verifyTextPresent + Transport Service (1) + + + + verifyTextPresent + Course (2) @@ -113,7 +113,7 @@ verifyTextPresent - Event (4) + Event (7) @@ -121,6 +121,11 @@ Invited Talk (1) + + verifyTextPresent + Performance (1) + + verifyTextPresent Presentation (1) @@ -128,7 +133,22 @@ verifyTextPresent - College (1) + Seminar Series (1) + + + + verifyTextPresent + Workshop (1) + + + + verifyTextPresent + College (2) + + + + verifyTextPresent + Company (1) @@ -148,7 +168,12 @@ verifyTextPresent - Organization (5) + Organization (7) + + + + verifyTextPresent + University (1) @@ -158,7 +183,17 @@ verifyTextPresent - Award or Honor (1) + Article (1) + + + + verifyTextPresent + Award or Honor (2) + + + + verifyTextPresent + Blog Posting (1) @@ -168,7 +203,7 @@ verifyTextPresent - Concept (5) + Concept (7) @@ -181,6 +216,16 @@ Grant (3) + + verifyTextPresent + Human Study (1) + + + + verifyTextPresent + Patent (1) + + verifyTextPresent Proceedings (1) @@ -193,17 +238,7 @@ verifyTextPresent - Address (1) - - - - verifyTextPresent - Building (1) - - - - verifyTextPresent - Campus (1) + Building (2) @@ -213,7 +248,12 @@ verifyTextPresent - Facility (3) + County (1) + + + + verifyTextPresent + Facility (5) @@ -221,14 +261,20 @@ Room (1) + - comment - Verify links correct + verifyElementPresent + link=Person verifyElementPresent - link=Agreement + link=Project + + + + verifyElementPresent + link=Research Project @@ -236,6 +282,11 @@ link=Service + + verifyElementPresent + link=Transport Service + + verifyElementPresent link=Course @@ -256,16 +307,36 @@ link=Invited Talk + + verifyElementPresent + link=Performance + + verifyElementPresent link=Presentation + + verifyElementPresent + link=Seminar Series + + + + verifyElementPresent + link=Workshop + + verifyElementPresent link=College + + verifyElementPresent + link=Company + + verifyElementPresent link=Consortium @@ -286,16 +357,31 @@ link=Organization + + verifyElementPresent + link=University + + verifyElementPresent link=Equipment + + verifyElementPresent + link=Article + + verifyElementPresent link=Award or Honor + + verifyElementPresent + link=Blog Posting + + verifyElementPresent link=Book @@ -316,6 +402,16 @@ link=Grant + + verifyElementPresent + link=Human Study + + + + verifyElementPresent + link=Patent + + verifyElementPresent link=Proceedings @@ -326,11 +422,6 @@ link=Webpage - - verifyElementPresent - link=Address - - verifyElementPresent link=Building @@ -338,7 +429,7 @@ verifyElementPresent - link=Campus + link=County @@ -351,11 +442,7 @@ link=Room - - comment - Go back to home page - - + clickAndWait link=Home diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html index 95e79398..01f2a6e9 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html @@ -11,11 +11,7 @@ CheckPublicView - - comment - Check public view of non-person things - - + deleteAllVisibleCookies @@ -31,14 +27,37 @@ VIVO + + - comment - No need to login + clickAndWait + link=Index + + + + + clickAndWait + link=Project - comment - Navigate to Index + assertTitle + Project + + + + clickAndWait + link=Human and Ape Brain Comparison + + + + assertTitle + Human and Ape Brain Comparison + + + + verifyElementPresent + link=Primate College of America @@ -46,7 +65,46 @@ link=Index - + + assertTitle + Index of Contents + + + + clickAndWait + link=Research Project + + + + assertTitle + Research Project + + + + clickAndWait + link=Human and Ape Brain Comparison + + + + assertTitle + Human and Ape Brain Comparison + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait link=Service @@ -68,13 +126,38 @@ - verifyTextPresent - Background + verifyElementPresent + link=Primate College of America - verifyTextPresent - contributor + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Service + + + + assertTitle + Service + + + + clickAndWait + link=Gorilla Moving Company + + + + assertTitle + Gorilla Moving Company @@ -83,8 +166,48 @@ - verifyTextPresent - Primate College of America Founder 2010 - + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Transport Service + + + + assertTitle + Transport Service + + + + clickAndWait + link=Gorilla Moving Company + + + + assertTitle + Gorilla Moving Company + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents @@ -113,29 +236,39 @@ Introduction to Primate Health - - verifyTextPresent - Overview - - - - verifyTextPresent - includes event - - verifyElementPresent - link=Primate Health Check + link=Primate College of America - verifyTextPresent - Primate Health Check + clickAndWait + link=Index - verifyTextPresent - offered by + assertTitle + Index of Contents + + + + clickAndWait + link=Course + + + + assertTitle + Course + + + + clickAndWait + link=Introduction to Primates + + + + assertTitle + Introduction to Primates @@ -143,167 +276,6 @@ link=Primate College of America - - verifyTextPresent - Primate College of America - - - - verifyTextPresent - has subject area - - - - verifyElementPresent - link=Animal Health - - - - verifyTextPresent - Animal Health - - - - verifyTextPresent - description - - - - verifyTextPresent - Learn the basics about the general health of primates. - - - - verifyTextPresent - prerequisite for - - - - verifyElementPresent - link=Introduction to Primate Health - - - - verifyTextPresent - Introduction to Primate Health - - - - verifyTextPresent - contact information - - - - verifyTextPresent - ME Tarzan at metarzan@primates.edu or 555-555-5553 - - - - verifyTextPresent - Research - - - - verifyTextPresent - geographic focus - - - - verifyElementPresent - link=Africa - - - - verifyTextPresent - Africa - - - - verifyTextPresent - Location - - - - verifyTextPresent - has geographic location - - - - verifyElementPresent - link=Liberia - - - - verifyTextPresent - Liberia - - - - verifyTextPresent - Time - - - - verifyTextPresent - date/time interval - - - - verifyTextPresent - September 1, 2007 - December 15, 2007 - - - - verifyTextPresent - Additional Document Info - - - - verifyTextPresent - related documents - - - - verifyElementPresent - link=http://primatehealthintro.cornell.edu - - - - verifyTextPresent - http://primatehealthintro.cornell.edu - - - - verifyTextPresent - Other - - - - verifyTextPresent - has prerequisite - - - - verifyElementPresent - link=Introduction to Primate Health - - - - verifyTextPresent - Introduction to Primate Health - - - - verifyTextPresent - credits - - - - verifyTextPresent - 9 - - - clickAndWait link=Index @@ -330,19 +302,9 @@ Primate Health Conference - - verifyTextPresent - includes event - - verifyElementPresent - link=Primate Health Check - - - - verifyTextPresent - Primate Health Check + link=Primate Health and Fitness @@ -365,101 +327,11 @@ description - - verifyTextPresent - First annual conference for those interested in the general health of primates. - - - - verifyTextPresent - proceedings - - verifyElementPresent link=PHC Proceedings - - verifyTextPresent - PHC Proceedings - - - - verifyTextPresent - contact information - - - - verifyTextPresent - info@primateconf.org - - - - verifyTextPresent - geographic focus - - - - verifyElementPresent - link=Kenya - - - - verifyTextPresent - Kenya - - - - verifyTextPresent - has geographic location - - - - verifyElementPresent - link=Congo - - - - verifyTextPresent - Congo - - - - verifyTextPresent - date/time interval - - - - verifyTextPresent - January 5, 2011 - January 9, 2011 - - - - verifyTextPresent - related documents - - - - verifyElementPresent - link=http://primatehealthintro.cornell.edu - - - - verifyTextPresent - http://primatehealthintro.cornell.edu - - - - verifyTextPresent - abbreviation - - - - verifyTextPresent - PrimHConf - - clickAndWait link=Index @@ -486,8 +358,33 @@ - verifyTextPresent - participant + verifyElementPresent + link=Introduction to Primate Health + + + + clickAndWait + link=Index + + + + clickAndWait + link=Performance + + + + assertTitle + Performance + + + + clickAndWait + link=Primates in the Wild + + + + assertTitle + Primates in the Wild @@ -496,13 +393,13 @@ - verifyTextPresent - Primate College of America Organizer 2008 + clickAndWait + link=Index - clickAndWait - link=Index + assertTitle + Index of Contents @@ -525,411 +422,34 @@ Primate Health and Fitness - - verifyTextPresent - participant - - verifyElementPresent - link=Primate College of America + link=Introduction to Primate Health - - verifyTextPresent - Primate College of America Organizer 2008 - - - clickAndWait link=Index - clickAndWait - link=Organization + link=Seminar Series assertTitle - Organization + Seminar Series clickAndWait - link=Primate College of America + link=Primate Health Talks assertTitle - Primate College of America - - - - verifyTextPresent - The Primate College of America is a privately-funded college for the study of primates. - - - - verifyTextPresent - predecessor organization - - - - verifyElementPresent - link=Primate College of America - - - - verifyTextPresent - Primate College of America - - - - verifyTextPresent - successor organization - - - - verifyElementPresent - link=Primate College of America - - - - verifyTextPresent - Primate College of America - - - - verifyTextPresent - offers degree - - - - verifyElementPresent - link=B.S. Bachelor of Science - - - - verifyTextPresent - B.S. Bachelor of Science - - - - verifyTextPresent - awards grant - - - - verifyElementPresent - link=Primate Habitat Research Grant - - - - verifyTextPresent - Primate Habitat Research Grant - - - - verifyTextPresent - subcontracts grant - - - - verifyElementPresent - link=Primate Survival Planning Grant - - - - verifyTextPresent - Primate Survival Planning Grant - - - - verifyTextPresent - sponsors award or honor - - - - verifyElementPresent - link=Primate Student of the Year - - - - verifyTextPresent - Primate Student of the Year - - - - verifyTextPresent - award or honor given - - - - verifyElementPresent - link=Best Primate College - - - - verifyTextPresent - Best Primate College - - - - verifyTextPresent - has equipment - - - - verifyElementPresent - link=Portable Primate Habitat - - - - verifyTextPresent - Portable Primate Habitat - - - - verifyTextPresent - has sub-organization - - - - verifyTextPresent - laboratory - - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyTextPresent - Primate Research Laboratory - - - - verifyTextPresent - organization within - - - - verifyElementPresent - link=Primate History Library - - - - verifyTextPresent - Primate History Library - - - - verifyTextPresent - people - - - - verifyTextPresent - faculty administrative position - - - - verifyTextPresent - Person, Polly, 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 - - - - 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 - - - - verifyTextPresent - clinical activities - - - - verifyElementPresent - link=Primate Heart Health - - - - verifyTextPresent - Primate Heart Health Founder 2010 - - - - - verifyTextPresent - selected publications - - - - verifyTextPresent - database - - - - verifyElementPresent - link=Primate Info - - - - verifyTextPresent - presentations - - - - verifyElementPresent - link=Primate Health and Fitness - - - - verifyTextPresent - 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 - - - - verifyTextPresent - email - - - - verifyTextPresent - info@primates.edu - - - - verifyTextPresent - phone - - - - verifyTextPresent - 555-555-5555 - - - - verifyTextPresent - fax - - - - verifyTextPresent - 555-555-5554 - - - - verifyTextPresent - mailing address - - - - verifyTextPresent - 1234 Northern African Nation - - - - verifyTextPresent - date/time interval - - - - verifyTextPresent - 1959 - - - - - verifyTextPresent - offers course + Primate Health Talks @@ -938,28 +458,38 @@ - verifyTextPresent - Introduction to Primate Health + clickAndWait + link=Index - verifyTextPresent - abbreviation + assertTitle + Index of Contents - verifyTextPresent - PCoA + clickAndWait + link=Workshop - verifyTextPresent - keywords + assertTitle + Workshop - verifyTextPresent - Gorillas + clickAndWait + link=New Primate Students + + + + assertTitle + New Primate Students + + + + verifyElementPresent + link=Primate College of America @@ -967,14 +497,125 @@ link=Index + + assertTitle + Index of Contents + + + clickAndWait - link=Organization + link=College assertTitle - Organization + College + + + + clickAndWait + link=Primate College of America + + + + assertTitle + Primate College of America + + + + verifyElementPresent + link=B.S. Bachelor of Science + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=College + + + + assertTitle + College + + + + clickAndWait + link=Primate College of New York + + + + assertTitle + Primate College of New York + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Company + + + + assertTitle + Company + + + + clickAndWait + link=Primates-r-us + + + + assertTitle + Primates-r-us + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Consortium + + + + assertTitle + Consortium @@ -987,114 +628,29 @@ Primate Colleges of the World - - verifyTextPresent - administers grant - - - - verifyElementPresent - link=Primate Elderly Care - - - - verifyTextPresent - Primate Elderly Care - - - - verifyTextPresent - subcontracts grant - - - - verifyElementPresent - link=Primate Elderly Care - - - - verifyTextPresent - Primate Elderly Care - - - - verifyTextPresent - contributor - - verifyElementPresent link=Primate College of America - - verifyTextPresent - Primate College of America 2009 - - - clickAndWait link=Index + + assertTitle + Index of Contents + + clickAndWait - link=Organization + link=Laboratory assertTitle - Organization - - - - clickAndWait - link=Primate History Library - - - - assertTitle - Primate History Library - - - - verifyTextPresent - Affiliation - - - - verifyTextPresent - has sub-organization - - - - verifyTextPresent - college - - - - verifyElementPresent - link=Primate College of America - - - - verifyTextPresent - Primate College of America - - - - clickAndWait - link=Index - - - - clickAndWait - link=Organization - - - - assertTitle - Organization + Laboratory @@ -1107,54 +663,39 @@ Primate Research Laboratory - - verifyTextPresent - awards grant - - verifyElementPresent - link=Primate Elderly Care + link=Primate College of America - verifyTextPresent - Primate Elderly Care + clickAndWait + link=Index - verifyTextPresent - has equipment + assertTitle + Index of Contents - verifyElementPresent - link=Primate Feeder + clickAndWait + link=Library - verifyTextPresent - Primate Feeder + assertTitle + Library - verifyTextPresent - has geographic location + clickAndWait + link=Primate History Library - verifyElementPresent - link=Jane Memorial Building - - - - verifyTextPresent - Jane Memorial Building - - - - verifyTextPresent - organization within + assertTitle + Primate History Library @@ -1163,8 +704,38 @@ - verifyTextPresent - Primate College of America + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=University + + + + assertTitle + University + + + + clickAndWait + link=Primate University of America + + + + assertTitle + Primate University of America + + + + verifyElementPresent + link=Jane Memorial Building @@ -1172,6 +743,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Organization @@ -1182,37 +758,51 @@ Organization - - clickAndWait - link=Primates-r-us - - - - assertTitle - Primates-r-us - - - - verifyTextPresent - contributor - - verifyElementPresent link=Primate College of America - verifyTextPresent - Primate College of America Founder 2010 - + verifyElementPresent + link=Primate College of New York + + + + verifyElementPresent + link=Primate Colleges of the World + + + + verifyElementPresent + link=Primate History Library + + + + verifyElementPresent + link=Primate Research Laboratory + + + + verifyElementPresent + link=Primate University of America + + + + verifyElementPresent + link=Primates-r-us - clickAndWait link=Index + + assertTitle + Index of Contents + + clickAndWait @@ -1234,36 +824,11 @@ Portable Primate Habitat - - verifyTextPresent - equipment for - - verifyElementPresent link=Primate College of America - - verifyTextPresent - Primate College of America - - - - verifyTextPresent - in facility - - - - verifyElementPresent - link=Jane Memorial Building - - - - verifyTextPresent - Jane Memorial Building - - clickAndWait link=Index @@ -1289,53 +854,272 @@ Primate Feeder - - verifyTextPresent - equipment for - - verifyElementPresent link=Primate Research Laboratory - - verifyTextPresent - Primate Research Laboratory - - - - verifyTextPresent - in facility - - - - verifyElementPresent - link=Primate Research Lab Room 123 - - - - verifyTextPresent - Primate Research Lab Room 123 - - - - verifyTextPresent - keywords - - - - verifyTextPresent - Animal Diet - - - clickAndWait link=Index + + clickAndWait + link=Article + + + + assertTitle + Article + + + + clickAndWait + link=Primate Happenings + + + + assertTitle + Primate Happenings + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Best Primate College + + + + assertTitle + Best Primate College + + + + verifyElementPresent + link=Best Primate College (Primate College of America) + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Primate Student of the Year + + + + assertTitle + Primate Student of the Year + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Blog Posting + + + + assertTitle + Blog Posting + + + + clickAndWait + link=Primate Happenings + + + + assertTitle + Primate Happenings + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Book + + + + assertTitle + Book + + + + verifyElementPresent + link=PHC Proceedings + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + verifyElementPresent + link=Animal Health + + + + verifyElementPresent + link=Ape Health + + + + verifyElementPresent + link=Best Primate College + + + + verifyElementPresent + link=Elderly Care + + + + verifyElementPresent + link=Primate Diet + + + + verifyElementPresent + link=Primate Health + + + + verifyElementPresent + link=Primate Student of the Year + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Database + + + + assertTitle + Database + + + + clickAndWait + link=Primate Info + + + + assertTitle + Primate Info + + + + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait link=Grant @@ -1356,151 +1140,21 @@ Primate Elderly Care - - verifyTextPresent - administered by - - - - verifyElementPresent - link=Primate Colleges of the World - - - - verifyTextPresent - Primate Colleges of the World - - - - verifyTextPresent - grant awarded by - - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyTextPresent - Primate Research Laboratory - - - - verifyTextPresent - has subject area - - verifyElementPresent link=Elderly Care - - verifyTextPresent - Elderly Care - - - - 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 - - - - 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 - - - - verifyTextPresent - date/time interval - - - - verifyTextPresent - September 1, 2010 - August 31, 2012 - - - - verifyTextPresent - local award id - - - - verifyTextPresent - P999-1234 - - - - verifyTextPresent - provides funding for - - clickAndWait link=Index + + assertTitle + Index of Contents + + clickAndWait link=Grant @@ -1521,24 +1175,19 @@ Primate Habitat Research Grant - - verifyTextPresent - grant awarded by - - verifyElementPresent link=Primate College of America - verifyTextPresent - Primate College of America + clickAndWait + link=Index - clickAndWait - link=Index + assertTitle + Index of Contents @@ -1562,8 +1211,38 @@ - verifyTextPresent - subcontracted through + verifyElementPresent + link=Primate College of America + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Human Study + + + + assertTitle + Human Study + + + + clickAndWait + link=Human and Ape Brain Comparison + + + + assertTitle + Human and Ape Brain Comparison @@ -1571,51 +1250,39 @@ link=Primate College of America - - verifyTextPresent - Primate College of America - - - clickAndWait link=Index - - - clickAndWait - link=Concept - - assertTitle - Concept + Index of Contents clickAndWait - link=Elderly Care + link=Patent assertTitle - Elderly Care + Patent - verifyTextPresent - subject area for + clickAndWait + link=USA222333444555 + + + + assertTitle + USA222333444555 verifyElementPresent - link=Primate Elderly Care - - - - verifyTextPresent - Primate Elderly Care + link=Primate College of America @@ -1623,39 +1290,34 @@ link=Index - - clickAndWait - link=Concept - - assertTitle - Concept + Index of Contents clickAndWait - link=Primate Diet + link=Proceedings assertTitle - Primate Diet + Proceedings - verifyTextPresent - broader term + clickAndWait + link=PHC Proceedings + + + + assertTitle + PHC Proceedings verifyElementPresent - link=Primate Health - - - - verifyTextPresent - Primate Health + link=Primate Health Conference @@ -1663,118 +1325,11 @@ link=Index - - clickAndWait - link=Concept - - assertTitle - Concept + Index of Contents - - clickAndWait - link=Primate Health - - - - assertTitle - Primate Health - - - - verifyTextPresent - broader term - - - - verifyElementPresent - link=Animal Health - - - - verifyTextPresent - Animal Health - - - - verifyTextPresent - narrower term - - - - verifyElementPresent - link=Primate Diet - - - - verifyTextPresent - Primate Diet - - - - verifyTextPresent - related - - - - verifyElementPresent - link=Ape Health - - - - verifyTextPresent - Ape Health - - - - clickAndWait - link=Index - - - - clickAndWait - link=Concept - - - - assertTitle - Concept - - - - clickAndWait - link=Ape Health - - - - assertTitle - Ape Health - - - - verifyTextPresent - related - - - - verifyElementPresent - link=Primate Health - - - - verifyTextPresent - Primate Health - - - - - clickAndWait - link=Index - - - clickAndWait link=Webpage @@ -1787,27 +1342,12 @@ clickAndWait - link=http://primatehealthintro.cornell.edu + link=exact:http://primatehealthintro.cornell.edu assertTitle - http://primatehealthintro.cornell.edu - - - - verifyTextPresent - presented at - - - - verifyElementPresent - link=Primate Health Conference - - - - verifyTextPresent - Primate Health Conference + exact:http://primatehealthintro.cornell.edu @@ -1815,17 +1355,16 @@ link=Introduction to Primate Health - - verifyTextPresent - Introduction to Primate Health - - - clickAndWait link=Index + + assertTitle + Index of Contents + + clickAndWait @@ -1847,66 +1386,11 @@ Jane Memorial Building - - verifyTextPresent - rooms - - - - verifyElementPresent - link=Lab Admin Office - - - - verifyTextPresent - Lab Admin Office - - - - verifyTextPresent - geographically contains - - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyTextPresent - Primate Research Laboratory - - - - verifyTextPresent - location of equipment - - verifyElementPresent link=Portable Primate Habitat - - verifyTextPresent - Portable Primate Habitat - - - - verifyTextPresent - geographic location of - - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyTextPresent - Primate Research Laboratory - - clickAndWait link=Index @@ -1932,26 +1416,12 @@ Lab Admin Office - - verifyTextPresent - room within building - - verifyElementPresent link=Jane Memorial Building - - verifyTextPresent - Jane Memorial Building - - - - comment - Go back to VIVO home page - - + clickAndWait link=Home diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html index fb56fb58..b65ba15c 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html @@ -230,7 +230,7 @@ verifyTextPresent - Add an entry to: prerequisite for + Select an existing Course for Introduction to Primate Health @@ -460,7 +460,7 @@ type - id=name + id=label Primate Health Talks @@ -516,7 +516,7 @@ type - name + id=label http://primatehealthintro.cornell.edu @@ -597,7 +597,7 @@ clickAndWait - xpath=(//img[@alt='add'])[14] + xpath=(//img[@alt='add'])[16] @@ -605,15 +605,10 @@ Edit - - verifyTextPresent - Select an existing Geographic Location for Introduction to Primate Health - - type id=object - Libe + lib click @@ -622,7 +617,7 @@ clickAndWait - submit + id=submit @@ -652,7 +647,7 @@ type - id=name + id=label Primate Memorial Building @@ -729,7 +724,7 @@ click - //div[@id='wrapper-content']/ul/li[10] + //div[@id='wrapper-content']/ul/li[8] diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html index 2eb0932d..0766c49c 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html @@ -231,7 +231,7 @@ type - name + id=label Primate Research Lab Room 123 @@ -288,7 +288,7 @@ clickAndWait - css=a.add-ERO_0000070 > img.add-individual + xpath=(//img[@alt='add'])[3] @@ -299,7 +299,7 @@ select id=objectVar - label=Primate Research Laboratory + label=Primate Heart Health clickAndWait @@ -308,32 +308,12 @@ assertTitle - Primate Feeder + Primate Research Lab Room 123 clickAndWait - css=a.add-RO_0003001 > img.add-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Primate Feeder - - - - clickAndWait - css=a.add-RO_0003000 > img.add-individual + xpath=(//img[@alt='add'])[4] @@ -344,7 +324,7 @@ select id=objectVar - label=Primate Feeder + label=Primate University of America clickAndWait @@ -353,12 +333,12 @@ assertTitle - Primate Feeder + Primate Research Lab Room 123 clickAndWait - css=a.add-OBI_0000304 > img.add-individual + xpath=(//img[@alt='add'])[5] @@ -369,7 +349,7 @@ select id=objectVar - label=Primate College of America + label=Primate Health Check clickAndWait @@ -378,25 +358,40 @@ assertTitle - Primate Feeder + Primate Research Lab Room 123 + + + + clickAndWait + css=a.add-BFO_0000050 > img.add-individual + + + + assertTitle + Edit + + + + type + id=object + United + + + click + id=ui-active-menuitem + + + + clickAndWait + id=submit + + + + assertTitle + Primate Research Lab Room 123 - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyElementPresent - link=Primate Research Laboratory - - - - verifyElementPresent - link=Portable Primate Habitat - - verifyElementPresent link=Primate Feeder @@ -404,22 +399,22 @@ verifyElementPresent - link=Primate Feeder + link=Primate Heart Health verifyElementPresent - link=Primate College of America - - - - verifyTextPresent - Animal Diet + link=Primate University of America verifyElementPresent - link=Primate Research Lab Room 123 + link=Primate Health Check + + + + verifyElementPresent + link=United States of America diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html index 86d1b4f6..a16b9a58 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html @@ -215,7 +215,7 @@ type - name + id=label PHC Proceedings @@ -397,7 +397,7 @@ type - id=name + id=label State Fair Park diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html index f8e2cde3..4521dc99 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html @@ -190,7 +190,7 @@ type - name + id=label Lab Admin Office @@ -235,7 +235,7 @@ type - id=name + id=label Primate Quad diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index bbad9e32..4eb2ec7d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -255,7 +255,7 @@ type - id=name + id=label Primate College of New York @@ -295,7 +295,7 @@ type - name + id=label Primate Habitat Research Grant @@ -335,7 +335,7 @@ type - name + id=label Primate Student of the Year @@ -400,7 +400,7 @@ type - name + id=label Portable Primate Habitat @@ -440,7 +440,7 @@ type - name + id=label Primate Survival Planning Grant @@ -486,7 +486,7 @@ type - name + id=label Primate Research Laboratory @@ -526,7 +526,7 @@ type - name + id=label Primate History Library @@ -792,7 +792,7 @@ type - id=name + id=label Primate Info @@ -1258,7 +1258,7 @@ type - id=name + id=label Primate Happenings @@ -1293,7 +1293,7 @@ type - id=name + id=label USA222333444555 @@ -1319,7 +1319,7 @@ select id=objectVar - label=Primate Heart Health + label=Primate Happenings clickAndWait @@ -1388,7 +1388,7 @@ type - id=name + id=label Human and Ape Brain Comparison @@ -1433,7 +1433,7 @@ type - id=name + id=label Gorilla Moving Company @@ -1468,7 +1468,7 @@ type - id=name + id=label Introduction to Primates @@ -1513,7 +1513,7 @@ type - id=name + id=label Primate University of America @@ -1717,7 +1717,7 @@ verifyElementPresent - link=Primate Heart Health + css=#translatorOf-Document-List > li > a[title="name"] @@ -1991,7 +1991,7 @@ verifyElementPresent - link=Primate Heart Health + link=Primate Happenings diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html index 8a076f8c..eea51f4b 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html @@ -160,7 +160,7 @@ click - //div[@id='wrapper-content']/ul/li[6] + css=li.nonSelectedGroupTab.clickable @@ -221,12 +221,12 @@ verifyTextPresent - Create "narrower term" entry for Primate Health + Create "narrower concept" entry for Primate Health type - name + id=label Primate Diet @@ -266,12 +266,12 @@ verifyTextPresent - Create "related" entry for Primate Health + Create "related concept" entry for Primate Health type - id=name + id=label Ape Health diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index 3bc4340e..72a39066 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -81,6 +81,11 @@ + + verifyTextPresent + people + + verifyTextPresent activities @@ -116,25 +121,96 @@ locations + + + clickAndWait + link=Person + + + + assertTitle + Person + + + + clickAndWait + link=Person, Polly + + + + assertTitle + Person, Polly + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait - link=Agreement + link=Project assertTitle - Agreement + Project clickAndWait - link=Primate Elderly Care + link=Human and Ape Brain Comparison assertTitle - Primate Elderly Care + Human and Ape Brain Comparison @@ -149,7 +225,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -158,8 +234,8 @@ - clickAndWait - _delete + click + name=_delete @@ -182,24 +258,29 @@ link=Index - - clickAndWait - link=Agreement - - assertTitle - Agreement + Index of Contents clickAndWait - link=Primate Habitat Research Grant + link=Service assertTitle - Primate Habitat Research Grant + Service + + + + clickAndWait + link=Gorilla Moving Company + + + + assertTitle + Gorilla Moving Company @@ -214,7 +295,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -223,73 +304,8 @@ - clickAndWait - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Agreement - - - - assertTitle - Agreement - - - - clickAndWait - link=Primate Survival Planning Grant - - - - assertTitle - Primate Survival Planning Grant - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - clickAndWait - _delete + click + name=_delete @@ -349,7 +365,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -358,8 +374,8 @@ - clickAndWait - _delete + click + name=_delete @@ -382,6 +398,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait @@ -443,25 +464,29 @@ link=Index - - - clickAndWait - link=Conference - - assertTitle - Conference + Index of Contents clickAndWait - link=Primate Health Conference + link=Course assertTitle - Primate Health Conference + Course + + + + clickAndWait + link=Introduction to Primates + + + + assertTitle + Introduction to Primates @@ -476,7 +501,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -486,7 +511,7 @@ clickAndWait - _delete + name=_delete @@ -509,14 +534,90 @@ link=Index + + assertTitle + Index of Contents + + + clickAndWait - link=Invited Talk + link=Event assertTitle - Invited Talk + Event + + + + clickAndWait + link=New Primate Students + + + + assertTitle + New Primate Students + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + clickAndWait + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Event + + + + assertTitle + Event @@ -534,9 +635,14 @@ link=Edit this individual + + assertTitle + Individual Control Panel + + clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -546,7 +652,7 @@ click - _delete + name=_delete @@ -556,7 +662,7 @@ waitForPageToLoad - 10000 + 5000 @@ -569,6 +675,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Event @@ -621,7 +732,217 @@ waitForPageToLoad - 10000 + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Event + + + + assertTitle + Event + + + + clickAndWait + link=Primate Health Conference + + + + assertTitle + Primate Health Conference + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Event + + + + assertTitle + Event + + + + clickAndWait + link=Primates in the Wild + + + + assertTitle + Primates in the Wild + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Seminar Series + + + + assertTitle + Seminar Series + + + + clickAndWait + link=Primate Health Talks + + + + assertTitle + Primate Health Talks + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 @@ -650,6 +971,146 @@ Organization + + clickAndWait + link=Primate College of America + + + + assertTitle + Primate College of America + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Organization + + + + assertTitle + Organization + + + + clickAndWait + link=Primate College of New York + + + + assertTitle + Primate College of New York + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Organization + + + + assertTitle + Organization + + clickAndWait link=Primate Colleges of the World @@ -672,7 +1133,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -681,8 +1142,8 @@ - clickAndWait - _delete + click + name=_delete @@ -705,6 +1166,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Organization @@ -737,7 +1203,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -746,8 +1212,8 @@ - clickAndWait - _delete + click + name=_delete @@ -770,6 +1236,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Organization @@ -802,7 +1273,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -811,8 +1282,8 @@ - clickAndWait - _delete + click + name=_delete @@ -835,6 +1306,81 @@ link=Index + + assertTitle + Index of Contents + + + + clickAndWait + link=Organization + + + + assertTitle + Organization + + + + clickAndWait + link=Primate University of America + + + + assertTitle + Primate University of America + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait link=Organization @@ -867,7 +1413,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -876,8 +1422,8 @@ - clickAndWait - _delete + click + name=_delete @@ -900,69 +1446,9 @@ link=Index - - clickAndWait - link=Organization - - assertTitle - Organization - - - - clickAndWait - link=Primate College of America - - - - assertTitle - Primate College of America - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - clickAndWait - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index + Index of Contents @@ -1096,7 +1582,147 @@ link=Index - + + + clickAndWait + link=Article + + + + assertTitle + Article + + + + clickAndWait + link=Primate Happenings + + + + assertTitle + Primate Happenings + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + + + clickAndWait + link=Best Primate College + + + + assertTitle + Best Primate College + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait link=Award or Honor @@ -1199,7 +1825,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -1208,8 +1834,8 @@ - clickAndWait - _delete + click + name=_delete @@ -1232,6 +1858,11 @@ link=Index + + assertTitle + Index of Contents + + clickAndWait link=Concept @@ -1614,7 +2245,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -1623,8 +2254,8 @@ - clickAndWait - _delete + click + name=_delete @@ -1647,6 +2278,291 @@ link=Index + + assertTitle + Index of Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Elderly Care + + + + assertTitle + Primate Elderly Care + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Habitat Research Grant + + + + assertTitle + Primate Habitat Research Grant + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Grant + + + + assertTitle + Grant + + + + clickAndWait + link=Primate Survival Planning Grant + + + + assertTitle + Primate Survival Planning Grant + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Patent + + + + assertTitle + Patent + + + + clickAndWait + link=USA222333444555 + + + + assertTitle + USA222333444555 + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + clickAndWait link=Webpage @@ -1677,77 +2593,6 @@ Individual Control Panel - - clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - clickAndWait - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - - clickAndWait - link=Address - - - - assertTitle - Address - - - - verifyElementPresent - link=1234 Northern African Nation Morocco City Morocco - - - - clickAndWait - link=1234 Northern African Nation Morocco City Morocco - - - - assertTitle - 1234 Northern African Nation Morocco City Morocco - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - clickAndWait //input[@value='Edit This Individual'] @@ -1759,7 +2604,7 @@ - clickAndWait + click name=_delete @@ -1788,6 +2633,7 @@ Index of Contents + clickAndWait link=Building @@ -1855,12 +2701,152 @@ clickAndWait - link=Room + link=Building assertTitle - Room + Building + + + + clickAndWait + link=Primate Memorial Building + + + + assertTitle + Primate Memorial Building + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=County + + + + assertTitle + County + + + + clickAndWait + link=Mozamia + + + + assertTitle + Mozamia + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Facility + + + + assertTitle + Facility @@ -1885,77 +2871,7 @@ clickAndWait - //input[@value="Edit This Individual"] - - - - assertTitle - Individual Editing Form - - - - clickAndWait - _delete - - - - assertConfirmation - Are you SURE you want to delete this individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - clickAndWait - link=Campus - - - - assertTitle - Campus - - - - clickAndWait - link=Primate Research Laboratory - - - - assertTitle - Primate Research Laboratory - - - - assertTitle - Primate Research Laboratory - - - - clickAndWait - link=Edit this individual - - - - assertTitle - Individual Control Panel - - - - clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -1965,7 +2881,7 @@ click - _delete + name=_delete @@ -2025,7 +2941,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -2035,7 +2951,77 @@ click - _delete + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 5000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Facility + + + + assertTitle + Facility + + + + clickAndWait + link=State Fair Park + + + + assertTitle + State Fair Park + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete @@ -2155,21 +3141,6 @@ research - - verifyTextNotPresent - Building - - - - verifyTextNotPresent - Campus - - - - verifyTextNotPresent - Room - - verifyTextPresent locations diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html index 0fb93605..bbac0b1f 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html @@ -492,47 +492,7 @@ click - link=Agreement (3) - - - - verifyTextPresent - Agreement - - - - verifyElementPresent - link=Primate Elderly Care - - - - verifyTextPresent - Grant - - - - verifyElementPresent - link=Primate Habitat Research Grant - - - - verifyTextPresent - Grant - - - - verifyElementPresent - link=Primate Survival Planning Grant - - - - verifyTextPresent - Grant - - - - click - link=Service (1) + link=Project (1) @@ -541,8 +501,38 @@ - verifyTextPresent - Service + verifyElementPresent + link=Human and Ape Brain Comparison + + + + click + link=Research Project (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Human and Ape Brain Comparison + + + + click + link=Service (2) + + + + pause + 5000 + + + + verifyElementPresent + link=Gorilla Moving Company @@ -550,6 +540,21 @@ link=Primate Heart Health + + click + link=Transport Service (1) + + + + pause + 5000 + + + + verifyElementPresent + link=Gorilla Moving Company + + clickAndWait @@ -563,7 +568,7 @@ click - link=Course (1) + link=Course (2) @@ -576,6 +581,11 @@ Course + + verifyElementPresent + link=Introduction to Primates + + verifyElementPresent link=Introduction to Primate Health @@ -630,22 +640,7 @@ click - link=Address (1) - - - - pause - 5000 - - - - verifyElementPresent - link=1234 Northern African Nation Morocco City Morocco - - - - click - link=Building (1) + link=Building (2) @@ -663,9 +658,14 @@ link=Jane Memorial Building + + verifyElementPresent + link=Primate Memorial Building + + click - link=Campus (1) + link=County (1) @@ -675,12 +675,12 @@ verifyElementPresent - link=Primate Research Laboratory + link=Mozamia click - link=Facility (3) + link=Facility (5) @@ -693,19 +693,14 @@ link=Jane Memorial Building - - verifyTextPresent - Building - - verifyElementPresent link=Lab Admin Office - verifyTextPresent - Room + verifyElementPresent + link=Primate Memorial Building @@ -713,6 +708,11 @@ link=Primate Research Lab Room 123 + + verifyElementPresent + link=State Fair Park + + click link=Room (1) @@ -723,11 +723,6 @@ 5000 - - verifyTextPresent - Room - - verifyElementPresent link=Lab Admin Office @@ -756,82 +751,72 @@ clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img + xpath=(//img[@alt='delete this page'])[2] assertTitle - Remove Menu Item + Pages - clickAndWait - removeMenuItem + click + xpath=(//img[@alt='delete this page'])[4] + + + + assertConfirmation + Are you sure you wish to delete this page:  Courses? + + + + waitForPageToLoad + 5000 assertTitle - Default Menu + Pages - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img + click + xpath=(//img[@alt='delete this page'])[6] + + + + assertConfirmation + Are you sure you wish to delete this page:  Equipment? + + + + waitForPageToLoad + 5000 assertTitle - Remove Menu Item + Pages - clickAndWait - removeMenuItem + click + xpath=(//img[@alt='delete this page'])[7] + + + + assertConfirmation + Are you sure you wish to delete this page:  Locations? + + + + waitForPageToLoad + 5000 assertTitle - Default Menu - - - - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img - - - - assertTitle - Remove Menu Item - - - - clickAndWait - removeMenuItem - - - - assertTitle - Default Menu - - - - clickAndWait - //div[@id='wrapper-content']/ul/li[6]/span/a[2]/img - - - - assertTitle - Remove Menu Item - - - - clickAndWait - removeMenuItem - - - - assertTitle - Default Menu + Pages diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index d4e556fa..6747d26d 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -11,21 +11,13 @@ VerifyAllThingsSearchable - - comment - Verify all roles are searchable - - + deleteAllVisibleCookies - - comment - No need to log in - - + open /vivo/ @@ -36,11 +28,7 @@ VIVO - - comment - Verify search results for VIVO - - + type querytext @@ -56,11 +44,6 @@ primates - VIVO Search Results - - verifyElementPresent - link=people - - verifyElementPresent link=activities @@ -97,23 +80,48 @@ - verifyTextPresent - Primates-r-us Organization + verifyElementPresent + link=Primates in the Wild verifyTextPresent - Primate Feeder Equipment + Primates in the Wild Performance + + + + verifyElementPresent + link=Introduction to Primates verifyTextPresent - Primate Health Concept + Introduction to Primates Course + + + + verifyElementPresent + link=Primates-r-us verifyTextPresent - Primate Diet Concept + Primates-r-us Company + + + + verifyElementPresent + link=Primate Happenings + + + + verifyTextPresent + Primate Happenings Blog Posting + + + + verifyElementPresent + link=Primate Info @@ -121,64 +129,119 @@ Primate Info Database + + verifyElementPresent + link=Primate Health + + + + verifyTextPresent + Primate Health Concept + + + + verifyElementPresent + link=Primate Quad + + + + verifyTextPresent + Primate Quad Geographic Location + + + + verifyElementPresent + link=Primate Feeder + + + + verifyTextPresent + Primate Feeder Equipment + + + + verifyElementPresent + link=Primate Diet + + + + verifyTextPresent + Primate Diet Concept + + + + verifyElementPresent + link=Primate Health Talks + + + + verifyTextPresent + Primate Health Talks Seminar Series + + + + verifyElementPresent + link=Primate College of America + + verifyTextPresent Primate College of America College + + verifyElementPresent + link=Primate Research Laboratory + + verifyTextPresent Primate Research Laboratory Laboratory + + verifyElementPresent + link=Portable Primate Habitat + + verifyTextPresent Portable Primate Habitat Equipment + + verifyElementPresent + link=Primate Elderly Care + + verifyTextPresent Primate Elderly Care Grant + + verifyElementPresent + link=Introduction to Primate Health + + verifyTextPresent Introduction to Primate Health Course - verifyTextPresent - Primate Health Check Event + verifyElementPresent + link=Primate University of America verifyTextPresent - Primate Colleges of the World Consortium + Primate University of America University - verifyTextPresent - Primate Health Conference Conference - - - - verifyTextPresent - Best Primate College - - - - verifyTextPresent - Primate History Library Library - - - - verifyTextPresent - Primate Research Laboratory Campus - - - - verifyTextPresent - Primate Student of the Year Award or Honor + verifyElementPresent + link=Primate Health and Fitness @@ -186,39 +249,84 @@ Primate Health and Fitness Invited Talk + + verifyElementPresent + link=Primate Colleges of the World + + + + verifyTextPresent + Primate Colleges of the World Consortium + + + + verifyElementPresent + link=Primate Health Check + + + + verifyTextPresent + Primate Health Check Event + + + + verifyElementPresent + link=Primate Heart Health + + verifyTextPresent Primate Heart Health Service + + verifyElementPresent + link=Primate Health Conference + + + + verifyTextPresent + Primate Health Conference Conference + + + + verifyElementPresent + link=Primate Habitat Research Grant + + verifyTextPresent Primate Habitat Research Grant Grant - verifyTextPresent - Primate Research Lab Room 123 Facility + verifyElementPresent + link=Best Primate College verifyTextPresent - Primate Survival Planning Grant Grant + Best Primate College Award or Honor + + + + verifyElementPresent + link=New Primate Students verifyTextPresent - Animal Health Concept + New Primate Students Workshop + + + + verifyElementPresent + link=Primate Memorial Building verifyTextPresent - Ape Health Concept - - - - verifyTextPresent - Elderly Care Concept + Primate Memorial Building Building @@ -232,13 +340,88 @@ - verifyTextPresent - Person, Polly Person + verifyElementPresent + link=Primate History Library verifyTextPresent - Jane Memorial Building Building + Primate History Library Library + + + + verifyElementPresent + link=Primate Student of the Year + + + + verifyTextPresent + Primate Student of the Year Award or Honor + + + + verifyElementPresent + link=Primate Survival Planning Grant + + + + verifyTextPresent + Primate Survival Planning Grant Grant + + + + verifyElementPresent + link=Primate College of New York + + + + verifyTextPresent + Primate College of New York College + + + + verifyElementPresent + link=Primate Research Lab Room 123 + + + + verifyTextPresent + Primate Research Lab Room 123 Facility + + + + verifyElementPresent + link=Animal Health + + + + verifyTextPresent + Animal Health Concept + + + + verifyElementPresent + link=Ape Health + + + + verifyTextPresent + Ape Health Concept + + + + verifyElementPresent + link=Elderly Care + + + + verifyTextPresent + Elderly Care Concept + + + + verifyElementPresent + link=exact:http://primatehealthintro.cornell.edu @@ -246,29 +429,59 @@ http://primatehealthintro.cornell.edu Webpage + + verifyElementPresent + link=Human and Ape Brain Comparison + + + + verifyTextPresent + Human and Ape Brain Comparison Human Study + + + + verifyElementPresent + link=Gorilla Moving Company + + + + verifyTextPresent + Gorilla Moving Company Transport Service + + + + verifyElementPresent + link=PHC Proceedings + + verifyTextPresent PHC Proceedings Proceedings - verifyTextPresent - 1234 Northern African Nation Morocco City Morocco Address + verifyElementPresent + link=USA222333444555 verifyTextPresent - northern Africa Transnational Region + USA222333444555 Patent + + + + verifyElementPresent + link=Africa verifyTextPresent - Africa Continent + Africa Continent Transnational Region - verifyTextPresent - Liberia Country + verifyElementPresent + link=Kenya @@ -276,11 +489,6 @@ Kenya Country - - verifyTextPresent - Congo Country - - clickAndWait link=Home diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html index b2cafe9b..6c0f91c0 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html @@ -520,7 +520,7 @@ type - name + id=label USABC123456789 @@ -635,7 +635,7 @@ type - id=name + id=label Primate Reactions @@ -883,7 +883,7 @@ type - id=name + id=label Primate Feeding @@ -981,6 +981,11 @@ Edit + + select + id=typeOfNew + label=Protocol (obo) + clickAndWait id=offerCreate @@ -993,7 +998,7 @@ type - id=name + id=label JF Feeding @@ -1011,6 +1016,11 @@ css=a.add-ERO_0000033 > img.add-individual + + select + id=typeOfNew + label=Protocol (obo) + clickAndWait id=offerCreate @@ -1023,7 +1033,7 @@ type - id=name + id=label JF Feeding Revised @@ -1031,6 +1041,11 @@ id=submit + + assertTitle + Faculty, Jane + + click @@ -1139,12 +1154,12 @@ type - name + id=label Primate Expert Association clickAndWait - submit + id=submit @@ -1995,11 +2010,21 @@ link=Monkey Trainer of the Year + + verifyTextPresent + faculty mentoring relationship + + verifyElementPresent link=Adams, Amy + + verifyTextPresent + Adams, Amy, 2013 - + + verifyTextPresent Ms. Jane Elizabeth Faculty, III diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html index 6ce11766..3b74b632 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo2.html @@ -681,7 +681,7 @@ verifyTextPresent - Adams, John  Faculty Member Emeritus + Adams, John   Faculty Member Emeritus @@ -726,7 +726,7 @@ verifyElementPresent - css=#translatorOf-IAO_0000030-List > li > a[title="name"] + css=#translatorOf-Document-List > li > a[title="name"] @@ -829,6 +829,11 @@ link=Chimp Lover for Life + + verifyTextPresent + faculty mentoring relationship + + verifyElementPresent link=Adams, Amy diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 83f02d8f..4adf2a38 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -162,6 +162,11 @@ 10000 + + refresh + + + verifyElementPresent link=Faculty, Jane diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html index a323f140..37ad3880 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html @@ -151,21 +151,6 @@ 10000 - - click - link=Remove - - - - assertConfirmation - Are you sure you want to remove this term? - - - - waitForPageToLoad - 10000 - - clickAndWait link=Return to Profile Page @@ -258,7 +243,67 @@ clickAndWait - css=a.add-webpage > img.add-individual + css=img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-geographicFocus > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-geographicFocus > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + //img[@alt='manage'] @@ -278,7 +323,7 @@ waitForPageToLoad - 20000 + 10000 @@ -293,7 +338,7 @@ waitForPageToLoad - 20000 + 10000 @@ -306,7 +351,13 @@ Faculty, Jane + + + click + css=li.nonSelectedGroupTab.clickable + + clickAndWait css=a.delete-hasCollaborator > img.delete-individual @@ -327,7 +378,138 @@ Faculty, Jane + + clickAndWait + css=a.delete-hasCollaborator > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-RO_0000053 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + + click + css=li.nonSelectedGroupTab.clickable + + + + clickAndWait + css=a.delete-RO_0000053 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-featuredIn > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-assigneeFor > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-translatorOf > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + click + //div[@id='wrapper-content']/ul/li[6] + + clickAndWait css=a.delete-researchOverview > img.delete-individual @@ -350,7 +532,7 @@ clickAndWait - css=a.delete-geographicFocus > img.delete-individual + css=a.delete-freetextKeyword > img.delete-individual @@ -370,27 +552,7 @@ clickAndWait - css=a.delete-geographicFocus > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-geographicFocus > img.delete-individual + css=a.delete-freetextKeyword > img.delete-individual @@ -409,6 +571,11 @@ + + click + //div[@id='wrapper-content']/ul/li[8] + + clickAndWait css=a.delete-teachingOverview > img.delete-individual @@ -431,27 +598,7 @@ clickAndWait - css=a.delete-advisorIn > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-advisorIn > img.delete-individual + css=a.delete-RO_0000053 > img.delete-individual @@ -470,6 +617,11 @@ + + click + //div[@id='wrapper-content']/ul/li[10] + + clickAndWait css=a.delete-outreachOverview > img.delete-individual @@ -490,7 +642,132 @@ Faculty, Jane + + clickAndWait + css=a.delete-RO_0000053 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-ERO_0000037 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-RO_0000053 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-ERO_0000397 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=a.delete-ERO_0000033 > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + click + //div[@id='wrapper-content']/ul/li[12] + + + + clickAndWait + css=a.delete-relatedBy > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + clickAndWait css=a.delete-eligibleFor > img.delete-individual @@ -513,7 +790,7 @@ clickAndWait - css=a.delete-hasCredential > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -533,7 +810,7 @@ clickAndWait - css=a.delete-hasCredential > img.delete-individual + css=a.delete-relatedBy > img.delete-individual @@ -553,87 +830,7 @@ clickAndWait - css=a.delete-awardOrHonor > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-awardOrHonor > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-adviseeIn > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-adviseeIn > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-adviseeIn > img.delete-individual + css=a.delete-RO_0000053 > img.delete-individual @@ -652,9 +849,14 @@ + + click + //div[@id='wrapper-content']/ul/li[14] + + clickAndWait - css=a.delete-firstName > img.delete-individual + css=li > a.delete-ARG_2000028 > img.delete-individual @@ -674,7 +876,7 @@ clickAndWait - css=a.delete-middleName > img.delete-individual + css=li > a.delete-ARG_2000028 > img.delete-individual @@ -694,7 +896,7 @@ clickAndWait - css=a.delete-lastName > img.delete-individual + css=li > a.delete-ARG_2000028 > img.delete-individual @@ -714,7 +916,7 @@ clickAndWait - css=a.delete-prefixName > img.delete-individual + css=li > a.delete-ARG_2000028 > img.delete-individual @@ -734,87 +936,7 @@ clickAndWait - css=a.delete-suffixName > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-faxNumber > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-faxNumber > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-mailingAddress > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-mailingAddress > img.delete-individual + css=li > a.delete-ARG_2000028 > img.delete-individual @@ -833,6 +955,11 @@ + + click + //div[@id='wrapper-content']/ul/li[16] + + clickAndWait css=a.delete-orcidId > img.delete-individual @@ -915,7 +1042,7 @@ clickAndWait - css=a.delete-researcherId > img.delete-individual + css=a.delete-researcherId @@ -993,10 +1120,9 @@ Faculty, Jane - clickAndWait - css=a.delete-assigneeFor > img.delete-individual + css=a.delete-ARG_0000197 > img.delete-individual @@ -1016,7 +1142,7 @@ clickAndWait - css=a.delete-assigneeFor > img.delete-individual + css=a.delete-ARG_0000197 > img.delete-individual @@ -1034,356 +1160,157 @@ Faculty, Jane - - clickAndWait - css=a.delete-freetextKeyword > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - clickAndWait - css=a.delete-freetextKeyword > img.delete-individual - - - - assertTitle - Edit - - - - clickAndWait - id=submit - - - - assertTitle - Faculty, Jane - - - - - verifyTextNotPresent - I am named after Jane in the Tarzan stories. Yes, my last name really is faculty. - - - - verifyElementNotPresent - link=African Primates - - - - verifyElementNotPresent - link=Primatia - - - - verifyElementNotPresent - link=Primatia Africana - - - - verifyElementNotPresent - link=jane@gmail.com - - - - verifyElementNotPresent - link=mejane@primates-r-us.com - - - - verifyTextNotPresent - 607-266-6666 - - - - verifyTextNotPresent - 607-288-8888 - - - - verifyElementNotPresent - link=CIT Homepage - - - - verifyElementNotPresent - link=CUL Homepage - - - - verifyElementNotPresent - link=Librarian, Lily - - - - verifyTextNotPresent - Librarian, Lily Assistant Librarian - - - - verifyTextNotPresent - I study apes, of course. - - - - verifyElementNotPresent - link=Africa - - - - verifyElementNotPresent - link=Mozamia - - - - verifyElementNotPresent - link=southern Africa - - - - verifyTextNotPresent - I teach apes how to communicate with humans. - - - - verifyTextNotPresent - postdoc or fellow advising relationship - - - - verifyElementNotPresent - link=Smith, Joe - - - - verifyElementNotPresent - link=SPCA, The - - - - verifyTextNotPresent - I travel the world teaching apes how to communicate with humans. - - - - verifyElementNotPresent - link=Primate Expert Association - - - - verifyElementNotPresent - link=Primate Experts - - - - verifyElementNotPresent - link=Licensed Primate Expert - - - - verifyElementNotPresent - link=Licensed Primate Instructor - - - - verifyElementNotPresent - link=Chimp Lover for Life - - - - verifyElementNotPresent - link=Monkey Trainer of the Year - - - - verifyElementNotPresent - link=Ape Trainer of the Decade - - - - verifyTextNotPresent - Monkey Trainer of the Year, conferred by Ape Trainer of the Decade - - - - verifyElementNotPresent - link=Humane Society of Africa - - - - verifyElementNotPresent - link=Primates Foundation of America - - - - verifyElementNotPresent - link=Primates Unite - - - - verifyTextNotPresent - Mrs. - - - - verifyTextNotPresent - Jr. - - - - verifyTextNotPresent - 607-277-7777 - - - - verifyTextNotPresent - 607-299-9999 - - - - verifyElementNotPresent - link=Jungle 1234 - - - - verifyTextNotPresent - Congo City - - - - verifyTextNotPresent - 1234567890 - - - - verifyTextNotPresent - Democratic Republic of Congo - - - - verifyElementNotPresent - link=CIT - - - - verifyTextNotPresent - Cornell University - - - - verifyTextNotPresent - Ithaca, New York  14853 - - - - verifyTextNotPresent - United States of America - - - - verifyTextNotPresent - ABC121212 - - - - verifyTextNotPresent - ABC123987 - - - - verifyElementNotPresent - link=USA1234567890 - - - - verifyElementNotPresent - link=USABC123456789 - - - - verifyTextNotPresent - African Apes - - - - verifyTextNotPresent - African Primates - - - - verifyTextNotPresent - 11111 - - - - verifyTextNotPresent - 454545 - - - - verifyTextNotPresent - 222222 - - - - verifyTextNotPresent - 67676767 - - - - verifyTextNotPresent - 987654321 - - - - verifyTextNotPresent - 3333333 - - - + clickAndWait link=Index + + assertTitle + Index of Contents + + verifyTextPresent - Faculty Member + people + + verifyTextPresent + Faculty Member (1) + + + + verifyTextPresent + Faculty Member Emeritus (1) + + + + verifyTextPresent + Librarian (1) + + + + verifyTextPresent + Person (5) + + + + verifyTextPresent + activities + + + + verifyTextPresent + Service (1) + + + + verifyTextPresent + Training Service (1) + + + + verifyTextPresent + events + + + + verifyTextPresent + Event (2) + + + + verifyTextPresent + Exhibit (1) + + + + verifyTextPresent + Performance (1) + + + + verifyTextPresent + organizations + + + + verifyTextPresent + Organization (1) + + + + verifyTextPresent + research + + + + verifyTextPresent + Award or Honor (3) + + + + verifyTextPresent + Case Study (1) + + + + verifyTextPresent + Concept (12) + + + + verifyTextPresent + Conference Poster (1) + + + + verifyTextPresent + Credential (4) + + + + verifyTextPresent + License (3) + + + + verifyTextPresent + Newsletter (1) + + + + verifyTextPresent + Patent (2) + + + + verifyTextPresent + Protocol (2) + + + + clickAndWait - link=Certificate + link=Person assertTitle - Certificate + Person clickAndWait - link=Primate Expert Association + link=Adams, John assertTitle - Primate Expert Association + Adams, John @@ -1398,7 +1325,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -1408,7 +1335,7 @@ click - _delete + name=_delete @@ -1418,7 +1345,7 @@ waitForPageToLoad - 5000 + 10000 @@ -1438,22 +1365,22 @@ clickAndWait - link=Patent + link=Person assertTitle - Patent + Person clickAndWait - link=USA1234567890 + link=Adams, Amy assertTitle - USA1234567890 + Adams, Amy @@ -1468,7 +1395,7 @@ clickAndWait - //input[@value="Edit This Individual"] + //input[@value='Edit This Individual'] @@ -1478,7 +1405,7 @@ click - _delete + name=_delete @@ -1488,287 +1415,7 @@ waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - - - clickAndWait - link=Patent - - - - assertTitle - Patent - - - - clickAndWait - link=USABC123456789 - - - - assertTitle - USABC123456789 - - - - 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 individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - - - clickAndWait - link=Concept - - - - assertTitle - Concept - - - - clickAndWait - link=African Primates - - - - assertTitle - African Primates - - - - 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 individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - - - clickAndWait - link=Concept - - - - assertTitle - Concept - - - - clickAndWait - link=Primatia - - - - assertTitle - Primatia - - - - 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 individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=Index - - - - assertTitle - Index of Contents - - - - clickAndWait - link=Concept - - - - assertTitle - Concept - - - - clickAndWait - link=Primatia Africana - - - - assertTitle - Primatia Africana - - - - 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 individual? If in doubt, CANCEL. - - - - waitForPageToLoad - 5000 + 10000 @@ -1838,7 +1485,7 @@ waitForPageToLoad - 5000 + 10000 @@ -1856,24 +1503,25 @@ Index of Contents + clickAndWait - link=Person + link=Service assertTitle - Person + Service clickAndWait - link=SPCA, The + link=Primate Feeding assertTitle - SPCA, The + Primate Feeding @@ -1908,7 +1556,7 @@ waitForPageToLoad - 5000 + 10000 @@ -1926,29 +1574,25 @@ Index of Contents + + + clickAndWait + link=Event + + assertTitle - Index of Contents + Event clickAndWait - link=Issued Credential + link=Apes on Parade assertTitle - Issued Credential - - - - clickAndWait - link=Licensed Primate Expert - - - - assertTitle - Licensed Primate Expert + Apes on Parade @@ -1983,7 +1627,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2003,22 +1647,22 @@ clickAndWait - link=Issued Credential + link=Event assertTitle - Issued Credential + Event clickAndWait - link=Licensed Primate Instructor + link=Primates of East Africa assertTitle - Licensed Primate Instructor + Primates of East Africa @@ -2053,7 +1697,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2066,6 +1710,7 @@ link=Index + assertTitle Index of Contents @@ -2081,6 +1726,82 @@ Organization + + clickAndWait + link=Professional Ape Trainer Association + + + + assertTitle + Professional Ape Trainer Association + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + + selectWindow + null + + + + clickAndWait + link=Award or Honor + + + + assertTitle + Award or Honor + + clickAndWait link=Ape Trainer of the Decade @@ -2123,7 +1844,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2193,7 +1914,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2263,7 +1984,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2283,22 +2004,22 @@ clickAndWait - link=Concept + link=Case Study assertTitle - Concept + Case Study clickAndWait - link=Primate Foundation of Africa + link=Primate Reactions assertTitle - Primate Foundation of Africa + Primate Reactions @@ -2333,7 +2054,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2353,22 +2074,22 @@ clickAndWait - link=Concept + link=Conference Poster assertTitle - Concept + Conference Poster clickAndWait - link=Primates-R-Us Fellowship + link=Variety of Apes in Africa assertTitle - Primates-R-Us Fellowship + Variety of Apes in Africa @@ -2403,7 +2124,217 @@ waitForPageToLoad - 5000 + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Credential + + + + assertTitle + Credential + + + + clickAndWait + link=Licensed Primate Expert + + + + assertTitle + Licensed Primate Expert + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Credential + + + + assertTitle + Credential + + + + clickAndWait + link=Licensed Primate Instructor + + + + assertTitle + Licensed Primate Instructor + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Credential + + + + assertTitle + Credential + + + + clickAndWait + link=Primate Expert Association + + + + assertTitle + Primate Expert Association + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 @@ -2473,7 +2404,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2493,22 +2424,22 @@ clickAndWait - link=Address + link=Newsletter assertTitle - Address + Newsletter clickAndWait - link=CIT Ithaca New York + link=Ape Week assertTitle - CIT Ithaca New York + Ape Week @@ -2543,7 +2474,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2563,22 +2494,22 @@ clickAndWait - link=Address + link=Patent assertTitle - Address + Patent clickAndWait - link=Jungle 1234 Congo City Democratic Republic of Congo + link=USA1234567890 assertTitle - Jungle 1234 Congo City Democratic Republic of Congo + USA1234567890 @@ -2613,7 +2544,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2631,45 +2562,24 @@ Index of Contents - clickAndWait - link=Index + link=Patent assertTitle - Index of Contents + Patent clickAndWait - link=Country + link=USABC123456789 assertTitle - Country - - - - clickAndWait - link=5 - - - - assertTitle - Country - - - - clickAndWait - link=Mozamia - - - - assertTitle - Mozamia + USABC123456789 @@ -2704,7 +2614,7 @@ waitForPageToLoad - 5000 + 10000 @@ -2712,6 +2622,557 @@ VIVO Site Administration + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + clickAndWait + link=African Primates + + + + assertTitle + African Primates + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + clickAndWait + link=Primate Feeding + + + + assertTitle + Primate Feeding + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + clickAndWait + link=Primates-R-Us Fellowship + + + + assertTitle + Primates-R-Us Fellowship + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + clickAndWait + link=Primatia + + + + assertTitle + Primatia + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Concept + + + + assertTitle + Concept + + + + clickAndWait + link=Primatia Africana + + + + assertTitle + Primatia Africana + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Protocol + + + + assertTitle + Protocol + + + + clickAndWait + link=JF Feeding + + + + assertTitle + JF Feeding + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + clickAndWait + link=Protocol + + + + assertTitle + Protocol + + + + clickAndWait + link=JF Feeding Revised + + + + assertTitle + JF Feeding Revised + + + + clickAndWait + link=Edit this individual + + + + assertTitle + Individual Control Panel + + + + clickAndWait + //input[@value='Edit This Individual'] + + + + assertTitle + Individual Editing Form + + + + click + name=_delete + + + + assertConfirmation + Are you SURE you want to delete this individual? If in doubt, CANCEL. + + + + waitForPageToLoad + 10000 + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Index + + + + assertTitle + Index of Contents + + + + + verifyTextPresent + people + + + + verifyTextPresent + Faculty Member (1) + + + + verifyTextNotPresent + Faculty Member Emeritus (1) + + + + verifyTextPresent + Librarian (1) + + + + verifyTextPresent + Person (2) + + + + verifyTextNotPresent + activities + + + + verifyTextNotPresent + events + + + + verifyTextNotPresent + organizations + + + + verifyTextNotPresent + research + + + + verifyTextPresent + locations + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index d992d3b3..98d9d6a8 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -111,21 +111,6 @@ Edit - - click - id=showAddFormButton - - - - assertConfirmation - Are you sure you want to remove this term? - - - - assertTitle - Edit - - clickAndWait link=Create your own concept @@ -283,8 +268,13 @@ type - id=name - Adams, John + id=firstName + John + + + type + id=lastName + Adams clickAndWait @@ -353,7 +343,7 @@ type - name + id=label Mozamia @@ -452,8 +442,38 @@ - click - id=changeSelection + clickAndWait + link=Cancel + + + + assertTitle + Faculty, Jane + + + + clickAndWait + css=#relatedBy-AwardReceipt-List > li > a.delete-relatedBy > img.delete-individual + + + + assertTitle + Edit + + + + clickAndWait + id=submit + + + + assertTitle + Faculty, Jane + + + + clickAndWait + xpath=(//img[@alt='add'])[36] @@ -784,7 +804,7 @@ type - name + id=label Primate Experts @@ -939,7 +959,7 @@ type - name + id=label USA1234567890 @@ -1035,7 +1055,7 @@ verifyTextPresent - Adams, John  Faculty Member Emeritus + Adams, John   Faculty Member Emeritus @@ -1165,7 +1185,7 @@ verifyTextPresent - Adams, Amy, 2013 - + faculty mentoring relationship @@ -1173,6 +1193,11 @@ link=Adams, Amy + + verifyTextPresent + Adams, Amy, 2013 - + + verifyTextPresent Mrs. Jane E. Faculty, Jr. diff --git a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html index d6e06752..d30786ab 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/PublicFacultyInfo.html @@ -173,7 +173,7 @@ verifyTextPresent - Adams, John  Faculty Member Emeritus + Adams, John   Faculty Member Emeritus @@ -218,7 +218,7 @@ verifyElementPresent - css=#translatorOf-IAO_0000030-List > li > a[title="name"] + css=#translatorOf-Document-List > li > a[title="name"] @@ -321,6 +321,11 @@ link=Chimp Lover for Life + + verifyTextPresent + faculty mentoring relationship + + verifyElementPresent link=Adams, Amy diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html index 7fac3e5a..32685cdc 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html @@ -151,6 +151,11 @@ link=people + + verifyElementPresent + link=activities + + verifyElementPresent link=events @@ -181,6 +186,16 @@ Primate Feeding Training Service + + verifyElementPresent + link=Primate Feeding + + + + verifyTextPresent + Primate Feeding Concept + + verifyElementPresent link=Primate Reactions @@ -400,17 +415,143 @@ Faculty, Jane Assistant Professor - + type querytext - human + feeding clickAndWait //input[@value='Search'] + + verifyElementPresent + link=people + + + + verifyElementPresent + link=activities + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=JF Feeding + + + + verifyTextPresent + JF Feeding Protocol + + + + verifyElementPresent + link=Primate Feeding + + + + verifyTextPresent + Primate Feeding Training Service + + + + verifyElementPresent + xpath=(//a[contains(text(),'Primate Feeding')])[2] + + + + verifyTextPresent + Primate Feeding Concept + + + + verifyElementPresent + link=JF Feeding Revised + + + + verifyTextPresent + JF Feeding Revised Protocol + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + + + + type + querytext + adams + + + clickAndWait + //input[@value='Search'] + + + + verifyElementPresent + link=people + + + + verifyElementPresent + link=research + + + + verifyElementPresent + link=Adams, John + + + + verifyTextPresent + Adams, John Faculty Member Emeritus + + + + verifyElementPresent + link=Adams, Amy + + + + verifyTextPresent + Adams, Amy Person + + + + verifyElementPresent + link=Primate Feeding + + + + verifyTextPresent + Primate Feeding Concept + + + + verifyElementPresent + link=Faculty, Jane + + + + verifyTextPresent + Faculty, Jane Assistant Professor + + open diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html index 99be0739..56cea1ff 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteDataPropArchDetails.html @@ -124,7 +124,7 @@ waitForPageToLoad - 10000 + 20000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html index 7505509a..b9a4e61e 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeleteObjPropYearFounded.html @@ -120,7 +120,7 @@ waitForPageToLoad - 10000 + 20000 diff --git a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html index cbb9ec91..1587ceed 100644 --- a/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html +++ b/utilities/acceptance-tests/suites/CreateProperties/DeletePropertyGroupPlace.html @@ -110,7 +110,7 @@ waitForPageToLoad - 10000 + 20000 diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 5aecf35b..836c9d5d 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html +++ b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html @@ -303,12 +303,12 @@ verifyTextPresent - Version rel-1.6-rc4 + Version rel-1.6-rc5 verifyElementPresent - link=rel-1.6-rc4 + link=rel-1.6-rc5 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6-rc4 + Version rel-1.6-rc5 @@ -644,7 +644,7 @@ verifyElementPresent - link=rel-1.6-rc4 + link=rel-1.6-rc5 diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index 0c530cda..8443e018 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -81,6 +81,11 @@ + + verifyTextPresent + 8 accounts + + verifyElementPresent link=EddieEditor@cornell.edu @@ -107,6 +112,16 @@ name=deleteAccount + + click + xpath=(//input[@name='deleteAccount'])[2] + + + + click + xpath=(//input[@name='deleteAccount'])[3] + + clickAndWait name=delete-account @@ -117,56 +132,6 @@ VIVO - - click - name=deleteAccount - - - - click - name=delete-account - - - - assertConfirmation - Are you sure you want to delete this account? - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO - - - - click - name=deleteAccount - - - - click - name=delete-account - - - - assertConfirmation - Are you sure you want to delete this account? - - - - waitForPageToLoad - 5000 - - - - assertTitle - VIVO - - verifyTextPresent 5 accounts diff --git a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html index dfd843f0..b68b8afe 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/ValidateAdminProxy2.html @@ -238,7 +238,7 @@ type id=loginPassword - Password + myPassword clickAndWait diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html index 8ca76151..1c7b1f4c 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html +++ b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId.html @@ -131,57 +131,6 @@ JaneFaculty@cornell.edu - - - clickAndWait - link=Site Admin - - - - assertTitle - VIVO Site Administration - - - - clickAndWait - link=User accounts - - - - assertTitle - VIVO - - - - clickAndWait - link=JaneFaculty@cornell.edu - - - - assertTitle - VIVO - - - - type - id=associateProfileName - Facul - - - click - id=ui-active-menuitem - - - - clickAndWait - id=submitMyAccount - - - - assertTitle - VIVO - - clickAndWait diff --git a/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html new file mode 100644 index 00000000..2ae2e1cc --- /dev/null +++ b/utilities/acceptance-tests/suites/SelfEditing/AddSelfEditorId2.html @@ -0,0 +1,208 @@ + + + + + + +AddFacultyInfo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AddFacultyInfo
    deleteAllVisibleCookies
    setTimeout500000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeloginNametestAdmin@cornell.edu
    typeloginPasswordPassword
    clickAndWaitloginForm
    clickAndWaitlink=Index
    verifyTextPresentFaculty Member
    clickAndWaitlink=Faculty Member
    assertTitleFaculty Member
    clickAndWaitlink=Faculty, Jane
    assertTitleFaculty, Jane
    clickAndWaitcss=a.add-researcherId > img.add-individual
    assertTitleEdit
    waitForElementPresenttinymce
    typetinymceJaneFaculty@cornell.edu
    clickAndWaitid=submit
    assertTitleFaculty, Jane
    click//div[@id='wrapper-content']/ul/li[18]
    verifyTextPresentJaneFaculty@cornell.edu
    selectWindownull
    clickAndWaitlink=Site Admin
    assertTitleVIVO Site Administration
    clickAndWaitlink=User accounts
    assertTitleVIVO
    clickAndWaitlink=JaneFaculty@cornell.edu
    assertTitleVIVO
    typeid=associateProfileNameFacu
    clickid=ui-active-menuitem
    clickAndWaitid=submitMyAccount
    assertTitleVIVO
    clickAndWaitlink=Home
    clickAndWaitlink=Log out
    assertTitleVIVO
    + + diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html index 03314d62..d401eb8b 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html @@ -118,7 +118,12 @@ type id=associateProfileName - Faculy, Jane + Facul + + + click + id=ui-active-menuitem + click diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html new file mode 100644 index 00000000..24eb152e --- /dev/null +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser2.html @@ -0,0 +1,192 @@ + + + + + + +CreateNewNobodyUser + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    CreateNewNobodyUser
    deleteAllVisibleCookies
    setTimeout10000000
    open/vivo/
    assertTitleVIVO
    clickAndWaitlink=Log in
    assertTitleLog in to VIVO
    typeloginNametestAdmin@cornell.edu
    typeloginPasswordPassword
    clickAndWaitloginForm
    clickAndWaitlink=Site Admin
    clickAndWaitlink=User accounts
    assertTitleVIVO
    verifyTextPresentUser accounts
    clickAndWait//input[@value='Add new account']
    assertTitleVIVO
    verifyTextPresentUser accounts > Add new account
    typeid=email-addressJaneFaculty@cornell.edu
    typeid=first-nameJane
    typeid=last-nameFaculty
    typeid=externalAuthIdJaneFaculty@cornell.edu
    clickxpath=(//input[@name='role'])[4]
    typeid=initial-passwordmyPassword
    typeid=confirm-passwordmyPassword
    clickAndWaitname=submitAdd
    assertTitleVIVO
    verifyTextPresentA new account for Jane Faculty was successfully created.
    verifyElementPresentlink=JaneFaculty@cornell.edu
    verifyTextPresentJane
    verifyTextPresentFaculty
    verifyTextPresentACTIVE
    verifyTextPresentSelf Editor
    verifyTextPresent0
    clickAndWaitlink=Log out
    assertTitleVIVO
    + + diff --git a/utilities/acceptance-tests/suites/SelfEditing/Suite.html b/utilities/acceptance-tests/suites/SelfEditing/Suite.html index 46359938..651b57fc 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/Suite.html +++ b/utilities/acceptance-tests/suites/SelfEditing/Suite.html @@ -19,11 +19,11 @@ DeleteNewSelfEditorUser DeleteFacultyInfo RebuildSearchIndex -CreateNewSelfEditorUser +CreateNewSelfEditorUser2 FirstTimeSelfEditorLogin2 TryNewSelfEditorPassword2 CreateFacultyMember -AddSelfEditorId +AddSelfEditorId2 CheckSelfEditorPrivileges DeleteNewSelfEditorUser DeleteFacultyInfo