From 4e607cde1f0956e15610fa451034474cbe9e5662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6hr?= Date: Wed, 20 Dec 2023 17:16:46 +0100 Subject: [PATCH] Use CSV fixtures and adapt changes from other pull requests --- Tests/Fixtures/Hooks/documents.csv | 14 ++ Tests/Fixtures/Hooks/documents.xml | 222 ------------------- Tests/Fixtures/Hooks/metadata.csv | 12 + Tests/Fixtures/Hooks/metadata.xml | 113 ---------- Tests/Fixtures/Hooks/pages.csv | 7 + Tests/Fixtures/Hooks/pages.xml | 181 --------------- Tests/Fixtures/Hooks/solrcores.csv | 3 + Tests/Fixtures/Hooks/solrcores.xml | 13 -- Tests/Functional/Hooks/DataHandlerTest.php | 8 +- Tests/Functional/Hooks/ItemsProcFuncTest.php | 4 +- 10 files changed, 42 insertions(+), 535 deletions(-) create mode 100644 Tests/Fixtures/Hooks/documents.csv delete mode 100644 Tests/Fixtures/Hooks/documents.xml create mode 100644 Tests/Fixtures/Hooks/metadata.csv delete mode 100644 Tests/Fixtures/Hooks/metadata.xml create mode 100644 Tests/Fixtures/Hooks/pages.csv delete mode 100644 Tests/Fixtures/Hooks/pages.xml create mode 100644 Tests/Fixtures/Hooks/solrcores.csv delete mode 100644 Tests/Fixtures/Hooks/solrcores.xml diff --git a/Tests/Fixtures/Hooks/documents.csv b/Tests/Fixtures/Hooks/documents.csv new file mode 100644 index 000000000..7cb4c7c17 --- /dev/null +++ b/Tests/Fixtures/Hooks/documents.csv @@ -0,0 +1,14 @@ +"tx_dlf_documents",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,"uid","pid","tstamp","crdate","cruser_id","deleted","hidden","starttime","endtime","fe_group","prod_id","location","record_id","opac_id","union_id","urn","purl","title","title_sorting","author","year","place","thumbnail","structure","partof","volume","volume_sorting","license","terms","restrictions","out_of_print","rights_info","collections","mets_label","mets_orderlabel","owner","solrcore","status","document_format" +,1001,20000,1631775000,1631775000,2,0,0,0,0,,,https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml,oai:de:slub-dresden:db:id-476251419,476251419,476251419,,http://digital.slub-dresden.de/id476251419,10 Keyboard pieces - Go. S. 658,10 Keyboard pieces - Go. S. 658,,[1759-1800],[S.l.],https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_tif/jpegs/00000003.tif.thumbnail.jpg,59,0,,,,,,,,,10 Keyboard pieces - Go. S. 658,10 Keyboard pieces - Go. S. 658,10001,1,0,METS +,1002,20000,1631774000,1631774000,2,0,0,0,0,,,https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_mets.xml,oai:de:slub-dresden:db:id-476248086,476248086,476248086,urn:nbn:de:bsz:14-db-id4762480864,http://digital.slub-dresden.de/id476248086,6 Sacred songs - Go. S. 591,6 Sacred songs - Go. S. 591,,[1840-1860],[S.l.],https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_tif/jpegs/00000001.tif.thumbnail.jpg,59,0,,,,,,,,,6 Sacred songs - Go. S. 591,6 Sacred songs - Go. S. 591,10001,1,0,METS +,1003,20000,1631776000,1631776000,2,0,0,0,0,,,https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_mets.xml,oai:de:slub-dresden:db:id-476251729,476251729,476251729,urn:nbn:de:bsz:14-db-id4762517292,http://digital.slub-dresden.de/id476251729,6 Fugues - Go. S. 317,6 Fugues - Go. S. 317,,[um 1820],[S.l.],https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_tif/jpegs/00000001.tif.thumbnail.jpg,59,0,,,,,,,,3,6 Fugues - Go. S. 317,6 Fugues - Go. S. 317,10001,1,0,METS +tx_dlf_collections,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,l18n_parent,l18n_diffsource,hidden,fe_group,fe_cruser_id,fe_admin_lock,label,index_name,index_search,oai_name,description,thumbnail,priority,documents,owner,status,,,,,,,,,,,,,,, +,1101,20000,1631279509,1631279509,2,0,0,"a:8:{s:5:""label"";N;s:10:""index_name"";N;s:8:""oai_name"";N;s:11:""description"";N;s:9:""documents"";N;s:5:""owner"";N;s:6:""status"";N;s:16:""sys_language_uid"";N;}",0,,0,0,Musik,Musik,,music,,,3,0,0,0,,,,,,,,,,,,,,, +,1102,20000,1631279509,1631279509,2,0,0,"a:8:{s:5:""label"";N;s:10:""index_name"";N;s:8:""oai_name"";N;s:11:""description"";N;s:9:""documents"";N;s:5:""owner"";N;s:6:""status"";N;s:16:""sys_language_uid"";N;}",0,,0,0,Collection with single document,collection-with-single-document,,collection-with-single-document,,,4,0,0,0,,,,,,,,,,,,,,, +tx_dlf_relations,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,uid_local,uid_foreign,tablenames,sorting,sorting_foreign,ident,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,1202,1002,1101,,,,docs_colls,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,1203,1003,1101,,,,docs_colls,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,1204,1001,1102,,,,docs_colls,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/Tests/Fixtures/Hooks/documents.xml b/Tests/Fixtures/Hooks/documents.xml deleted file mode 100644 index 562da64ce..000000000 --- a/Tests/Fixtures/Hooks/documents.xml +++ /dev/null @@ -1,222 +0,0 @@ - - - - 1001 - 20000 - 1631775000 - 1631775000 - 2 - 0 - 0 - 0 - 0 - - - https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml - oai:de:slub-dresden:db:id-476251419 - 476251419 - 476251419 - - http://digital.slub-dresden.de/id476251419 - 10 Keyboard pieces - Go. S. 658 - 10 Keyboard pieces - Go. S. 658 - - [1759-1800] - [S.l.] - https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_tif/jpegs/00000003.tif.thumbnail.jpg - 59 - 0 - - - - - - - - - 10 Keyboard pieces - Go. S. 658 - 10 Keyboard pieces - Go. S. 658 - 10001 - 1 - 0 - METS - - - - 1002 - 20000 - 1631774000 - 1631774000 - 2 - 0 - 0 - 0 - 0 - - - https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_mets.xml - oai:de:slub-dresden:db:id-476248086 - 476248086 - 476248086 - urn:nbn:de:bsz:14-db-id4762480864 - http://digital.slub-dresden.de/id476248086 - 6 Sacred songs - Go. S. 591 - 6 Sacred songs - Go. S. 591 - - [1840-1860] - [S.l.] - https://digital.slub-dresden.de/data/kitodo/6Saso_476248086/6Saso_476248086_tif/jpegs/00000001.tif.thumbnail.jpg - 59 - 0 - - - - - - - - - 6 Sacred songs - Go. S. 591 - 6 Sacred songs - Go. S. 591 - 10001 - 1 - 0 - METS - - - - 1003 - 20000 - 1631776000 - 1631776000 - 2 - 0 - 0 - 0 - 0 - - - https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_mets.xml - oai:de:slub-dresden:db:id-476251729 - 476251729 - 476251729 - urn:nbn:de:bsz:14-db-id4762517292 - http://digital.slub-dresden.de/id476251729 - 6 Fugues - Go. S. 317 - 6 Fugues - Go. S. 317 - - [um 1820] - [S.l.] - https://digital.slub-dresden.de/data/kitodo/6FuG_476251729/6FuG_476251729_tif/jpegs/00000001.tif.thumbnail.jpg - 59 - 0 - - - - - - - - 3 - 6 Fugues - Go. S. 317 - 6 Fugues - Go. S. 317 - 10001 - 1 - 0 - METS - - - - 1101 - 20000 - 1631279509 - 1631279509 - 2 - 0 - 0 - 0 - a:8:{s:5:"label";N;s:10:"index_name";N;s:8:"oai_name";N;s:11:"description";N;s:9:"documents";N;s:5:"owner";N;s:6:"status";N;s:16:"sys_language_uid";N;} - 0 - - - 0 - 0 - - Musik - - music - - - 3 - 0 - 0 - 0 - - - - 1102 - 20000 - 1631279509 - 1631279509 - 2 - 0 - 0 - 0 - a:8:{s:5:"label";N;s:10:"index_name";N;s:8:"oai_name";N;s:11:"description";N;s:9:"documents";N;s:5:"owner";N;s:6:"status";N;s:16:"sys_language_uid";N;} - 0 - - - 0 - 0 - - collection-with-single-document - - collection-with-single-document - - - 4 - 0 - 0 - 0 - - - - 1201 - 1001 - 1101 - - - - docs_colls - - - - 1202 - 1002 - 1101 - - - - docs_colls - - - - 1203 - 1003 - 1101 - - - - docs_colls - - - - 1204 - 1001 - 1102 - - - - docs_colls - - diff --git a/Tests/Fixtures/Hooks/metadata.csv b/Tests/Fixtures/Hooks/metadata.csv new file mode 100644 index 000000000..ddeaa9fb7 --- /dev/null +++ b/Tests/Fixtures/Hooks/metadata.csv @@ -0,0 +1,12 @@ +tx_dlf_metadata,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,sys_language_uid,l18n_parent,l18n_diffsource,hidden,sorting,label,index_name,format,default_value,wrap,index_tokenized,index_stored,index_indexed,index_boost,is_sortable,is_facet,is_listed,index_autocomplete,status +,5001,20000,1638557803,1631532810,1,0,0,0,,0,32,Titel,title,1,,,0,1,1,1,1,0,1,1,0 +,5002,20000,1638557803,1631532810,1,0,0,0,,0,32,Sammlungen,collection,1,,,1,0,1,1,0,1,0,0,0 +tx_dlf_metadataformat,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,parent_id,encoded,xpath,xpath_sorting,mandatory,,,,,,,,,,,,,,, +,5101,20000,1638557803,1631532810,1,0,5001,5202,concat(./mods:titleInfo/mods:nonSort,./mods:titleInfo/mods:title,0,,,,,,,,,,,,,,, +,5102,20000,1638557803,1631532810,1,0,5002,5202,"./mods:relatedItem[@type=""series""]/mods:titleInfo/mods:title[@lang=""ger""]",,0,,,,,,,,,,,,,,, +tx_dlf_formats,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,type,root,namespace,class,,,,,,,,,,,,,,,, +,5201,0,1638557803,1631532810,1,0,ALTO,alto,http://www.loc.gov/standards/alto/ns-v2#,Kitodo\Dlf\Format\Alto,,,,,,,,,,,,,,,, +,5202,0,1638557803,1631532810,1,0,MODS,mods,http://www.loc.gov/mods/v3,Kitodo\Dlf\Format\Mods,,,,,,,,,,,,,,,, diff --git a/Tests/Fixtures/Hooks/metadata.xml b/Tests/Fixtures/Hooks/metadata.xml deleted file mode 100644 index 16467ed25..000000000 --- a/Tests/Fixtures/Hooks/metadata.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - 5001 - 20000 - 1638557803 - 1631532810 - 1 - 0 - 0 - 0 - - 0 - 32 - - - title - 1 - - - 0 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 0 - - - - 5002 - 20000 - 1638557803 - 1631532810 - 1 - 0 - 0 - 0 - - 0 - 32 - - - collection - 1 - - - 1 - 0 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - - - - 5101 - 20000 - 1638557803 - 1631532810 - 1 - 0 - 5001 - 5202 - concat(./mods:titleInfo/mods:nonSort," ",./mods:titleInfo/mods:title) - ./mods:titleInfo/mods:title - 0 - - - - 5102 - 20000 - 1638557803 - 1631532810 - 1 - 0 - 5002 - 5202 - ./mods:relatedItem[@type="series"]/mods:titleInfo/mods:title[@lang="ger"] - - 0 - - - - 5201 - 0 - 1638557803 - 1631532810 - 1 - 0 - ALTO - alto - http://www.loc.gov/standards/alto/ns-v2# - Kitodo\Dlf\Format\Alto - - - 5202 - 0 - 1638557803 - 1631532810 - 1 - 0 - MODS - mods - http://www.loc.gov/mods/v3 - Kitodo\Dlf\Format\Mods - - diff --git a/Tests/Fixtures/Hooks/pages.csv b/Tests/Fixtures/Hooks/pages.csv new file mode 100644 index 000000000..44a477c3c --- /dev/null +++ b/Tests/Fixtures/Hooks/pages.csv @@ -0,0 +1,7 @@ +pages,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,hidden,starttime,endtime,fe_group,sorting,rowDescription,editLock,sys_language_uid,l10n_parent,l10n_source,l10n_state,t3_origuid,l10n_diffsource,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_count,t3ver_tstamp,t3ver_move_id,perms_userid,perms_groupid,perms_user,perms_group,perms_everybody,title,slug,doktype,TSconfig,is_siteroot,php_tree_stop,url,shortcut,shortcut_mode,subtitle,layout,target,media,lastUpdated,keywords,cache_timeout,cache_tags,newUntil,description,no_search,SYS_LASTCHANGED,abstract,module,extendToSubpages,author,author_email,nav_title,nav_hide,content_from_pid,mount_pid,mount_pid_ol,l18n_cfg,fe_login_mode,backend_layout,backend_layout_next_level,tsconfig_includes,legacy_overlay_uid,categories +,19999,0,1644840191,1644840051,1,0,0,0,0,,764,,0,0,0,0,,0,a:47:{s:7:"doktype";N;s:5:"title";N;s:4:"slug";N;s:9:"nav_title";N;s:8:"subtitle";N;s:9:"seo_title";N;s:8:"no_index";N;s:9:"no_follow";N;s:14:"canonical_link";N;s:8:"og_title";N;s:14:"og_description";N;s:8:"og_image";N;s:13:"twitter_title";N;s:19:"twitter_description";N;s:13:"twitter_image";N;s:8:"abstract";N;s:8:"keywords";N;s:11:"description";N;s:6:"author";N;s:12:"author_email";N;s:11:"lastUpdated";N;s:6:"layout";N;s:8:"newUntil";N;s:14:"backend_layout";N;s:25:"backend_layout_next_level";N;s:16:"content_from_pid";N;s:6:"target";N;s:13:"cache_timeout";N;s:10:"cache_tags";N;s:11:"is_siteroot";N;s:9:"no_search";N;s:13:"php_tree_stop";N;s:6:"module";N;s:5:"media";N;s:17:"tsconfig_includes";N;s:8:"TSconfig";N;s:8:"l18n_cfg";N;s:6:"hidden";N;s:8:"nav_hide";N;s:9:"starttime";N;s:7:"endtime";N;s:16:"extendToSubpages";N;s:8:"fe_group";N;s:13:"fe_login_mode";N;s:8:"editlock";N;s:10:"categories";N;s:14:"rowDescription";N;},0,0,0,0,0,0,0,1,0,31,27,0,DLF Testing Site,/,254,,1,0,,0,0,,0,,0,0,,0,,0,,0,1644840191,,,0,,,,0,0,0,0,0,0,,,,0,0 +,20000,19999,1644840191,1644840051,1,0,0,0,0,,764,,0,0,0,0,,0,a:47:{s:7:"doktype";N;s:5:"title";N;s:4:"slug";N;s:9:"nav_title";N;s:8:"subtitle";N;s:9:"seo_title";N;s:8:"no_index";N;s:9:"no_follow";N;s:14:"canonical_link";N;s:8:"og_title";N;s:14:"og_description";N;s:8:"og_image";N;s:13:"twitter_title";N;s:19:"twitter_description";N;s:13:"twitter_image";N;s:8:"abstract";N;s:8:"keywords";N;s:11:"description";N;s:6:"author";N;s:12:"author_email";N;s:11:"lastUpdated";N;s:6:"layout";N;s:8:"newUntil";N;s:14:"backend_layout";N;s:25:"backend_layout_next_level";N;s:16:"content_from_pid";N;s:6:"target";N;s:13:"cache_timeout";N;s:10:"cache_tags";N;s:11:"is_siteroot";N;s:9:"no_search";N;s:13:"php_tree_stop";N;s:6:"module";N;s:5:"media";N;s:17:"tsconfig_includes";N;s:8:"TSconfig";N;s:8:"l18n_cfg";N;s:6:"hidden";N;s:8:"nav_hide";N;s:9:"starttime";N;s:7:"endtime";N;s:16:"extendToSubpages";N;s:8:"fe_group";N;s:13:"fe_login_mode";N;s:8:"editlock";N;s:10:"categories";N;s:14:"rowDescription";N;},0,0,0,0,0,0,0,1,0,31,27,0,Data,/data,254,,0,0,,0,0,,0,,0,0,,0,,0,,0,1644840191,,,0,,,,0,0,0,0,0,0,,,,0,0 +sys_template,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,hidden,starttime,endtime,sorting,description,t3_origuid,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_count,t3ver_tstamp,t3ver_move_id,title,sitetitle,root,clear,include_static_file,constants,config,basedOn,includeStaticAfterBasedOn,static_file_mode,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,21001,19999,1644856416,1644856388,1,0,0,0,0,256,,0,0,0,0,0,0,0,0,OAI-PMH Template,,1,3,"EXT:fluid_styled_content/Configuration/TypoScript/,EXT:dlf/Configuration/TypoScript/Plugins/OaiPmh/,EXT:dlf/Configuration/TypoScript/",plugin.tx_dlf.persistence.storagePid = 20000,,,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/Tests/Fixtures/Hooks/pages.xml b/Tests/Fixtures/Hooks/pages.xml deleted file mode 100644 index 8feddf088..000000000 --- a/Tests/Fixtures/Hooks/pages.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - 19999 - 0 - 1644840191 - 1644840051 - 1 - 0 - 0 - 0 - 0 - - 764 - - 0 - 0 - 0 - 0 - - 0 - a:47:{s:7:"doktype";N;s:5:"title";N;s:4:"slug";N;s:9:"nav_title";N;s:8:"subtitle";N;s:9:"seo_title";N;s:8:"no_index";N;s:9:"no_follow";N;s:14:"canonical_link";N;s:8:"og_title";N;s:14:"og_description";N;s:8:"og_image";N;s:13:"twitter_title";N;s:19:"twitter_description";N;s:13:"twitter_image";N;s:8:"abstract";N;s:8:"keywords";N;s:11:"description";N;s:6:"author";N;s:12:"author_email";N;s:11:"lastUpdated";N;s:6:"layout";N;s:8:"newUntil";N;s:14:"backend_layout";N;s:25:"backend_layout_next_level";N;s:16:"content_from_pid";N;s:6:"target";N;s:13:"cache_timeout";N;s:10:"cache_tags";N;s:11:"is_siteroot";N;s:9:"no_search";N;s:13:"php_tree_stop";N;s:6:"module";N;s:5:"media";N;s:17:"tsconfig_includes";N;s:8:"TSconfig";N;s:8:"l18n_cfg";N;s:6:"hidden";N;s:8:"nav_hide";N;s:9:"starttime";N;s:7:"endtime";N;s:16:"extendToSubpages";N;s:8:"fe_group";N;s:13:"fe_login_mode";N;s:8:"editlock";N;s:10:"categories";N;s:14:"rowDescription";N;} - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 31 - 27 - 0 - DLF Testing Site - / - 254 - - 1 - 0 - - 0 - 0 - - 0 - - 0 - 0 - - 0 - - 0 - - 0 - 1644840191 - - - 0 - - - - 0 - 0 - 0 - 0 - 0 - 0 - - - - 0 - 0 - - - - - 20000 - 19999 - 1644840191 - 1644840051 - 1 - 0 - 0 - 0 - 0 - - 764 - - 0 - 0 - 0 - 0 - - 0 - a:47:{s:7:"doktype";N;s:5:"title";N;s:4:"slug";N;s:9:"nav_title";N;s:8:"subtitle";N;s:9:"seo_title";N;s:8:"no_index";N;s:9:"no_follow";N;s:14:"canonical_link";N;s:8:"og_title";N;s:14:"og_description";N;s:8:"og_image";N;s:13:"twitter_title";N;s:19:"twitter_description";N;s:13:"twitter_image";N;s:8:"abstract";N;s:8:"keywords";N;s:11:"description";N;s:6:"author";N;s:12:"author_email";N;s:11:"lastUpdated";N;s:6:"layout";N;s:8:"newUntil";N;s:14:"backend_layout";N;s:25:"backend_layout_next_level";N;s:16:"content_from_pid";N;s:6:"target";N;s:13:"cache_timeout";N;s:10:"cache_tags";N;s:11:"is_siteroot";N;s:9:"no_search";N;s:13:"php_tree_stop";N;s:6:"module";N;s:5:"media";N;s:17:"tsconfig_includes";N;s:8:"TSconfig";N;s:8:"l18n_cfg";N;s:6:"hidden";N;s:8:"nav_hide";N;s:9:"starttime";N;s:7:"endtime";N;s:16:"extendToSubpages";N;s:8:"fe_group";N;s:13:"fe_login_mode";N;s:8:"editlock";N;s:10:"categories";N;s:14:"rowDescription";N;} - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 31 - 27 - 0 - Data - /data - 254 - - 0 - 0 - - 0 - 0 - - 0 - - 0 - 0 - - 0 - - 0 - - 0 - 1644840191 - - - 0 - - - - 0 - 0 - 0 - 0 - 0 - 0 - - - - 0 - 0 - - - - 21001 - 19999 - 1644856416 - 1644856388 - 1 - 0 - 0 - 0 - 0 - 256 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - OAI-PMH Template - - 1 - 3 - EXT:fluid_styled_content/Configuration/TypoScript/,EXT:dlf/Configuration/TypoScript/Plugins/OaiPmh/,EXT:dlf/Configuration/TypoScript/ - plugin.tx_dlf.persistence.storagePid = 20000 - - - 0 - 0 - - - diff --git a/Tests/Fixtures/Hooks/solrcores.csv b/Tests/Fixtures/Hooks/solrcores.csv new file mode 100644 index 000000000..fb54fd748 --- /dev/null +++ b/Tests/Fixtures/Hooks/solrcores.csv @@ -0,0 +1,3 @@ +tx_dlf_solrcores,,,,,,,, +,uid,pid,tstamp,crdate,cruser_id,deleted,label,index_name +,1,20000,1631254345,1631186030,1,0,Controller Solr Testing Core, diff --git a/Tests/Fixtures/Hooks/solrcores.xml b/Tests/Fixtures/Hooks/solrcores.xml deleted file mode 100644 index 28d3ce973..000000000 --- a/Tests/Fixtures/Hooks/solrcores.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - 1 - 20000 - 1631254345 - 1631186030 - 1 - 0 - - - - diff --git a/Tests/Functional/Hooks/DataHandlerTest.php b/Tests/Functional/Hooks/DataHandlerTest.php index e155bc138..c40ae8605 100644 --- a/Tests/Functional/Hooks/DataHandlerTest.php +++ b/Tests/Functional/Hooks/DataHandlerTest.php @@ -12,7 +12,7 @@ namespace Kitodo\Dlf\Tests\Functional\Hooks; -use Kitodo\Dlf\Common\Solr; +use Kitodo\Dlf\Common\Solr\Solr; use Kitodo\Dlf\Domain\Repository\DocumentRepository; use Kitodo\Dlf\Domain\Repository\SolrCoreRepository; use Kitodo\Dlf\Hooks\DataHandler; @@ -26,9 +26,9 @@ public function setUp(): void { parent::setUp(); - $this->importDataSet(__DIR__ . '/../../Fixtures/Hooks/documents.xml'); - $this->importDataSet(__DIR__ . '/../../Fixtures/Hooks/metadata.xml'); - $this->importDataSet(__DIR__ . '/../../Fixtures/Hooks/solrcores.xml'); + $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Hooks/documents.csv'); + $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Hooks/metadata.csv'); + $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Hooks/solrcores.csv'); $this->persistenceManager = $this->objectManager->get(PersistenceManager::class); $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 0); diff --git a/Tests/Functional/Hooks/ItemsProcFuncTest.php b/Tests/Functional/Hooks/ItemsProcFuncTest.php index 9b0928eeb..84d748ba1 100644 --- a/Tests/Functional/Hooks/ItemsProcFuncTest.php +++ b/Tests/Functional/Hooks/ItemsProcFuncTest.php @@ -24,8 +24,8 @@ public function setUp(): void { parent::setUp(); - $this->importDataSet(__DIR__ . '/../../Fixtures/Hooks/pages.xml'); - $this->importDataSet(__DIR__ . '/../../Fixtures/Hooks/metadata.xml'); + $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Hooks/pages.csv'); + $this->importCSVDataSet(__DIR__ . '/../../Fixtures/Hooks/metadata.csv'); $this->persistenceManager = $this->objectManager->get(PersistenceManager::class); $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 0);