From 698a9cf28d7d5b8bd7f7e76aec595084d2f178c7 Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 4 Apr 2014 16:44:19 -0400 Subject: [PATCH 01/13] removed date time from config file as it is a data property --- rdf/display/everytime/vivoListViewConfig.rdf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/rdf/display/everytime/vivoListViewConfig.rdf b/rdf/display/everytime/vivoListViewConfig.rdf index 42ef84f7..be59e905 100644 --- a/rdf/display/everytime/vivoListViewConfig.rdf +++ b/rdf/display/everytime/vivoListViewConfig.rdf @@ -43,18 +43,10 @@ listViewConfig-dateTimeValue.xml - - listViewConfig-dateTimeValue.xml - - listViewConfig-dateTimeValue.xml - - listViewConfig-dateTimeValue.xml - - listViewConfig-dateTimeValue.xml From 9af27d74dfa6f39e9a958fa412f80725e60ef763 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Mon, 7 Apr 2014 17:36:45 -0400 Subject: [PATCH 02/13] Holly's final (she hopes) test case changes for RC4... --- .../AddNonPersonThings/DeleteIndexStuff.html | 70 ------------ .../TestMenuManagement.html | 105 +++++++++++++++--- .../suites/AddPublications/AddArticle.html | 15 +++ .../suites/AddPublications/AddChapter.html | 15 +++ .../suites/AddPublications/AddConference.html | 15 +++ .../DeleteValidationStuff.html | 12 +- .../AddPublications/ValidateFields.html | 81 ++++++++++---- .../AddRoles/AddFacultyMemberRoles2.html | 12 +- .../AddCoInvestigators.html | 45 ++++++++ .../CheckVisualizations/CheckGrantDates.html | 4 +- .../TestTemporalGraphs.html | 86 +++++++++++++- .../CreatePeople/AssociateLibToFac.html | 5 + .../suites/CreatePeople/EditFacultyInfo.html | 33 ++---- .../suites/CustomAwardsForm/AddAwards.html | 15 +++ .../suites/CustomAwardsForm/ChangeAwards.html | 11 +- .../suites/InitialSetup/EditSiteInfo.html | 10 +- .../InitialSetup/RemoveMenuChanges.html | 92 ++++++++++++++- .../OpenSocialGadgets/CheckGadgets.html | 5 - .../suites/ProxyEditing/DeleteNewUsers.html | 6 +- .../SelfEditing/CreateNewSelfEditorUser.html | 2 +- .../suites/ShortViews/CreateTestPeople.html | 30 +++++ 21 files changed, 501 insertions(+), 168 deletions(-) diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html index 72a39066..2586e5a6 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html @@ -2769,76 +2769,6 @@ 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 diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html index bbac0b1f..60ee40f1 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html @@ -663,21 +663,6 @@ link=Primate Memorial Building - - click - link=County (1) - - - - pause - 5000 - - - - verifyElementPresent - link=Mozamia - - click link=Facility (5) @@ -754,6 +739,36 @@ xpath=(//img[@alt='delete this page'])[2] + + assertConfirmation + Are you sure you wish to delete this page:  Activities? + + + + waitForPageToLoad + 5000 + + + + assertTitle + Pages + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + assertTitle Pages @@ -779,6 +794,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[6] @@ -799,6 +834,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[7] @@ -819,6 +874,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + clickAndWait diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html index 023a40be..74c71da2 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html @@ -359,8 +359,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html index 7c6d9878..3be86f61 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html @@ -259,8 +259,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html index 5980aacb..6ce4159f 100644 --- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html +++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html @@ -209,8 +209,23 @@ type id=relatedIndLabel + + + + sendKeys + id=relatedIndLabel Child + + pause + 5000 + + + + sendKeys + id=relatedIndLabel + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html index 9e125ac3..3029ce8a 100644 --- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html +++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html @@ -299,12 +299,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids! assertTitle - Kids Now! + Focus on Kids! @@ -560,12 +560,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids Too! assertTitle - Kids Now! + Focus on Kids Too! @@ -860,12 +860,12 @@ clickAndWait - link=Kids Now! + link=Focus on Kids Project assertTitle - Kids Now! + Focus on Kids Project diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index 62ebb566..80c4778a 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -845,8 +845,23 @@ type id=lastName + + + + sendKeys + id=lastName Mous + + pause + 5000 + + + + sendKeys + id=lastName + ${KEY_DOWN} + click id=ui-active-menuitem @@ -984,6 +999,11 @@ link=Cancel + + pause + 5000 + + assertTitle Nintendo O.K. for Kids @@ -1103,7 +1123,7 @@ type id=label - Kids Now! + Focus on Kids! clickAndWait @@ -1412,7 +1432,22 @@ type id=object - United States of + + + + sendKeys + id=object + United States of Am + + + pause + 5000 + + + + sendKeys + id=object + ${KEY_DOWN} click @@ -2065,13 +2100,7 @@ type id=label - Kids No - - - - click - id=ui-active-menuitem - + Focus on Kids Project clickAndWait @@ -2285,16 +2314,15 @@ link=Cancel + + selectWindow + null + + type id=label - Kids Now C - - - - click - id=ui-active-menuitem - + Focus on Kids Too! clickAndWait @@ -2355,7 +2383,7 @@ select id=objectVar - label=Kids Now! + label=Focus on Kids! clickAndWait @@ -2657,7 +2685,17 @@ verifyElementPresent - link=Kids Now! + link=Focus on Kids Project + + + + verifyElementPresent + link=Focus on Kids! + + + + verifyElementPresent + link=Focus on Kids Too! @@ -2870,7 +2908,12 @@ click - //div[@id='wrapper-content']/ul/li[6] + //div[@id='wrapper-content']/ul/li[4] + + + + pause + 5000 diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html index 176ca609..24b73402 100644 --- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html +++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html @@ -1024,7 +1024,7 @@ click - css=li.nonSelectedGroupTab.clickable + //div[@id='wrapper-content']/ul/li[10] @@ -1047,11 +1047,6 @@ Ape Health Program Founder 1993 - - - click - //div[@id='wrapper-content']/ul/li[6] - - verifyElementPresent link=History of Apes in Africa @@ -1072,11 +1067,6 @@ Habitats for Apes Researcher 1980 - 1985 - - click - //div[@id='wrapper-content']/ul/li[8] - - verifyElementPresent link=Working with Primates diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html index b34cc783..03d71ebd 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html @@ -105,8 +105,23 @@ type id=grant + + + + sendKeys + id=grant Future of + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem @@ -176,8 +191,23 @@ type id=grant + + + + sendKeys + id=grant Nix N + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem @@ -241,8 +271,23 @@ type id=grant + + + + sendKeys + id=grant Nix N + + pause + 5000 + + + + sendKeys + id=grant + ${KEY_DOWN} + click ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html index e00e5b4f..2fc0065a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html @@ -383,7 +383,7 @@ verifyTextPresent - from 2002 through 2012 + from 2004 through 2013 @@ -398,7 +398,7 @@ verifyTextPresent - from 2003 through 2012 + from 2004 through 2013 diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index ee215155..a4949d70 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -134,8 +134,23 @@ type id=person + + + + sendKeys + id=person Furter + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} + click id=ui-active-menuitem @@ -184,8 +199,23 @@ type id=person + + + + sendKeys + id=person John + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} + click id=ui-active-menuitem @@ -234,7 +264,22 @@ type id=person - smith + + + + sendKeys + id=person + Smith + + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} click @@ -284,7 +329,22 @@ type id=person - zink + + + + sendKeys + id=person + Zink + + + pause + 5000 + + + + sendKeys + id=person + ${KEY_DOWN} click @@ -363,6 +423,11 @@ link=Organizations + + pause + 5000 + + assertTitle Organizations @@ -622,10 +687,15 @@ - selectAndWait + select //div[@id='leftUpper']/div/select label=by Grants + + pause 10000 + + + assertTitle Child Development - Temporal Graph Visualization @@ -919,6 +989,11 @@ link=Organizations + + pause + 5000 + + assertTitle Organizations @@ -949,6 +1024,11 @@ id=organizationMoniker + + pause + 5000 + + verifyTextPresent College of Human Ecology diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html index 4adf2a38..3c46c6ec 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html +++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html @@ -177,6 +177,11 @@ Assistant Professor + + pause + 5000 + + verifyElementPresent link=Librarian, Lily Lou diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html index 8fe28bba..c5c972af 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html +++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html @@ -167,13 +167,18 @@ - clickAndWait - id=showAddForm + assertConfirmation + Are you sure you want to remove this web page? - assertTitle - Edit + waitForPageToLoad + 5000 + + + + clickAndWait + id=showAddForm @@ -822,26 +827,6 @@ 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 diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html index 88030d1f..a6bbe1ad 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html @@ -219,8 +219,23 @@ type id=org + + + + sendKeys + id=org Carr + + pause + 5000 + + + + sendKeys + id=org + ${KEY_DOWN} + click id=ui-active-menuitem diff --git a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html index ce8cc7b4..92b65533 100644 --- a/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html +++ b/utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html @@ -211,7 +211,7 @@ clickAndWait - xpath=(//img[@alt='edit this entry'])[5] + xpath=(//img[@alt='edit this entry'])[4] @@ -290,10 +290,15 @@ link=Primates-R-Us - + + + selectWindow + null + + clickAndWait - xpath=(//img[@alt='edit this entry'])[5] + css=a.edit-relatedBy > img.edit-individual diff --git a/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html index 612c1500..45943ee9 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.1-rc2 + Version rel-1.6.1-rc4 verifyElementPresent - link=rel-1.6.1-rc2 + link=rel-1.6.1-rc4 @@ -532,7 +532,7 @@ verifyTextPresent - Version rel-1.6.1-rc2 + Version rel-1.6.1-rc4 @@ -639,12 +639,12 @@ verifyTextPresent - Version rel-1.6.1-rc2 + Version rel-1.6.1-rc4 verifyElementPresent - link=rel-1.6.1-rc2 + link=rel-1.6.1-rc4 diff --git a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html index 0150889b..e4183db2 100644 --- a/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html +++ b/utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html @@ -131,12 +131,42 @@ Test HTML Page - + clickAndWait xpath=(//img[@alt='delete this page'])[2] + + assertConfirmation + Are you sure you wish to delete this page:  Activities? + + + + waitForPageToLoad + 5000 + + + + assertTitle + Pages + + + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + assertTitle Pages @@ -162,6 +192,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[6] @@ -182,6 +232,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[7] @@ -202,6 +272,26 @@ Pages + + clickAndWait + link=Site Admin + + + + assertTitle + VIVO Site Administration + + + + clickAndWait + link=Page management + + + + assertTitle + Pages + + click xpath=(//img[@alt='delete this page'])[11] diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html index caaf7ed8..11f9de71 100644 --- a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html +++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html @@ -143,11 +143,6 @@ OpenSocial - - verifyTextPresent - KNODE Search Results - - clickAndWait diff --git a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html index 375e6615..f0af0db6 100644 --- a/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html +++ b/utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html @@ -119,7 +119,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? @@ -150,7 +150,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? @@ -176,7 +176,7 @@ assertConfirmation - Are you sure you want to delete these accounts?? + Are you sure you want to delete this account?? diff --git a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html index 6e48c32a..c381211f 100644 --- a/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html +++ b/utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html @@ -123,7 +123,7 @@ sendKeys id=associateProfileName - Facul + Faculty, Ja pause diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html index 7b351b6d..aee17b65 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html @@ -195,8 +195,23 @@ type id=activity + + + + sendKeys + id=activity Depart + + pause + 5000 + + + + sendKeys + id=activity + ${KEY_DOWN} + click id=ui-active-menuitem @@ -282,8 +297,23 @@ type id=activity + + + + sendKeys + id=activity Depart + + pause + 5000 + + + + sendKeys + id=activity + ${KEY_DOWN} + click id=ui-active-menuitem From 49de9c4706fbebbb7e332f921dd8ede13a5bb1b6 Mon Sep 17 00:00:00 2001 From: Holly Mistlebauer Date: Tue, 8 Apr 2014 11:59:37 -0400 Subject: [PATCH 03/13] Holly's final RC4 test case changes... --- .../suites/LinkedOpenData/AddTestRDF.html | 124 +++ .../LinkedOpenData/CheckDataHiding.html | 46 +- .../suites/LinkedOpenData/RemoveTestRDF.html | 129 +++ .../suites/LinkedOpenData/Suite.html | 3 +- .../suites/LinkedOpenData/TestRDFAccept.html | 723 -------------- .../LinkedOpenData/TestVariousRequests.html | 922 +++++++++++++++++- 6 files changed, 1186 insertions(+), 761 deletions(-) create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html create mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html delete mode 100644 utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html b/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html new file mode 100644 index 00000000..8a9fe97d --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html @@ -0,0 +1,124 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestFacultyMember
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=Add/Remove RDF data
assertTitleIngest RDF Data
typename=rdfStreamC:\VIVO\vivo\utilities\acceptance-tests\suites\LinkedOpenData\TestLinkedOpenData.n3
selectname=languagelabel=N3
clickAndWaitid=submit
assertTitleIngest RDF Data
verifyTextPresentRDF upload successful.
open/vivo/
clickAndWaitlink=Log out
+ + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html index 02744c34..09a0a143 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html @@ -36,18 +36,29 @@ open - /vivo/individual/lodFacultyMember/lodFacultyMember.rdf + /testApp/TestLinkedOpenData.html + + + + click + id=N3_EXTENSION_button - pause - 10000 + 5000 + + + + verifyTextPresent + vivo:eRACommonsId + + + + verifyTextNotPresent + vivo:scopusId - - - @@ -94,18 +105,29 @@ open - /vivo/individual/lodFacultyMember/lodFacultyMember.rdf + /testApp/TestLinkedOpenData.html + + + + click + id=N3_EXTENSION_button - pause - 10000 + 5000 + + + + verifyTextPresent + vivo:eRACommonsId + + + + verifyTextPresent + vivo:scopusId - - - open diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html b/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html new file mode 100644 index 00000000..546567d9 --- /dev/null +++ b/utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html @@ -0,0 +1,129 @@ + + + + + + +CreateTestFacultyMember + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CreateTestFacultyMember
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=Add/Remove RDF data
assertTitleIngest RDF Data
typename=rdfStreamC:\VIVO\vivo\utilities\acceptance-tests\suites\LinkedOpenData\TestLinkedOpenData.n3
clickxpath=(//input[@name='mode'])[3]
selectname=languagelabel=N3
clickAndWaitid=submit
assertTitleIngest RDF Data
verifyTextPresentRemoved RDF from file TestLinkedOpenData.n3. Removed 33 statements.
open/vivo/
clickAndWaitlink=Log out
+ + diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html b/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html index 985a3c1d..3f910563 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/Suite.html @@ -9,10 +9,11 @@ + - +
Test Suite
RebuildSearchIndex
AddTestRDF
TestUserCreated
TestVariousRequests
CheckDataHiding
TestRDFAccept
RemoveTestRDF
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html deleted file mode 100644 index 61c18360..00000000 --- a/utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html +++ /dev/null @@ -1,723 +0,0 @@ - - - - - - -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
verifyTextPresentTest the Linked Open Data requests
verifyTextPresentTry various accept headers
verifyElementPresentid=RDFXML_button
verifyElementPresentid=N3_button
verifyElementPresentid=TTL_button
verifyElementPresentid=JSONLD_button
verifyTextPresentTry non-existent URI with RDFXML accept header
verifyElementPresentid=BOGUS_URI_button
verifyElementPresentid=BOGUS_ACCEPT_button
verifyElementPresentid=BOGUS_FORMAT_button
verifyElementPresentid=BOGUS_EXTENSION_button
verifyTextPresentResponse data
verifyElementPresentid=CLEAR_button
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=RDFXML_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is application/rdf+xml
verifyTextPresentText is:
verifyTextNotPresentNo 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#"
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=N3_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is text/n3
verifyTextPresentText is:
verifyTextNotPresentNo 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#> .
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=TTL_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is text/turtle
verifyTextPresentText is:
verifyTextNotPresentNo 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#> .
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=JSONLD_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is application/json
verifyTextPresentText is:
verifyTextNotPresentNo text
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=BOGUS_URI_button
pause5000
verifyTextPresentResponse code is 404
verifyTextPresentMIME type is text/html
verifyTextPresentText is:
verifyTextNotPresentNo 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
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=BOGUS_ACCEPT_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is text/html
verifyTextPresentText is:
verifyTextNotPresentNo 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
verifyTextPresentMr. Bad Example
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=BOGUS_FORMAT_button
pause5000
verifyTextPresentResponse code is 200
verifyTextPresentMIME type is text/html
verifyTextPresentText is:
verifyTextNotPresentNo 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
verifyTextPresentMr. Bad Example
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
clickid=BOGUS_EXTENSION_button
pause5000
verifyTextPresentResponse code is 404
verifyTextPresentMIME type is text/html
verifyTextPresentText is:
verifyTextNotPresentNo 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
verifyTextNotPresentMr. Bad Example
verifyTextPresentIndividual not found
clickid=CLEAR_button
pause5000
verifyTextPresentResponse code is 000
verifyTextPresentMIME type is No type
verifyTextPresentText is:
verifyTextPresentNo text
open/vivo/
clickAndWaitlink=Log out
- - diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html index 598ad1ae..be5e6692 100644 --- a/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html +++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html @@ -62,10 +62,9 @@ VIVO - open - /vivo/TestLinkedOpenData.html + /testApp/TestLinkedOpenData.html @@ -75,15 +74,19 @@ - - clickAndWait + click id=N3_EXTENSION_button + + pause + 5000 + + verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.n3 + Request URL is /vivo/individual/lodFacultyMember/lodFacultyMember.n3 @@ -173,10 +176,9 @@ - open - /vivo/TestLinkedOpenData.html + /testApp/TestLinkedOpenData.html @@ -184,9 +186,14 @@ id=RDFXML_EXTENSION_button + + pause + 5000 + + verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.rdf + Request URL is /vivo/individual/lodFacultyMember/lodFacultyMember.rdf @@ -226,6 +233,11 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -248,13 +260,18 @@ - clickAndWait + click id=N3_EXTENSION_button + + pause + 5000 + + verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.n3 + Request URL is /vivo/individual/lodFacultyMember/lodFacultyMember.n3 @@ -294,6 +311,11 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -320,9 +342,14 @@ id=TTL_EXTENSION_button + + pause + 5000 + + verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.ttl + Request URL is /vivo/individual/lodFacultyMember/lodFacultyMember.ttl @@ -362,6 +389,11 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -388,9 +420,14 @@ id=JSONLD_EXTENSION_button + + pause + 5000 + + verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.jsonld + Request URL is /vivo/individual/lodFacultyMember/lodFacultyMember.jsonld @@ -415,7 +452,7 @@ 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":[{"@value":"2014-03-14T16:54:12" + [{"@id":"http://localhost:8080/vivo/individual/lodFacultyMember/lodFacultyMember.jsonld" @@ -430,6 +467,11 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -451,15 +493,97 @@ - - clickAndWait - id=N3_EXTENSION_button + click + id=RDFXML_FORMAT_button + + + + pause + 5000 verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.n3 + Request URL is /vivo/individual/lodFacultyMember?format=rdfxml + + + + verifyTextPresent + Accept header is No header + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/rdf+xml + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + <rdf:RDF + + + + + pause + 10000 + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=N3_FORMAT_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember @@ -499,6 +623,167 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=TTL_FORMAT_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is No header + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/turtle + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + @prefix + + + + + pause + 10000 + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=JSONLD_FORMAT_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is No header + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/json + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + [{"@id":"http://localhost:8080/vivo/individual/lodFacultyMember" + + + + + pause + 10000 + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -520,20 +805,102 @@ + + click + id=RDFXML_HEADER_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is application/rdf+xml + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/rdf+xml + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + <rdf:RDF + + + + + pause + 10000 + + - clickAndWait - id=N3_EXTENSION_button + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 verifyTextPresent - Request URL is individual/lodFacultyMember/lodFacultyMember.n3 + Response code is 000 verifyTextPresent - Accept header is No header + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=N3_HEADER_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is text/n3 @@ -568,6 +935,11 @@ id=CLEAR_RESPONSE_button + + pause + 5000 + + verifyTextPresent Response code is 000 @@ -583,8 +955,52 @@ Text is: - + + verifyTextPresent + No text + + + + click + id=TTL_HEADER_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is text/turtle + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is text/turtle + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + @prefix + + pause @@ -592,17 +1008,473 @@ - - clickAndWait - link=Log out + click + id=CLEAR_RESPONSE_button + + pause + 5000 + + + + verifyTextPresent + Response code is 000 + + + + verifyTextPresent + MIME type is No type + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + No text + + + + + click + id=JSONLD_HEADER_button + + + + pause + 5000 + + + + verifyTextPresent + Request URL is /vivo/individual/lodFacultyMember + + + + verifyTextPresent + Accept header is application/json + + + + verifyTextPresent + Response code is 200 + + + + verifyTextPresent + MIME type is application/json + + + + verifyTextPresent + Text is: + + + + verifyTextPresent + [{"@id":"http://localhost:8080/vivo/individual/lodFacultyMember/lodFacultyMember.jsonld" + + + + + pause + 10000 + + + + + click + id=CLEAR_RESPONSE_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 + + + + verifyText + id=requestUrl + /vivo/individual/lodFacultyMemberXX + + + verifyText + id=acceptHeader + application/rdf+xml + + + verifyText + //div[3] + Response code is 404 + + + verifyText + //div[4] + MIME type is text/html + + + verifyText + //div[5] + Text is: + + + verifyTextPresent + <!DOCTYPE html> + + + + verifyTextPresent + Individual Not Found + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyText + id=requestUrl + /vivo/individual/lodFacultyMemberXX + + + verifyText + //div[2] + Accept header is application/rdf+xml + + + verifyText + //div[3] + Response code is 000 + + + verifyText + //div[4] + MIME type is No type + + + verifyText + //div[5] + Text is: + + + verifyText + id=responseText + No text + + + + click + id=BOGUS_ACCEPT_button + + + + pause + 5000 + + + + verifyText + css=div + Request URL is /vivo/individual/lodFacultyMember + + + verifyText + //div[2] + Accept header is image/png + + + verifyText + //div[3] + Response code is 200 + + + verifyText + //div[4] + MIME type is text/html + + + verifyText + //div[5] + Text is: + + + verifyTextPresent + <!DOCTYPE html> + + + + verifyTextPresent + Example, Bad + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyText + css=div + Request URL is /vivo/individual/lodFacultyMember + + + verifyText + //div[2] + Accept header is image/png + + + verifyText + //div[3] + Response code is 000 + + + verifyText + //div[4] + MIME type is No type + + + verifyText + //div[5] + Text is: + + + verifyText + id=responseText + No text + + + + click + id=BOGUS_FORMAT_button + + + + pause + 5000 + + + + verifyText + css=div + exact:Request URL is /vivo/individual/lodFacultyMember?format=bogus + + + verifyText + //div[2] + Accept header is No header + + + verifyText + //div[3] + Response code is 200 + + + verifyText + //div[4] + MIME type is text/html + + + verifyText + //div[5] + Text is: + + + verifyTextPresent + <!DOCTYPE html> + + + + verifyTextPresent + Example, Bad + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyText + id=requestUrl + exact:/vivo/individual/lodFacultyMember?format=bogus + + + verifyText + //div[2] + Accept header is No header + + + verifyText + //div[3] + Response code is 000 + + + verifyText + //div[4] + MIME type is No type + + + verifyText + //div[5] + Text is: + + + verifyText + id=responseText + No text + + + + click + id=BOGUS_EXTENSION_button + + + + pause + 5000 + + + + verifyText + id=requestUrl + /vivo/individual/lodFacultyMember/lodFacultyMember.bogus + + + verifyText + //div[2] + Accept header is No header + + + verifyText + //div[3] + Response code is 404 + + + verifyText + //div[4] + MIME type is text/html + + + verifyText + //div[5] + Text is: + + + verifyTextPresent + <!DOCTYPE html> + + + + verifyTextPresent + Individual Not Found + + + + + click + id=CLEAR_RESPONSE_button + + + + pause + 5000 + + + + verifyText + id=requestUrl + /vivo/individual/lodFacultyMember/lodFacultyMember.bogus + + + verifyText + //div[2] + Accept header is No header + + + verifyText + //div[3] + Response code is 000 + + + verifyText + //div[4] + MIME type is No type + + + verifyText + //div[5] + Text is: + + + verifyText + id=responseText + No text + + open /vivo/ + + clickAndWait + link=Log out + + From 811820a33040a79dee13b78575be18c980ad5c0e Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 14 Apr 2014 12:20:01 -0400 Subject: [PATCH 04/13] VIVO-731 Replace SparqlQueryServlet with SparqlQueryController SparqlQueryServlet was JSP-based, so delete the JSP also. SparqlQueryController is Freemarker-based, and is a this shell around the SparqlQueryApiExecutor. --- productMods/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index c294bd6a..ae7b7847 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1120,7 +1120,7 @@ SparqlQuery - edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet + edu.cornell.mannlib.vitro.webapp.controller.admin.SparqlQueryController From e01127bc11b33d2cf1786a0ae388c677cfdee271 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 15 Apr 2014 13:37:13 -0400 Subject: [PATCH 05/13] VIVO-731 Implement the SPARQL query API. Create a base class for API controller servlets. --- productMods/WEB-INF/web.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index ae7b7847..db788e92 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1128,6 +1128,16 @@ /admin/sparqlquery + + SparqlQueryApi + edu.cornell.mannlib.vitro.webapp.controller.api.SparqlQueryApiController + + + + SparqlQueryApi + /api/sparqlQuery + + SparqlUpdateApi edu.cornell.mannlib.vitro.webapp.controller.api.SparqlUpdateApiController From b1c8c3939d5cc7ab8062b93adde1e8cd9fe19e00 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 15 Apr 2014 13:38:41 -0400 Subject: [PATCH 06/13] VIVO-731 Start to create the acceptance tests for SPARQL query API. --- .../SparqlQueryApi/EnableSparqlQueryApi.n3 | 6 ++ .../SparqlQueryApi/SparqlQueryTestData.n3 | 11 +++ .../testApp/TestSparqlQueryApi.html | 75 +++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 create mode 100644 utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 create mode 100644 utilities/acceptance-tests/testApp/TestSparqlQueryApi.html diff --git a/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 b/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 new file mode 100644 index 00000000..5548d4b0 --- /dev/null +++ b/utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 @@ -0,0 +1,6 @@ +@prefix rdfs: . +@prefix auth: . +@prefix simplePermission: . + +auth:ADMIN + auth:hasPermission simplePermission:UseSparqlQueryApi ; diff --git a/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 b/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 new file mode 100644 index 00000000..4419cb5c --- /dev/null +++ b/utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 @@ -0,0 +1,11 @@ +@prefix rdfs: . +@prefix foaf: . +@prefix vitro: . +@prefix vivo: . +@prefix myDomain: . + +myDomain:SQapiPerson + a foaf:Person; + rdfs:label "Baker, Able "^^xsd:string ; + vitro:mostSpecificType foaf:Person; + vivo:overview "A simple bread-maker." . \ No newline at end of file diff --git a/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html b/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html new file mode 100644 index 00000000..5bcdd1ca --- /dev/null +++ b/utilities/acceptance-tests/testApp/TestSparqlQueryApi.html @@ -0,0 +1,75 @@ + + + + + + +

Test the Linked Open Data requests

+ +

Request data

+ + + + + + + + + + + + + + + + + + + + + +
User email
User password
Accept header
Query text
 
+ +

Response data

+
Response code is 000
+
MIME type is No type
+
Text is:
+
No text
\ No newline at end of file From abd7f7d38fd8d71df495e781011177b5fa048031 Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 16 Apr 2014 10:32:59 -0400 Subject: [PATCH 07/13] Remove dead-end attempt at real-time smoke tests --- productMods/WEB-INF/classes/smokeTests/vivoTests.txt | 4 ---- productMods/WEB-INF/web.xml | 9 --------- 2 files changed, 13 deletions(-) delete mode 100644 productMods/WEB-INF/classes/smokeTests/vivoTests.txt diff --git a/productMods/WEB-INF/classes/smokeTests/vivoTests.txt b/productMods/WEB-INF/classes/smokeTests/vivoTests.txt deleted file mode 100644 index 8216eb5c..00000000 --- a/productMods/WEB-INF/classes/smokeTests/vivoTests.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Note: The classes mentioned below must be present in -# edu.cornell.mannlib.vitro.webapp.utils.smoketest package. - -SolrContextChecker \ No newline at end of file diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml index db788e92..fcc2e63f 100644 --- a/productMods/WEB-INF/web.xml +++ b/productMods/WEB-INF/web.xml @@ -1400,15 +1400,6 @@ /searchService/* - - SmokeTestController - edu.cornell.mannlib.vitro.webapp.controller.freemarker.SmokeTestController - - - SmokeTestController - /smoketest - - From cb204a3926402c865582b48a58f75c42f9c46cb0 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 22 Apr 2014 10:56:23 -0400 Subject: [PATCH 08/13] VIVO-742 Create SearchEngineSetup and SearchIndexerSetup --- productMods/WEB-INF/resources/startup_listeners.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index ce0c70b5..7627c5fd 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -68,9 +68,10 @@ edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup # Add VIVO specific DocumentModifers, this must come before SolrSetup edu.cornell.mannlib.vitro.webapp.search.solr.VivoDocumentModifiers -# The Solr index uses a "public" permission, so the PropertyRestrictionPolicyHelper +# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper # and the PermissionRegistry must already be set up. -edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup +edu.cornell.mannlib.vitro.webapp.searchengine.SearchEngineSetup +edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup From d73c82cd55c5ba2f4e42936fd583229b262d5790 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 22 Apr 2014 15:10:49 -0400 Subject: [PATCH 09/13] VIVO-742 Change client code to use SearchEngine interface. Removed SolrQueryTest until I can see how to update it. Everything compiles and tests run, but haven't tried running VIVO yet. --- .../AddConceptThroughObjectPropertyGenerator.java | 3 --- .../webapp/search/solr/CalculateParameters.java | 8 +++++--- .../webapp/search/solr/VIVOValuesFromVcards.java | 12 ++++++------ .../search/solr/VivoAgentContextNodeFieldsTest.java | 4 ++-- .../search/solr/VivoAgentContextNodeFieldsTest2.java | 4 ++-- ...VivoInformationResourceContextNodeFieldsTest.java | 12 +++++++++--- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java index 41f4c1e2..d221f7ff 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java @@ -18,9 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropetyOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSolrQueryOptions; /** @@ -122,7 +120,6 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope } String[] typesArray = types.toArray(new String[types.size()]); field.setOptions( new IndividualsViaSolrQueryOptions( - vreq.getSession().getServletContext(), getSubjectUri(), predicateUri, getObjectUri(), diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java index 432c3573..98093381 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java @@ -10,7 +10,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.solr.common.SolrInputDocument; import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Query; @@ -27,6 +26,7 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.Individual; +import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; @@ -241,17 +241,18 @@ public class CalculateParameters implements DocumentModifier { } @Override - public void modifyDocument(Individual individual, SolrInputDocument doc, StringBuffer addUri) { + public void modifyDocument(Individual individual, SearchInputDocument doc, StringBuffer addUri) { // TODO Auto-generated method stub // calculate beta value. log.debug("Parameter calculation starts.."); float beta = calculateBeta(individual.getURI()); - doc.addField(VitroSearchTermNames.BETA, beta); + doc.addField(VitroSearchTermNames.BETA, (Object) beta); doc.setDocumentBoost(beta + doc.getDocumentBoost() ); log.debug("Parameter calculation is done"); } + @Override public void shutdown(){ shutdown=true; } @@ -267,6 +268,7 @@ class TotalInd implements Runnable{ this.totalCountQuery = totalCountQuery; } + @Override public void run(){ int totalInd=0; Query query; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java index b4141ca6..69582a6c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java @@ -9,13 +9,13 @@ import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.PREFE import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.solr.common.SolrInputDocument; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.beans.Individual; +import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; @@ -44,7 +44,7 @@ public class VIVOValuesFromVcards implements DocumentModifier { private static final ResultParser PREFERRED_TITLE_PARSER = new ResultParser() { @Override - public void parse(String uri, QuerySolution solution, SolrInputDocument doc) { + public void parse(String uri, QuerySolution solution, SearchInputDocument doc) { String title = getLiteralValue(solution, "title"); if (StringUtils.isNotBlank(title)) { doc.addField(PREFERRED_TITLE, title); @@ -68,7 +68,7 @@ public class VIVOValuesFromVcards implements DocumentModifier { private static final ResultParser EMAIL_PARSER = new ResultParser() { @Override public void parse(String uri, QuerySolution solution, - SolrInputDocument doc) { + SearchInputDocument doc) { String email = getLiteralValue(solution, "email"); if (StringUtils.isNotBlank(email)) { doc.addField(ALLTEXT, email); @@ -85,7 +85,7 @@ public class VIVOValuesFromVcards implements DocumentModifier { } @Override - public void modifyDocument(Individual individual, SolrInputDocument doc, + public void modifyDocument(Individual individual, SearchInputDocument doc, StringBuffer addUri) { if (individual == null) return; @@ -96,7 +96,7 @@ public class VIVOValuesFromVcards implements DocumentModifier { } private void processQuery(Individual individual, String queryTemplate, - ResultParser resultParser, SolrInputDocument doc) { + ResultParser resultParser, SearchInputDocument doc) { String uri = "<" + individual.getURI() + "> "; String query = queryTemplate.replaceAll("\\?uri", uri); @@ -124,7 +124,7 @@ public class VIVOValuesFromVcards implements DocumentModifier { } private abstract static class ResultParser { - public abstract void parse(String uri, QuerySolution solution, SolrInputDocument doc); + public abstract void parse(String uri, QuerySolution solution, SearchInputDocument doc); String getLiteralValue(QuerySolution solution, String name) { RDFNode node = solution.get(name); diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java index 372b1e75..a8090806 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java @@ -1,11 +1,11 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.search.solr; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.InputStream; -import org.apache.solr.common.SolrInputDocument; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java index 53c5222a..5c7c7849 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.search.solr; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.InputStream; import org.apache.commons.lang.StringUtils; -import org.apache.solr.common.SolrInputDocument; import org.junit.BeforeClass; import org.junit.Test; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java index 6112829b..f9106316 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java @@ -6,19 +6,24 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collection; -import org.apache.solr.common.SolrInputDocument; import org.junit.Assert; import org.junit.Test; +import stubs.edu.cornell.mannlib.vitro.webapp.modules.ApplicationStub; +import stubs.edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineStub; +import stubs.javax.servlet.ServletContextStub; + import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; +import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena; +import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; @@ -32,6 +37,7 @@ public class VivoInformationResourceContextNodeFieldsTest extends AbstractTestCl @Test public void testNoLabel() throws IOException{ + ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub()); //Test that rdfs:label is NOT added by the VivoInformationResourceContextNodeFields @@ -51,13 +57,13 @@ public class VivoInformationResourceContextNodeFieldsTest extends AbstractTestCl RDFService rdfService = new RDFServiceModel(ontModel); RDFServiceFactory rdfServiceFactory = new RDFServiceFactorySingle(rdfService); - SolrInputDocument doc = new SolrInputDocument(); + SearchInputDocument doc = ApplicationUtils.instance().getSearchEngine().createInputDocument(); doc.addField("ALLTEXT", ""); VivoInformationResourceContextNodeFields vircnf = new VivoInformationResourceContextNodeFields(rdfServiceFactory); vircnf.modifyDocument(ind, doc, new StringBuffer()); - Collection values = doc.getFieldValues("ALLTEXT"); + Collection values = doc.getField("ALLTEXT").getValues(); for( Object value : values){ Assert.assertFalse("rdf:label erroneously added by document modifier:", value.toString().contains(RDFS_LABEL_VALUE)); } From 0d36fe58b82736b9cf5851e5a568d4884fb5a25c Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 22 Apr 2014 15:11:41 -0400 Subject: [PATCH 10/13] VIVO-742 Setup the Application properly, and guard against NPEs --- productMods/WEB-INF/resources/startup_listeners.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index 7627c5fd..be84da4f 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -13,6 +13,8 @@ edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup +edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$Setup + edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup From 2d6aeaafb82d8d41c5ffd8d86ad4fc682c3fcfed Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 22 Apr 2014 17:59:26 -0400 Subject: [PATCH 11/13] VIVO-742 Many changes to remove "solr" from methods, variables, classes. --- .../edit/forms/pageManagement--customDataScript.ftl | 2 +- .../generators/AddConceptThroughObjectPropertyGenerator.java | 4 ++-- .../preprocessors/utils/ProcessDataGetterN3Map.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl index d8f90ea7..02ac6692 100644 --- a/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl +++ b/productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl @@ -15,7 +15,7 @@ scripts list.--> "internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", - "solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter" + "solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter" } }; \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java index d221f7ff..bd35f344 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java @@ -19,7 +19,7 @@ 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.VTwo.fields.IndividualsViaSolrQueryOptions; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSearchQueryOptions; /** * This generator is for the case where a new concept is being added for an object property other than research/subject areas where the @@ -119,7 +119,7 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope types.add(v.getURI()); } String[] typesArray = types.toArray(new String[types.size()]); - field.setOptions( new IndividualsViaSolrQueryOptions( + field.setOptions( new IndividualsViaSearchQueryOptions( getSubjectUri(), predicateUri, getObjectUri(), diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java index cda9baf8..b97eb540 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java @@ -18,7 +18,7 @@ public class ProcessDataGetterN3Map { map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3"); - map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSolrIndividualsDataGetterN3"); + map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3"); return map; } From 711afa44fa438cf6a9633359f2f6801827c65c81 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 22 Apr 2014 18:28:06 -0400 Subject: [PATCH 12/13] VIVO-742 Rename some 'solr' packages. --- .../WEB-INF/resources/startup_listeners.txt | 2 +- .../CalculateParameters.java | 4 ++-- .../VIVOValuesFromVcards.java | 4 ++-- .../VivoAgentContextNodeFields.java | 6 ++---- .../VivoDocumentModifiers.java | 16 ++++++++++++---- .../VivoISFAdvisingFields.java | 4 ++-- .../VivoISFBasicFields.java | 4 ++-- .../VivoISFEducationFields.java | 4 ++-- .../VivoISFGrantFields.java | 4 ++-- .../VivoISFMemberFields.java | 4 ++-- ...VivoInformationResourceContextNodeFields.java | 6 ++---- .../NIHVIVO3853_DataSet1.rdf | 0 .../VIVO146_DataSet1.n3 | 0 .../VivoAgentContextNodeFieldsTest.java | 2 +- .../VivoAgentContextNodeFieldsTest2.java | 2 +- ...InformationResourceContextNodeFieldsTest.java | 2 +- ...voInformationResourceContextNodeFieldsTest.n3 | 0 17 files changed, 34 insertions(+), 30 deletions(-) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/CalculateParameters.java (98%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VIVOValuesFromVcards.java (96%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoAgentContextNodeFields.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoDocumentModifiers.java (74%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoISFAdvisingFields.java (92%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoISFBasicFields.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoISFEducationFields.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoISFGrantFields.java (97%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoISFMemberFields.java (93%) rename src/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoInformationResourceContextNodeFields.java (93%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/NIHVIVO3853_DataSet1.rdf (100%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VIVO146_DataSet1.n3 (100%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoAgentContextNodeFieldsTest.java (98%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoAgentContextNodeFieldsTest2.java (97%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoInformationResourceContextNodeFieldsTest.java (98%) rename test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/VivoInformationResourceContextNodeFieldsTest.n3 (100%) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index be84da4f..0e301e40 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -68,7 +68,7 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup # Add VIVO specific DocumentModifers, this must come before SolrSetup -edu.cornell.mannlib.vitro.webapp.search.solr.VivoDocumentModifiers +edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers # The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper # and the PermissionRegistry must already be set up. diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java index 98093381..4e0542e8 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.HashSet; @@ -28,7 +28,7 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier; public class CalculateParameters implements DocumentModifier { diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java index 69582a6c..27fa9411 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED; @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier; /** * If there are any VCards on this Individual with Title objects, store the text diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java index 3dbe47e4..74b52bf6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java @@ -1,13 +1,11 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; - -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** * Class that adds text from context nodes to Solr Documents for diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java similarity index 74% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java index b27bfbad..1cc0caf7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,17 @@ import com.hp.hpl.jena.query.DatasetFactory; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnNamespace; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SearchIndexExcluder; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.CalculateParameters; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnNamespace; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VIVOValuesFromVcards; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFAdvisingFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFBasicFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFEducationFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFGrantFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFMemberFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoInformationResourceContextNodeFields; public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{ diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java similarity index 92% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java index 26db9076..ac08fa1a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** * DocumentModifier for adding rdfs:labels of individuals related via diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFBasicFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFBasicFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java index b617a1d9..189a19f4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFBasicFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** * DocumentModifier to populate Solr fields for the basic ISF relationships. diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFEducationFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFEducationFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java index 69d4c00c..6a9aa443 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFEducationFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; public class VivoISFEducationFields extends ContextNodeFields { private static String VIVONS = "http://vivoweb.org/ontology/core#"; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFGrantFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFGrantFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java index 7512c74e..4c919d7d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFGrantFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /* * This DocumentModifier is for the ISF style grants. diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFMemberFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFMemberFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java index a3de1b32..3623bb71 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFMemberFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java @@ -1,12 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** * This class will: diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java similarity index 93% rename from src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java rename to src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java index 2fcf6798..531f711e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java @@ -1,13 +1,11 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; - -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** * Class that adds text from context nodes to Solr Documents for diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3 similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3 diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java similarity index 98% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java index a8090806..e4ab7c20 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java similarity index 97% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java index 5c7c7849..1d641e92 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java similarity index 98% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java index f9106316..c95c0c6d 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java @@ -1,5 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.io.IOException; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.n3 b/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.n3 rename to test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 From 02bdddab237f91b39f8276239aaafbc2a2314977 Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 23 Apr 2014 14:20:22 -0400 Subject: [PATCH 13/13] VIVO-742 Many changes to remove "solr" from the code base. Comments, template names, Java classes, variables and method names (Java and JavaScript), etc. --- .../WEB-INF/resources/startup_listeners.txt | 2 +- productMods/js/homePageUtils.js | 6 ++-- .../js/menupage/processDataGetterUtils.js | 2 +- ...nceptThroughObjectPropertyAutoComplete.ftl | 2 +- .../edit/forms/autoCompleteDataPropForm.ftl | 2 +- .../pageManagement--customDataScript.ftl | 2 +- .../freemarker/lib/lib-home-page.ftl | 2 +- .../VivoAgentContextNodeFields.java | 2 +- .../VivoDocumentModifiers.java | 4 +-- .../documentBuilding/VivoISFBasicFields.java | 4 +-- .../documentBuilding/VivoISFGrantFields.java | 32 +++++++++---------- .../documentBuilding/VivoISFMemberFields.java | 8 ++--- ...oInformationResourceContextNodeFields.java | 2 +- themes/wilma/templates/page-home.ftl | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index 0e301e40..4040cc02 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -67,7 +67,7 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests # For multiple language support edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup -# Add VIVO specific DocumentModifers, this must come before SolrSetup +# Add VIVO specific DocumentModifers, this must come before SearchIndexerSetup edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers # The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper diff --git a/productMods/js/homePageUtils.js b/productMods/js/homePageUtils.js index 7c5410ba..75d064f9 100644 --- a/productMods/js/homePageUtils.js +++ b/productMods/js/homePageUtils.js @@ -23,7 +23,7 @@ $(document).ready(function(){ var individualList = ""; if ( facultyMemberCount > 0 ) { - // determine the row at which to start the solr query + // determine the row at which to start the search query var rowStart = Math.floor((Math.random()*facultyMemberCount)); var diff; var pageSize = 4; // the number of faculty to display on the home page @@ -34,7 +34,7 @@ $(document).ready(function(){ } // in case the random number is equal to or within 3 of the facultyMemberCount - // subtract 1 from the facultyMemberCount because the Solr rows begin at 0, not 1 + // subtract 1 from the facultyMemberCount because the search rows begin at 0, not 1 if ( (rowStart + (pageSize-1)) > (facultyMemberCount-1) ) { diff = (rowStart + (pageSize-1)) - (facultyMemberCount-1); if ( diff == 0 ) { @@ -48,7 +48,7 @@ $(document).ready(function(){ rowStart = 0; } - var dataServiceUrl = urlsBase + "/dataservice?getRandomSolrIndividualsByVClass=1&vclassId="; + var dataServiceUrl = urlsBase + "/dataservice?getRandomSearchIndividualsByVClass=1&vclassId="; var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember"); url += "&page=" + rowStart + "&pageSize=" + pageSize; diff --git a/productMods/js/menupage/processDataGetterUtils.js b/productMods/js/menupage/processDataGetterUtils.js index 87c22e55..b5e37834 100644 --- a/productMods/js/menupage/processDataGetterUtils.js +++ b/productMods/js/menupage/processDataGetterUtils.js @@ -11,7 +11,7 @@ var processDataGetterUtils = { "sparqlQuery": processSparqlDataGetterContent, "fixedHtml":processFixedHTMLDataGetterContent, "internalClass":processInternalClassDataGetterContent, - "solrIndividuals":processSolrDataGetterContent}, + "searchIndividuals":processSearchDataGetterContent}, selectDataGetterType:function(pageContentSection) { var contentType = pageContentSection.attr("contentType"); //The form can provide "browse class group" as content type but need to check diff --git a/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl b/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl index 9d92cefa..87b92b2b 100644 --- a/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl +++ b/productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl @@ -103,7 +103,7 @@ <#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" > <#--Passing in object types only if there are any types returned, otherwise -the parameter should not be passed at all to the solr search. +the parameter should not be passed at all to the search. Also multiple types parameter set to true only if more than one type returned--> \ No newline at end of file diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl index 61fddcb0..25e119b4 100644 --- a/productMods/templates/freemarker/lib/lib-home-page.ftl +++ b/productMods/templates/freemarker/lib/lib-home-page.ftl @@ -30,7 +30,7 @@ -<#-- We need the faculty count in order to randomly select 4 faculty using a solr query --> +<#-- We need the faculty count in order to randomly select 4 faculty using a search query --> <#macro facultyMemberCount classGroups> <#assign foundClassGroup = false /> <#list classGroups as group> diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java index 74b52bf6..440d2599 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java @@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** - * Class that adds text from context nodes to Solr Documents for + * Class that adds text from context nodes to Search Documents for * foaf:Agent individuals. */ public class VivoAgentContextNodeFields extends ContextNodeFields{ diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java index 1cc0caf7..ea717983 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java @@ -44,9 +44,9 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel()); - /* Put DocumentModifiers into servlet context for use later in startup by SolrSetup + /* Put DocumentModifiers into servlet context for use later in startup by SearchSetup * This adds the code for VIVO specific additions to the building - * of solr Documents. */ + * of search input Documents. */ List modifiers = (List)context.getAttribute("DocumentModifiers"); if( modifiers == null ){ modifiers = new ArrayList(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java index 189a19f4..3675f67f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java @@ -9,9 +9,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** - * DocumentModifier to populate Solr fields for the basic ISF relationships. + * DocumentModifier to populate Search index fields for the basic ISF relationships. * - * This will add the all rdfs:labels of the related individuals to the solr document. + * This will add the all rdfs:labels of the related individuals to the search document. * * @author bdc34 */ diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java index 4c919d7d..1ffb164f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java @@ -11,14 +11,14 @@ import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeField /* * This DocumentModifier is for the ISF style grants. * It will - * add people's names to the grant's Solr Document - * add the grant's name to the people's Solr Document - * add the grant's name to the Organization's Solr Document - * add the organization's name to the grant's Solr Document - * add the grant's names to the project's Solr Document - * add the people's names to the project's Solr Document - * add the project's name to the grant's Solr Document - * add the project's name to the people's Solr Document + * add people's names to the grant's search Document + * add the grant's name to the people's search Document + * add the grant's name to the Organization's search Document + * add the organization's name to the grant's search Document + * add the grant's names to the project's search Document + * add the people's names to the project's search Document + * add the project's name to the grant's search Document + * add the project's name to the people's search Document */ public class VivoISFGrantFields extends ContextNodeFields { private static String VIVONS = "http://vivoweb.org/ontology/core#"; @@ -35,7 +35,7 @@ public class VivoISFGrantFields extends ContextNodeFields { } /** - * Query to add people's names to the grant's Solr Document. + * Query to add people's names to the grant's search Document. * ?uri is the URI of a grant. */ private static String peopleForGrant = @@ -48,7 +48,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the grant's name to the people's Solr Document. + * Query to add the grant's name to the people's search Document. * ?uri is the URI of a person. */ private static String grantsForPerson = @@ -63,7 +63,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the grant's name to the Organization's Solr Document. + * Query to add the grant's name to the Organization's search Document. * ?uri is the URI of an Organization. */ private static String grantsForOrganization = @@ -76,7 +76,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the organization's name to the grant's Solr Document. + * Query to add the organization's name to the grant's search Document. * ?uri is the URI of a grant. */ private static String organizationsForGrant = @@ -89,7 +89,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the grant's names to the project's Solr Document. + * Query to add the grant's names to the project's search Document. * ?uir is the URI of a Project. */ private static String grantsForProject = @@ -103,7 +103,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the people's names to the project's Solr Document. + * Query to add the people's names to the project's search Document. * ?uri is the URI of a Project. */ private static String peopleForProject = @@ -117,7 +117,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the project's name to the grant's Solr Document. + * Query to add the project's name to the grant's search Document. * ?uri is the URI of a grant. */ private static String projectsForGrant = @@ -133,7 +133,7 @@ public class VivoISFGrantFields extends ContextNodeFields { "}"; /** - * Query to add the project's name to the people's Solr Document. + * Query to add the project's name to the people's search Document. * ?uri is the URI of a person. */ private static String projectsForPerson = diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java index 3623bb71..6ea535d1 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java @@ -10,8 +10,8 @@ import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeField /** * This class will: - * add people's names to organization's Solr Documents. - * add organization names to people's Solr Documents. + * add people's names to organization's search Documents. + * add organization names to people's search Documents. * * @author bdc34 * @@ -31,7 +31,7 @@ public class VivoISFMemberFields extends ContextNodeFields { } /** - * Add people's names to organization's Solr Documents. + * Add people's names to organization's search Documents. */ private static String peopleForOrganization = prefix + @@ -43,7 +43,7 @@ public class VivoISFMemberFields extends ContextNodeFields { "}"; /** - * add organization names to people's Solr Documents. + * add organization names to people's search Documents. */ private static String organizationForPeople = prefix + diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java index 531f711e..54ef0dad 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java @@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields; /** - * Class that adds text from context nodes to Solr Documents for + * Class that adds text from context nodes to search index Documents for * obo:IAO_0000030 individuals. * * @author bdc34 diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index d28a80b5..323e26e2 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -25,7 +25,7 @@ - <#-- supplies the faculty count to the js function that generates a random row number for the solr query --> + <#-- supplies the faculty count to the js function that generates a random row number for the search query --> <@lh.facultyMemberCount vClassGroups! /> <#include "identity.ftl">