From d8c4c2f70be8e2f4f28106fedda8176c8ae66383 Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Fri, 12 Nov 2021 10:37:41 -0800 Subject: [PATCH 1/4] Reallocated test data from top-level input directory to test/data directories for the appropriate test suites The top-level input directory/junk drawer has also been removed --- .../DOI_Requests_ATM-2020-06-30.xlsx | Bin 12892 -> 0 bytes ..._GEO_Apollo_Reserved_Bundles_20200316.xlsx | Bin 11987 -> 0 bytes ...RMS_U-occs-Reserved-2020-05-12_edited.xlsx | Bin 19145 -> 0 bytes input/DOI_Release_20210216_from_draft.json | 41 --- input/DOI_Release_20210216_from_review.json | 63 ---- ...erved_GEO_200318_with_submitter_email.xlsx | Bin 4173 -> 0 bytes ...bmitted_records_Reserved-only_20200304.csv | 119 ------ input/draft_dir_zero_file/some.csv | 0 .../core/actions/test/check_test.py | 2 +- .../data}/DOI_Release_20200727_from_error.xml | 0 .../DOI_Release_20200727_from_register.xml | 0 .../DOI_Release_20200727_from_release.xml | 0 .../DOI_Release_20200727_from_reserve.xml | 0 .../DOI_Release_20200727_from_review.xml | 0 .../DOI_Release_20210615_from_release.json | 0 .../test/data}/DOI_Reserved_GEO_200318.csv | 0 ..._GEO_200318_with_corrected_identifier.xlsx | Bin .../actions/test/data}/DOI_Reserved_PDS3.csv | 0 .../data}/bundle_in_with_contributors.xml | 0 .../bundle_in_with_doi_and_contributors.xml | 0 .../bundle_in_with_contributors.xml | 0 .../data}/draft_dir_two_files/bundle_in.xml | 0 .../bundle_in_with_contributors.xml | 0 .../core/actions/test/list_test.py | 2 +- .../core/actions/test/release_test.py | 2 +- .../core/actions/test/reserve_test.py | 2 +- .../core/actions/test/update_test.py | 2 +- .../test/data}/DOI-reserve-blank-rows.csv | 0 .../test/data}/DOI-reserve-blank-rows.xlsx | Bin .../input/test/data}/DOI-reserve-broken.csv | 0 .../input/test/data}/DOI-reserve-broken.xlsx | Bin .../test/data}/DOI-reserve-optionals.csv | 0 .../test/data}/DOI-reserve-optionals.xlsx | Bin .../DOI_Release_20200727_from_reserve.xml | 68 ++++ .../DOI_Release_20210216_from_reserve.json | 0 ...lease_20210216_from_reserve_utf-8-bom.json | 0 .../DOI_Release_20210615_from_reserve.json | 0 .../input/test/data}/DOI_Release_PDS3.xml | 0 .../test/data/DOI_Reserved_GEO_200318.csv | 4 + .../test/data}/DOI_Reserved_GEO_200318.xlsx | Bin ...served_GEO_200318_invalid_column_names.csv | 0 ...erved_GEO_200318_invalid_column_names.xlsx | Bin ...rved_GEO_200318_malformed_column_names.csv | 0 ...ved_GEO_200318_malformed_column_names.xlsx | Bin ..._GEO_200318_with_corrected_identifier.xlsx | Bin 0 -> 8997 bytes ..._Reserved_GEO_200318_with_invalid_rows.csv | 0 ...Reserved_GEO_200318_with_invalid_rows.xlsx | Bin .../input/test/data/DOI_Reserved_PDS3.csv | 2 + .../test/data/bundle_in_with_contributors.xml | 16 +- .../bundle_in_with_contributors_utf-8-bom.xml | 0 .../bundle_in_with_doi_and_contributors.xml | 124 +++++++ .../data/draft_dir_two_files}/bundle_in.xml | 4 +- .../bundle_in_with_contributors.xml | 124 +++++++ ...tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json | 0 .../core/input/test/input_util_test.py | 2 +- .../core/input/test/pds4_util_test.py | 2 +- .../data/DOI_Release_20200727_from_error.xml | 70 ++++ .../DOI_Release_20200727_from_release.xml | 5 +- .../DOI_Release_20210216_from_error.json | 0 .../DOI_Release_20210216_from_release.json | 0 .../DOI_Release_20210615_from_release.json | 340 ++++++++++++++++++ .../DOI_Release_20210615_from_reserve.json | 210 +++++++++++ .../test/data}/DOI_Reserved_multi_entry.json | 0 .../core/outputs/test/datacite_test.py | 8 +- .../core/outputs/test/osti_test.py | 12 +- 65 files changed, 971 insertions(+), 253 deletions(-) delete mode 100644 input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx delete mode 100644 input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx delete mode 100644 input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx delete mode 100644 input/DOI_Release_20210216_from_draft.json delete mode 100644 input/DOI_Release_20210216_from_review.json delete mode 100644 input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx delete mode 100644 input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv delete mode 100644 input/draft_dir_zero_file/some.csv rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20200727_from_error.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20200727_from_register.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20200727_from_release.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20200727_from_reserve.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20200727_from_review.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Release_20210615_from_release.json (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Reserved_GEO_200318.csv (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx (100%) rename {input => src/pds_doi_service/core/actions/test/data}/DOI_Reserved_PDS3.csv (100%) rename {input => src/pds_doi_service/core/actions/test/data}/bundle_in_with_contributors.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/bundle_in_with_doi_and_contributors.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/draft_dir_one_file/bundle_in_with_contributors.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/draft_dir_two_files/bundle_in.xml (100%) rename {input => src/pds_doi_service/core/actions/test/data}/draft_dir_two_files/bundle_in_with_contributors.xml (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-blank-rows.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-blank-rows.xlsx (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-broken.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-broken.xlsx (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-optionals.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI-reserve-optionals.xlsx (100%) create mode 100644 src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml rename {input => src/pds_doi_service/core/input/test/data}/DOI_Release_20210216_from_reserve.json (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Release_20210216_from_reserve_utf-8-bom.json (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Release_20210615_from_reserve.json (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Release_PDS3.xml (100%) create mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318.xlsx (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_invalid_column_names.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_invalid_column_names.xlsx (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_malformed_column_names.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_malformed_column_names.xlsx (100%) create mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_with_invalid_rows.csv (100%) rename {input => src/pds_doi_service/core/input/test/data}/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx (100%) create mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv rename input/bundle_in_original.xml => src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml (92%) rename {input => src/pds_doi_service/core/input/test/data}/bundle_in_with_contributors_utf-8-bom.xml (100%) create mode 100644 src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml rename {input => src/pds_doi_service/core/input/test/data/draft_dir_two_files}/bundle_in.xml (98%) create mode 100644 src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml rename {input => src/pds_doi_service/core/input/test/data}/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json (100%) create mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml rename input/DOI_Release_20200727_from_draft.xml => src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml (97%) rename {input => src/pds_doi_service/core/outputs/test/data}/DOI_Release_20210216_from_error.json (100%) rename {input => src/pds_doi_service/core/outputs/test/data}/DOI_Release_20210216_from_release.json (100%) create mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json create mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json rename {input => src/pds_doi_service/core/outputs/test/data}/DOI_Reserved_multi_entry.json (100%) diff --git a/input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx b/input/ATMOS_reserve_Insight_Bundle_20200624/aaaSubmitted_by_ATMOS_reserve_2020624/DOI_Requests_ATM-2020-06-30.xlsx deleted file mode 100644 index dabf2d92a513fa8f31d8c9dd77f7c156766c3ff2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12892 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 diff --git a/input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx b/input/DOI_GEO_Apollo_Reserved_Bundles_20200316.xlsx deleted file mode 100644 index ae837fcdcf49abea82cb7e46c763b7fc1b7019e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11987 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 UIEV%T02IiJ1|s7RuYNoGKaPPGUH||9 diff --git a/input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx b/input/DOI_RMS_U-occs-Reserved-2020-05-12_edited.xlsx deleted file mode 100644 index 90482395cec0b98f0a523a44f8bf28ef32c84b07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19145 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 diff --git a/input/DOI_Release_20210216_from_draft.json b/input/DOI_Release_20210216_from_draft.json deleted file mode 100644 index 3be5a5c6..00000000 --- a/input/DOI_Release_20210216_from_draft.json +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - "status": "draft", - "title": "InSight Cameras Bundle", - "sponsoring_organization": "National Aeronautics and Space Administration (NASA)", - "accession_number": "urn:nasa:pds:insight_cameras::1.0", - "publisher": "NASA Planetary Data System", - "availability": "NASA Planetary Data System", - "publication_date": "2019-01-01", - "country": "US", - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "site_url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "product_type": "Dataset", - "product_type_specific": "PDS4 Refereed Data Bundle", - "date_record_added": "2021-04-01", - "keywords": "PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science", - "authors": [ - { - "first_name": "R.", - "last_name": "Deen" - }, - { - "first_name": "H.", - "last_name": "Abarca" - }, - { - "first_name": "P.", - "last_name": "Zamani" - }, - { - "first_name": "J.", - "last_name": "Maki" - } - ], - "contributors": [], - "contact_name": "PDS Operator", - "contact_org": "PDS", - "contact_email": "pds-operator@jpl.nasa.gov", - "contact_phone": "818.393.7165" - } -] diff --git a/input/DOI_Release_20210216_from_review.json b/input/DOI_Release_20210216_from_review.json deleted file mode 100644 index 2714992b..00000000 --- a/input/DOI_Release_20210216_from_review.json +++ /dev/null @@ -1,63 +0,0 @@ -[ - { - "status": "review", - "id": "29569", - "title": "InSight Cameras Bundle", - "doi": "10.17189/29569", - "sponsoring_organization": "National Aeronautics and Space Administration (NASA)", - "accession_number": "urn:nasa:pds:insight_cameras::1.0", - "publisher": "NASA Planetary Data System", - "availability": "NASA Planetary Data System", - "publication_date": "2019-01-01", - "country": "US", - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "site_url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "product_type": "Dataset", - "product_type_specific": "PDS4 Refereed Data Bundle", - "date_record_added": "2021-04-01", - "keywords": "PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science", - "authors": [ - { - "first_name": "R.", - "last_name": "Deen" - }, - { - "first_name": "H.", - "last_name": "Abarca" - }, - { - "first_name": "P.", - "last_name": "Zamani" - }, - { - "first_name": "J.", - "last_name": "Maki" - } - ], - "contributors": [ - { - "last_name": "Smith", - "first_name": "P. H.", - "contributor_type": "Editor" - }, - { - "last_name": "Lemmon", - "first_name": "M.", - "contributor_type": "Editor" - }, - { - "last_name": "Beebe", - "first_name": "R. F.", - "contributor_type": "Editor" - }, - { - "full_name": "Planetary Data System: Engineering Node", - "contributor_type": "DataCurator" - } - ], - "contact_name": "PDS Operator", - "contact_org": "PDS", - "contact_email": "pds-operator@jpl.nasa.gov", - "contact_phone": "818.393.7165" - } -] diff --git a/input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx b/input/DOI_Reserved_GEO_200318_with_submitter_email.xlsx deleted file mode 100644 index 50613c157fbab3b10e7b7bd84c755b529eb1e1a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4173 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 diff --git a/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv b/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv deleted file mode 100644 index e535f92b..00000000 --- a/input/OSTI_IAD_submitted_records_Reserved-only_20200304.csv +++ /dev/null @@ -1,119 +0,0 @@ -site_code,title,accession_number,doi,publication_date,product_type,product_type_specific,date_record_added,date_record_updated,authors_author_first_name,authors_author_last_name,authors_author_affiliations,authors_author,authors,contributors,related_identifiers, -"NASA-PDS","Cassini ISS Observations of the Saturn System","urn:nasa:pds:cassini_iss_saturn","10.17189/1504133","2019-09-15","Collection","PDS4 Bundle Product","2019-07-23","2019-07-23","Carolyn","Porco","","","","","","" -"NASA-PDS","Cassini VIMS Observations of the Saturn System","urn:nasa:pds:cassini_vims_saturn","10.17189/1504134","2019-09-15","Collection","PDS4 Bundle Product","2019-07-23","2019-07-23","R. H.","Brown","","","","","","" -"NASA-PDS","Cassini Imaging Science Subsystem (ISS) Data User's Guide","urn:nasa:pds:cassini_iss_saturn:document:iss-data-user-guide","10.17189/1504135","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","Benjamin","Knowles","","","","","","" -"NASA-PDS","Cassini VIMS IR Pixel Timing","urn:nasa:pds:cassini_vims_saturn:document:vims-ir-pixel-timing","10.17189/1504136","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","R. H.","Brown","","","","","","" -"NASA-PDS","The VIMS Wavelength and Radiometric Calibration 19, Final Report","urn:nasa:pds:cassini_vims_saturn:document:vims-wavelength-and-radiometric-calibration-report","10.17189/1504137","2019-09-15","Dataset","PDS4 Document Product","2019-07-23","2019-07-23","R. N.","Clark","","","","","","" -"NASA-PDS","Cassini ISS Observations from Launch to Entry in the Saturn System, including the Jupiter Encounter","urn:nasa:pds:cassini_iss_cruise","10.17189/1504154","2019-09-15","Collection","PDS4 Bundle Product","2019-07-29","2019-07-29","Carolyn","Porco","","","","","","" -"NASA-PDS","Cassini VIMS Observations from Launch to Entry in the Saturn System, including the Jupiter Encounter","urn:nasa:pds:cassini_vims_cruise","10.17189/1504155","2019-09-15","Collection","PDS4 Bundle Product","2019-07-29","2019-07-29","R. H.","Brown","","","","","","" -"NASA-PDS","Apollo 17 Surface Electrical Properties Experiment Calibrated ASCII Data Bundle","urn:nasa:pds:a17sep","10.17189/1518359","2020-02-24","Collection","PDS4 Bundle Product","2020-02-27","2020-02-27","D.R.","Williams","","","","","","" -"NASA-PDS","MAVEN Particle and Fields instrument Data Return Files (DRF) Collection","10.17189/1517674","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","Mars InSight Lander HP3 Data Archive","urn:nasa:pds:insight_hp3_tem","10.17189/1517573","2020-01-01","Collection","PDS4 Bundle Product","2020-01-08","2020-01-08","Tilman","Spohn","","","","","","" -"NASA-PDS","MAVEN Periapsis Timing Estimator Data Return Files (DRF) Collection","10.17189/1517675","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Periapsis Timing Estimator Data Return Files (DRF) Collection","10.17189/1517676","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Remote Sensing (IUVS) instrument Data Return Files (DRF) Collection","10.17189/1517677","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 1 Data Return Files (DRF) Collection","10.17189/1517678","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 2 Data Return Files (DRF) Collection","10.17189/1517679","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Solar Array Switch Module 3 Data Return Files (DRF) Collection","10.17189/1517680","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 1 Data Return Files (DRF) Collection","10.17189/1517681","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 2 Data Return Files (DRF) Collection","10.17189/1517682","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 3 Data Return Files (DRF) Collection","10.17189/1517683","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 4 Data Return Files (DRF) Collection","10.17189/1517684","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 5 Data Return Files (DRF) Collection","10.17189/1517685","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Universal Switching Module 6 Data Return Files (DRF) Collection","10.17189/1517686","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Events List Data Collection","10.17189/1517687","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Intertial Measurement Unit Data Collection","10.17189/1517688","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","Uranus System Occultation of star u17b (Hipparcos 80841) Observed from the SAAO 188cm Telescope Data Bundle","urn:nasa:pds:uranus_occ_u17b_saao_188cm","10.17189/1517613","2020-01-23","Collection","PDS4 Bundle Product","2020-01-23","2020-01-23","R. G.","French","","","","","","" -"NASA-PDS","Data Collection for the Uranus System occultation of star u17b (Hipparcos 80841) Observed from the SAAO 188cm Telescope.","urn:nasa:pds:uranus_occ_u17b_saao_188cm:data::1.0","10.17189/1517614","2020-01-23","Dataset","PDS4 Collection Product","2020-01-23","2020-01-23","R. G.","French","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) Calibrated Data Bundle","10.17189/1517689","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) calibrated irradiances Data Collection","10.17189/1517690","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) Modelled Data Bundle","10.17189/1517691","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) daily averaged modelled irradiance spectra Data Collection","10.17189/1517692","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Extreme ultraviolet (EUV) minute averaged modelled irradiance spectra Data Collection","10.17189/1517693","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Frank","Eparvier","","","","","","" -"NASA-PDS","MAVEN Insitu Key Parameters Data Bundle","10.17189/1517694","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Patrick","Dunn","","","","","","" -"NASA-PDS","MAVEN Insitu Key Parameters Data Collection","10.17189/1517695","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Patrick","Dunn","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Data Bundle","10.17189/1517696","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Current-Voltage Relationships Data Collection","10.17189/1517697","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Spacecraft Potential Data Collection","10.17189/1517698","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Low Frequency Electric-Field Data Collection","10.17189/1517699","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) High Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517700","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Low Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517701","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Medium Frequency Burst Mode Calibrated Electric-Field Data Collection","10.17189/1517702","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Active Mode Spectra Data Collection","10.17189/1517703","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Calibrated Passive Mode Spectra Data Collection","10.17189/1517704","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Data Bundle","10.17189/1517705","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Electron Temperature Data Collection","10.17189/1517706","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Derived Electron Density Data Collection","10.17189/1517707","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Data Bundle","10.17189/1517708","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Potentials Data Collection","10.17189/1517709","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Active DAC Readback Data Collection","10.17189/1517710","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Active Table Readback Data Collection","10.17189/1517711","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Raw Extreme ultraviolet (EUV) Packet Data Collection","10.17189/1517712","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw High Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517713","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Low Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517714","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Medium Frequency High Speed Burst Mode (HSBM) Data Collection","10.17189/1517715","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Housekeeping Data Collection","10.17189/1517716","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Potentials Data Collection","10.17189/1517717","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in High Frequency Range Data Collection","10.17189/1517718","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in High Frequency Range Data Collection","10.17189/1517719","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in Low Frequency Range Data Collection","10.17189/1517720","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in Low Frequency Range Data Collection","10.17189/1517721","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Active Sub-Cycle Onboard FFT in Medium Frequency Range Data Collection","10.17189/1517722","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Wave Passive Sub-Cycle Onboard FFT in Medium Frequency Range Data Collection","10.17189/1517723","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Langmuir Probe Sensor 1 Sub-Cycle Sweep Data Collection","10.17189/1517724","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Langmuir Probe and Waves (LPW) Raw Langmuir Probe Sensor 2 Sub-Cycle Sweep Data Collection","10.17189/1517725","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Laila","Anderson","","","","","","" -"NASA-PDS","MAVEN Magnetometer (MAG) Calibrated Data Bundle","10.17189/1517726","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in planetocentric coordinates Data Collection","10.17189/1517727","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in payload coordinates Data Collection","10.17189/1517728","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN Tabulated vector magnetic field vs. time in Sun-state coordinates Data Collection","10.17189/1517729","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jack","Connerney","","","","","","" -"NASA-PDS","MAVEN ROSE Calibrated Data Bundle","10.17189/1517730","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Sky and Resudual Frequencies Data Collection","10.17189/1517731","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Derived Data Bundle","10.17189/1517732","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Electron Density Profile Data Collection","10.17189/1517733","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Raw Data Bundle","10.17189/1517734","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Radio Science Receiver (RSR) Data Collection","10.17189/1517735","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN ROSE Radio Science Tracking and Navigation File (TNF) Data Collection","10.17189/1517736","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Paul","Withers","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Calibrated Data Bundle","10.17189/1517737","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Ancillary Data Collection","10.17189/1517738","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Robert","Lillis","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Raw Ion and Electron Counts Data Collection","10.17189/1517739","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN Solar Energetic Particle (SEP) Calibrated Ion and Electron Spectra Data Collection","10.17189/1517740","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Davin","Larson","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Data Bundle","10.17189/1517741","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Housekeeping Data Collection","10.17189/1517742","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 64 Energy x 2 Mass Bins Data Collection","10.17189/1517743","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy x 32 Mass Bins Data Collection","10.17189/1517744","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 4 Energy X 64 Mass Bins Data Collection","10.17189/1517745","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 64 Mass Bins Data Collection","10.17189/1517746","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","Uranus Occultation Support Bundle","urn:nasa:pds:uranus_occ_support","10.17189/1517663","2020-02-01","Collection","PDS4 Bundle Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","Data Collection for the Uranus Occultation Support Bundle","urn:nasa:pds:uranus_occ_support:data","10.17189/1517664","2020-02-01","Collection","PDS4 Collection Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","Earth-based Uranus Stellar Occultations User Guide","urn:nasa:pds:uranus_occ_support:document:earth_based_uranus_stellar_occultation_user_guide","10.17189/1517665","2020-02-01","Dataset","PDS4 Document Product","2020-02-03","2020-02-03","R. G.","French","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 16 Solid Angle Bins Data Collection","10.17189/1517747","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle Bins Data Collection","10.17189/1517748","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 8 Solid Angle X 32 Mass Bins Data Collection","10.17189/1517749","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN Ancillary Bundle","10.17189/1517670","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Electrical Power System Data Return Files (DRF) Data Collection","10.17189/1517671","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Guidance Navigation and Control Data Return Files (DRF) Data Collection","10.17189/1517672","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN Neutral Gas and Ion Mass Spectrometer (NGIMS) instrument Data Return Files (DRF) Data Collection","10.17189/1517673","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Bryan","Harter","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 32 Energy X 8 Solid Angle X 32 Mass Bins Data Collection","10.17189/1517750","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle Bins Data Collection","10.17189/1517751","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 16 Mass Bins Data Collection","10.17189/1517752","2019-05-12","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 8 Mass Bins Data Collection","10.17189/1517753","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 16 Energy X 64 Solid Angle X 8 Mass Bins Data Collection","10.17189/1517754","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Calibrated Energy Flux: 64 Solid Angle X 2 Mass Bins Data Collection","10.17189/1517755","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Raw Event Data Data Collection","10.17189/1517756","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Fast Housekeeping Data Collection","10.17189/1517757","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data: 12 Rate Channels Summed Over a Single Spin Data Collection","10.17189/1517758","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data: 12 Rate Channels Summed Over Multiple Spins Data Collection","10.17189/1517759","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Event Rate Data Selected Channel Data Collection","10.17189/1517760","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN SupraThermal And Thermal Ion Composition (STATIC) Raw Time-of-Flight Data Data Collection","10.17189/1517761","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","James","McFadden","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Calibrated Data Bundle","10.17189/1517762","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Archive Rate 3D Electron Distributions Data Collection","10.17189/1517763","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Archive Rate Electron Pitch Angle Distributions Data Collection","10.17189/1517764","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate 3D Electron Distributions Data Collection","10.17189/1517765","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate Electron Pitch Angle Distributions Data Collection","10.17189/1517766","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Electron Analyzer (SWEA) Survey Rate Omni-Directional Electron Energy Spectra Data Collection","10.17189/1517767","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","David","Mitchell","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Data Bundle","10.17189/1517768","2021-03-02","Collection","PDS4 Bundle","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Coarse Archive 3D Data Collection","10.17189/1517769","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Coarse Survey 3D Data Collection","10.17189/1517770","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Fine Archive 3D Data Collection","10.17189/1517771","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Fine Survey 3D Data Collection","10.17189/1517772","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" -"NASA-PDS","MAVEN Solar Wind Ion Analyzer (SWIA) Calibrated Onboard Survey Moment Data Collection","10.17189/1517773","2021-03-02","Dataset","PDS4 Collection","2020-02-06","2020-02-06","Jasper","Halekas","","","","","","" diff --git a/input/draft_dir_zero_file/some.csv b/input/draft_dir_zero_file/some.csv deleted file mode 100644 index e69de29b..00000000 diff --git a/src/pds_doi_service/core/actions/test/check_test.py b/src/pds_doi_service/core/actions/test/check_test.py index 754c8a71..af9b4c2b 100644 --- a/src/pds_doi_service/core/actions/test/check_test.py +++ b/src/pds_doi_service/core/actions/test/check_test.py @@ -29,7 +29,7 @@ class CheckActionTestCase(unittest.TestCase): test_dir = resource_filename(__name__, "") - input_dir = abspath(join(test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + input_dir = abspath(join(test_dir, "data")) @classmethod def setUp(cls): diff --git a/input/DOI_Release_20200727_from_error.xml b/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_error.xml similarity index 100% rename from input/DOI_Release_20200727_from_error.xml rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_error.xml diff --git a/input/DOI_Release_20200727_from_register.xml b/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_register.xml similarity index 100% rename from input/DOI_Release_20200727_from_register.xml rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_register.xml diff --git a/input/DOI_Release_20200727_from_release.xml b/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_release.xml similarity index 100% rename from input/DOI_Release_20200727_from_release.xml rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_release.xml diff --git a/input/DOI_Release_20200727_from_reserve.xml b/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_reserve.xml similarity index 100% rename from input/DOI_Release_20200727_from_reserve.xml rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_reserve.xml diff --git a/input/DOI_Release_20200727_from_review.xml b/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_review.xml similarity index 100% rename from input/DOI_Release_20200727_from_review.xml rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_review.xml diff --git a/input/DOI_Release_20210615_from_release.json b/src/pds_doi_service/core/actions/test/data/DOI_Release_20210615_from_release.json similarity index 100% rename from input/DOI_Release_20210615_from_release.json rename to src/pds_doi_service/core/actions/test/data/DOI_Release_20210615_from_release.json diff --git a/input/DOI_Reserved_GEO_200318.csv b/src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318.csv rename to src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318.csv diff --git a/input/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx b/src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx rename to src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx diff --git a/input/DOI_Reserved_PDS3.csv b/src/pds_doi_service/core/actions/test/data/DOI_Reserved_PDS3.csv similarity index 100% rename from input/DOI_Reserved_PDS3.csv rename to src/pds_doi_service/core/actions/test/data/DOI_Reserved_PDS3.csv diff --git a/input/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml similarity index 100% rename from input/bundle_in_with_contributors.xml rename to src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml diff --git a/input/bundle_in_with_doi_and_contributors.xml b/src/pds_doi_service/core/actions/test/data/bundle_in_with_doi_and_contributors.xml similarity index 100% rename from input/bundle_in_with_doi_and_contributors.xml rename to src/pds_doi_service/core/actions/test/data/bundle_in_with_doi_and_contributors.xml diff --git a/input/draft_dir_one_file/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml similarity index 100% rename from input/draft_dir_one_file/bundle_in_with_contributors.xml rename to src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml diff --git a/input/draft_dir_two_files/bundle_in.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml similarity index 100% rename from input/draft_dir_two_files/bundle_in.xml rename to src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml diff --git a/input/draft_dir_two_files/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml similarity index 100% rename from input/draft_dir_two_files/bundle_in_with_contributors.xml rename to src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml diff --git a/src/pds_doi_service/core/actions/test/list_test.py b/src/pds_doi_service/core/actions/test/list_test.py index d437b2e5..7577faef 100644 --- a/src/pds_doi_service/core/actions/test/list_test.py +++ b/src/pds_doi_service/core/actions/test/list_test.py @@ -34,7 +34,7 @@ class ListActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.db_name = join(cls.test_dir, "doi_temp.db") cls._list_action = DOICoreActionList(db_name=cls.db_name) cls._reserve_action = DOICoreActionReserve(db_name=cls.db_name) diff --git a/src/pds_doi_service/core/actions/test/release_test.py b/src/pds_doi_service/core/actions/test/release_test.py index 5f9d7637..2c8e0add 100644 --- a/src/pds_doi_service/core/actions/test/release_test.py +++ b/src/pds_doi_service/core/actions/test/release_test.py @@ -26,7 +26,7 @@ class ReleaseActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) # Remove db_name if exist to have a fresh start otherwise exception will be # raised about using existing lidvid. diff --git a/src/pds_doi_service/core/actions/test/reserve_test.py b/src/pds_doi_service/core/actions/test/reserve_test.py index 60ea9191..cba82eeb 100644 --- a/src/pds_doi_service/core/actions/test/reserve_test.py +++ b/src/pds_doi_service/core/actions/test/reserve_test.py @@ -27,7 +27,7 @@ class ReserveActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) # Remove db_name if exist to have a fresh start otherwise exception will be # raised about using existing lidvid. diff --git a/src/pds_doi_service/core/actions/test/update_test.py b/src/pds_doi_service/core/actions/test/update_test.py index 964492db..d4b72d25 100644 --- a/src/pds_doi_service/core/actions/test/update_test.py +++ b/src/pds_doi_service/core/actions/test/update_test.py @@ -32,7 +32,7 @@ class UpdateActionTestCase(unittest.TestCase): @classmethod def setUpClass(cls) -> None: cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.db_name = join(cls.test_dir, "doi_temp.db") cls._update_action = DOICoreActionUpdate(db_name=cls.db_name) cls._reserve_action = DOICoreActionReserve(db_name=cls.db_name) diff --git a/input/DOI-reserve-blank-rows.csv b/src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.csv similarity index 100% rename from input/DOI-reserve-blank-rows.csv rename to src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.csv diff --git a/input/DOI-reserve-blank-rows.xlsx b/src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.xlsx similarity index 100% rename from input/DOI-reserve-blank-rows.xlsx rename to src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.xlsx diff --git a/input/DOI-reserve-broken.csv b/src/pds_doi_service/core/input/test/data/DOI-reserve-broken.csv similarity index 100% rename from input/DOI-reserve-broken.csv rename to src/pds_doi_service/core/input/test/data/DOI-reserve-broken.csv diff --git a/input/DOI-reserve-broken.xlsx b/src/pds_doi_service/core/input/test/data/DOI-reserve-broken.xlsx similarity index 100% rename from input/DOI-reserve-broken.xlsx rename to src/pds_doi_service/core/input/test/data/DOI-reserve-broken.xlsx diff --git a/input/DOI-reserve-optionals.csv b/src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.csv similarity index 100% rename from input/DOI-reserve-optionals.csv rename to src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.csv diff --git a/input/DOI-reserve-optionals.xlsx b/src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.xlsx similarity index 100% rename from input/DOI-reserve-optionals.xlsx rename to src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml b/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml new file mode 100644 index 00000000..5356615b --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml @@ -0,0 +1,68 @@ + + + 29569 + InSight Cameras Bundle + 10.17189/29569 + National Aeronautics and Space Administration (NASA) + urn:nasa:pds:insight_cameras::1.0 + NASA Planetary Data System + NASA Planetary Data System + 2019-01-01 + US + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0 + Dataset + PDS4 Refereed Data Bundle + 2021-04-01 + PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science + + + Deen + R. + + + Abarca + H. + + + Zamani + P. + + + Maki + J. + + + + + + Smith + P. H. + Editor + + + + + Lemmon + M. + Editor + + + + + Beebe + R. F. + Editor + + + + Planetary Data System: Engineering Node + DataCurator + + + PDS Operator + PDS + pds-operator@jpl.nasa.gov + 818.393.7165 + + diff --git a/input/DOI_Release_20210216_from_reserve.json b/src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve.json similarity index 100% rename from input/DOI_Release_20210216_from_reserve.json rename to src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve.json diff --git a/input/DOI_Release_20210216_from_reserve_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve_utf-8-bom.json similarity index 100% rename from input/DOI_Release_20210216_from_reserve_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve_utf-8-bom.json diff --git a/input/DOI_Release_20210615_from_reserve.json b/src/pds_doi_service/core/input/test/data/DOI_Release_20210615_from_reserve.json similarity index 100% rename from input/DOI_Release_20210615_from_reserve.json rename to src/pds_doi_service/core/input/test/data/DOI_Release_20210615_from_reserve.json diff --git a/input/DOI_Release_PDS3.xml b/src/pds_doi_service/core/input/test/data/DOI_Release_PDS3.xml similarity index 100% rename from input/DOI_Release_PDS3.xml rename to src/pds_doi_service/core/input/test/data/DOI_Release_PDS3.xml diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv new file mode 100644 index 00000000..8c87cda6 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv @@ -0,0 +1,4 @@ +status,title,publication_date,product_type_specific,author_last_name,author_first_name,related_resource +Reserved,Laboratory Shocked Feldspars Collection #1,2020-03-11,PDS4 Collection,Johnson,J. R.,urn:nasa:pds:lab_shocked_feldspars::10.0 +Reserved,Laboratory Shocked Feldspars Collection #2,2020-03-12,PDS4 Collection,Johnson_2,J2. R2.,urn:nasa:pds:lab_shocked_feldspars_2::10.0 +Reserved,Laboratory Shocked Feldspars Collection #3,2020-03-13,PDS4 Collection,Johnson_3,J3. R3.,urn:nasa:pds:lab_shocked_feldspars_3::10.0 diff --git a/input/DOI_Reserved_GEO_200318.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318.xlsx rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.xlsx diff --git a/input/DOI_Reserved_GEO_200318_invalid_column_names.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_invalid_column_names.csv rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.csv diff --git a/input/DOI_Reserved_GEO_200318_invalid_column_names.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_invalid_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.xlsx diff --git a/input/DOI_Reserved_GEO_200318_malformed_column_names.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_malformed_column_names.csv rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.csv diff --git a/input/DOI_Reserved_GEO_200318_malformed_column_names.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_malformed_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..37d9c45f02d5c23109121a87aae645b199e1ee14 GIT binary patch literal 8997 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 literal 0 HcmV?d00001 diff --git a/input/DOI_Reserved_GEO_200318_with_invalid_rows.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.csv similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_invalid_rows.csv rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.csv diff --git a/input/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx similarity index 100% rename from input/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx rename to src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv new file mode 100644 index 00000000..0e440217 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv @@ -0,0 +1,2 @@ +status,title,publication_date,product_type_specific,author_last_name,author_first_name,related_resource +Reserved,LRO MOON MINI-RF 2/3/5 BISTATIC RADAR V3.0,2019-12-13,PDS3 Dataset,Santo,Andrew,LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0 diff --git a/input/bundle_in_original.xml b/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml similarity index 92% rename from input/bundle_in_original.xml rename to src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml index c2b3201d..6aa7a7de 100644 --- a/input/bundle_in_original.xml +++ b/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml @@ -1,9 +1,6 @@ - > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://pds.nasa.gov/pds4/pds/v1"> urn:nasa:pds:insight_cameras 1.0 @@ -11,7 +8,14 @@ href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1B10.sch" schematypens="http://p 1.11.1.0 Product_Bundle -R., Deen; H., Abarca; P., Zamani; J.Maki +R. Deen, H. Abarca, P. Zamani, J.Maki + + + +Smith, P. H.; Lemmon, M.; Beebe, R. F. + + + 2019 InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products diff --git a/input/bundle_in_with_contributors_utf-8-bom.xml b/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors_utf-8-bom.xml similarity index 100% rename from input/bundle_in_with_contributors_utf-8-bom.xml rename to src/pds_doi_service/core/input/test/data/bundle_in_with_contributors_utf-8-bom.xml diff --git a/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml b/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml new file mode 100644 index 00000000..44810a0d --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml @@ -0,0 +1,124 @@ + + + urn:nasa:pds:insight_cameras + 1.0 + InSight Cameras Bundle + 1.11.1.0 + Product_Bundle + + 10.17189/29569 + R. Deen, H. Abarca, P. Zamani, J.Maki + Smith, P. H.; Lemmon, M.; Beebe, R. F. + 2019 + + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + + 2020-01-01 + + + + + Observational Intent + + 2019-10-02T04:36:06.728Z + 2020-01-01T14:57:01.214Z + + + Science + Raw + + Visible + Surface + Imaging + + + + Insight + Mission + + urn:nasa:pds:context:investigation:mission.insight + bundle_to_investigation + + + + + Insight Lander + Spacecraft + + + urn:nasa:pds:context:instrument_host:spacecraft.insight + + is_instrument_host + Reference to the Insight spacecraft. + + + + Insight Context Camera + Instrument + + urn:nasa:pds:context:instrument:icc.insight + is_instrument + + Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + + Insight Deployment Camera + Instrument + + urn:nasa:pds:context:instrument:idc.insight + is_instrument + + Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + + Mars + Planet + + urn:nasa:pds:context:target:planet.mars + document_to_target + Reference to the Planet - Mars target + + + + + Archive + This Bundle contains InSight camera data. + + + urn:nasa:pds:insight_cameras:browse + Primary + bundle_has_browse_collection + + + urn:nasa:pds:insight_cameras:calibration + Primary + bundle_has_calibration_collection + + + urn:nasa:pds:insight_cameras:data + Primary + bundle_has_data_collection + + + + + urn:nasa:pds:insight_cameras:miscellaneous + Primary + bundle_has_document_collection + + + urn:nasa:pds:insight_cameras:xml_schema + Primary + bundle_has_schema_collection + + diff --git a/input/bundle_in.xml b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml similarity index 98% rename from input/bundle_in.xml rename to src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml index bd1aab96..5f092b46 100644 --- a/input/bundle_in.xml +++ b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml @@ -3,8 +3,8 @@ xmlns="http://pds.nasa.gov/pds4/pds/v1">> urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle +1.1 +InSight Cameras Bundle 1.1 1.11.1.0 Product_Bundle diff --git a/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml new file mode 100644 index 00000000..8125e1e7 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml @@ -0,0 +1,124 @@ + + +urn:nasa:pds:insight_cameras +1.0 +InSight Cameras Bundle 1.0 +1.11.1.0 +Product_Bundle + +R. Deen, H. Abarca, P. Zamani, J.Maki + + + +Smith, P. H.; Lemmon, M.; Beebe, R. F. + + + +2019 + +InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + +Observational Intent + +2019-10-02T04:36:06.728Z +2020-01-01T14:57:01.214Z + + +Science +Raw + +Visible +Surface +Imaging + + + +Insight +Mission + +urn:nasa:pds:context:investigation:mission.insight +bundle_to_investigation + + + + +Insight Lander +Spacecraft + + +urn:nasa:pds:context:instrument_host:spacecraft.insight + +is_instrument_host +Reference to the Insight spacecraft. + + + +Insight Context Camera +Instrument + +urn:nasa:pds:context:instrument:icc.insight +is_instrument + +Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + +Insight Deployment Camera +Instrument + +urn:nasa:pds:context:instrument:idc.insight +is_instrument + +Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + +Mars +Planet + +urn:nasa:pds:context:target:planet.mars +document_to_target +Reference to the Planet - Mars target + + + + +Archive +This Bundle contains InSight camera data. + + +urn:nasa:pds:insight_cameras:browse +Primary +bundle_has_browse_collection + + +urn:nasa:pds:insight_cameras:calibration +Primary +bundle_has_calibration_collection + + +urn:nasa:pds:insight_cameras:data +Primary +bundle_has_data_collection + + + + +urn:nasa:pds:insight_cameras:miscellaneous +Primary +bundle_has_document_collection + + +urn:nasa:pds:insight_cameras:xml_schema +Primary +bundle_has_schema_collection + + diff --git a/input/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json similarity index 100% rename from input/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json diff --git a/src/pds_doi_service/core/input/test/input_util_test.py b/src/pds_doi_service/core/input/test/input_util_test.py index 12caf672..3011f9bc 100644 --- a/src/pds_doi_service/core/input/test/input_util_test.py +++ b/src/pds_doi_service/core/input/test/input_util_test.py @@ -18,7 +18,7 @@ class InputUtilTestCase(unittest.TestCase): def setUp(self): self.test_dir = resource_filename(__name__, "") - self.input_dir = abspath(join(self.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + self.input_dir = abspath(join(self.test_dir, "data")) def test_parse_dois_from_input_file(self): """Test the DOIInputUtil.parse_dois_from_input_file() method""" diff --git a/src/pds_doi_service/core/input/test/pds4_util_test.py b/src/pds_doi_service/core/input/test/pds4_util_test.py index 7af48ed4..9054b84b 100644 --- a/src/pds_doi_service/core/input/test/pds4_util_test.py +++ b/src/pds_doi_service/core/input/test/pds4_util_test.py @@ -16,7 +16,7 @@ class Pds4UtilTestCase(unittest.TestCase): def setUp(self): self.test_dir = resource_filename(__name__, "") - self.input_dir = abspath(join(self.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + self.input_dir = abspath(join(self.test_dir, "data")) self.expected_authors = [ {"first_name": "R.", "last_name": "Deen", "affiliation": [], "name_type": "Personal"}, diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml new file mode 100644 index 00000000..16e11de6 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml @@ -0,0 +1,70 @@ + + + 29348 + NASA-PDS + InSight Cameras Bundle 0 + National Aeronautics and Space Administration (NASA) + urn:nasa:pds:insight_cameras::2.0 + 10.17189/29348 + NASA Planetary Data System + NASA Planetary Data System + 2019-01-01 + US + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&amp;version=1.0 + Dataset + PDS4 Refereed Data Bundle + 2021-02-24 + 2021-03-16 + Camera;Context;Deployment;Insight;Instrument;Lander;Mars;Mission;PDS;Planet;Raw;Science;Spacecraft + Registration update failed: {"errors":[{"source":"url","uid":"10.17189/29348","title":"URL https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&amp;version=1.0 is not allowed by repository osti.nasapds domain settings."}]} + + + H. + Abarca + + + + J. + Maki + + + + R. + Deen + + + + P. + Zamani + + + + + + Planetary Data System: Engineering Node + DataCurator + + + + R. F. + Beebe + Editor + + + + M. + Lemmon + Editor + + + + P. H. + Smith + Editor + + + + + + diff --git a/input/DOI_Release_20200727_from_draft.xml b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml similarity index 97% rename from input/DOI_Release_20200727_from_draft.xml rename to src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml index f0a1ec0e..6a4731b7 100644 --- a/input/DOI_Release_20200727_from_draft.xml +++ b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml @@ -1,7 +1,8 @@ - - + + 29569 InSight Cameras Bundle + 10.17189/29569 National Aeronautics and Space Administration (NASA) urn:nasa:pds:insight_cameras::1.0 NASA Planetary Data System diff --git a/input/DOI_Release_20210216_from_error.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_error.json similarity index 100% rename from input/DOI_Release_20210216_from_error.json rename to src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_error.json diff --git a/input/DOI_Release_20210216_from_release.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_release.json similarity index 100% rename from input/DOI_Release_20210216_from_release.json rename to src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_release.json diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json new file mode 100644 index 00000000..eaf37772 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json @@ -0,0 +1,340 @@ +{ + "data": [ + { + "id": "10.13143/yzw2-vz66", + "type": "dois", + "attributes": { + "doi": "10.13143/yzw2-vz66", + "identifiers": [ + { + "identifier": "10.13143/yzw2-vz66", + "identifierType": "DOI" + } + ], + "creators": [ + { + "name": "Deen, R.", + "nameType": "Personal", + "givenName": "R.", + "familyName": "Deen", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Abarca, H.", + "nameType": "Personal", + "givenName": "H.", + "familyName": "Abarca", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Zamani, P.", + "nameType": "Personal", + "givenName": "P.", + "familyName": "Zamani", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Maki, J.", + "nameType": "Personal", + "givenName": "J.", + "familyName": "Maki", + "affiliation": [], + "nameIdentifiers": [] + } + ], + "titles": [ + { + "title": "InSight Cameras Bundle" + } + ], + "publisher": "NASA Planetary Data System", + "container": {}, + "publicationYear": "2019", + "subjects": [ + { + "subject": "PDS" + }, + { + "subject": "PDS4" + }, + { + "subject": "camera" + }, + { + "subject": "context" + }, + { + "subject": "data" + }, + { + "subject": "deployment" + }, + { + "subject": "edr" + }, + { + "subject": "engineering" + }, + { + "subject": "experiment" + }, + { + "subject": "insight" + }, + { + "subject": "lander" + }, + { + "subject": "mars" + }, + { + "subject": "product" + }, + { + "subject": "raw" + }, + { + "subject": "rdr" + }, + { + "subject": "record" + }, + { + "subject": "reduced" + }, + { + "subject": "science" + } + ], + "contributors": [ + { + "name": "Smith, P. H.", + "nameType": "Personal", + "givenName": "P. H.", + "familyName": "Smith", + "contributorType": "Editor", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Lemmon, M.", + "nameType": "Personal", + "givenName": "M.", + "familyName": "Lemmon", + "contributorType": "Editor", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Beebe, R. F.", + "nameType": "Personal", + "givenName": "R. F.", + "familyName": "Beebe", + "contributorType": "Editor", + "affiliation": [], + "nameIdentifiers": [] + }, + { + "name": "Planetary Data System: Engineering Node", + "nameType": "Organizational", + "contributorType": "DataCurator", + "affiliation": [], + "nameIdentifiers": [] + } + ], + "dates": [], + "language": "en", + "types": { + "ris": "DATA", + "bibtex": "misc", + "citeproc": "dataset", + "schemaOrg": "Dataset", + "resourceType": "PDS4 Refereed Data Bundle", + "resourceTypeGeneral": "Dataset" + }, + "relatedIdentifiers": [ + { + "relationType": "HasMetadata", + "relatedIdentifier": "urn:nasa:pds:insight_cameras::1.0", + "resourceTypeGeneral": "Text", + "relatedIdentifierType": "URN" + } + ], + "sizes": [], + "formats": [], + "rightsList": [], + "descriptions": [ + { + "lang": "english", + "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", + "descriptionType": "Abstract" + } + ], + "geoLocations": [], + "fundingReferences": [], + "url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", + "contentUrl": null, + "metadataVersion": 0, + "schemaVersion": "http://datacite.org/schema/kernel-4", + "source": "api", + "isActive": true, + "state": "findable", + "reason": null, + "viewCount": 0, + "downloadCount": 0, + "referenceCount": 0, + "citationCount": 0, + "partCount": 0, + "partOfCount": 0, + "versionCount": 0, + "versionOfCount": 0, + "created": "2021-06-22T22:55:19Z", + "registered": "2021-06-22T22:55:53Z", + "published": null, + "updated": "2021-06-22T23:00:09Z" + }, + "relationships": { + "client": { + "data": { + "id": "dev.fhpuqw", + "type": "clients" + } + } + } + } + ], + "meta": { + "total": 1, + "totalPages": 1, + "page": 1, + "states": [ + { + "id": "findable", + "title": "Findable", + "count": 1 + } + ], + "resourceTypes": [ + { + "id": "dataset", + "title": "Dataset", + "count": 1 + } + ], + "created": [ + { + "id": "2021", + "title": "2021", + "count": 1 + } + ], + "published": [ + { + "id": "2019", + "title": "2019", + "count": 1 + } + ], + "registered": [ + { + "id": "2021", + "title": "2021", + "count": 1 + } + ], + "providers": [ + { + "id": "dev", + "title": "Developer Provider", + "count": 1 + } + ], + "clients": [ + { + "id": "dev.fhpuqw", + "title": "JPL NASA", + "count": 1 + } + ], + "affiliations": [], + "prefixes": [ + { + "id": "10.13143", + "title": "10.13143", + "count": 1 + } + ], + "certificates": [], + "licenses": [], + "schemaVersions": [ + { + "id": "4", + "title": "Schema 4", + "count": 1 + } + ], + "linkChecksStatus": [], + "subjects": [ + { + "id": "PDS", + "title": "Pds", + "count": 1 + }, + { + "id": "PDS4", + "title": "Pds4", + "count": 1 + }, + { + "id": "camera", + "title": "Camera", + "count": 1 + }, + { + "id": "context", + "title": "Context", + "count": 1 + }, + { + "id": "data", + "title": "Data", + "count": 1 + }, + { + "id": "deployment", + "title": "Deployment", + "count": 1 + }, + { + "id": "edr", + "title": "Edr", + "count": 1 + }, + { + "id": "engineering", + "title": "Engineering", + "count": 1 + }, + { + "id": "experiment", + "title": "Experiment", + "count": 1 + }, + { + "id": "insight", + "title": "Insight", + "count": 1 + } + ], + "fieldsOfScience": [], + "citations": [], + "views": [], + "downloads": [] + }, + "links": { + "self": "https://api.test.datacite.org/dois?query=10.13143%2Fd0e6-qs05&client-id=dev.fhpuqw" + } +} diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json new file mode 100644 index 00000000..f166633d --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json @@ -0,0 +1,210 @@ +{ + "data": { + "id": "10.13143/yzw2-vz66", + "type": "dois", + "attributes": { + "doi": "10.13143/yzw2-vz66", + "prefix": "10.13143", + "suffix": "yzw2-vz66", + "identifiers": [ + { + "identifier": "10.13143/yzw2-vz66", + "identifierType": "DOI" + }, + { + "identifier": "urn:nasa:pds:insight_cameras::1.0", + "identifierType": "URN" + } + ], + "alternateIdentifiers": [], + "creators": [ + { + "nameType": "Personal", + "name": "Deen, R.", + "givenName": "R.", + "familyName": "Deen", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Personal", + "name": "Abarca, H.", + "givenName": "H.", + "familyName": "Abarca", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Personal", + "name": "Zamani, P.", + "givenName": "P.", + "familyName": "Zamani", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Personal", + "name": "Maki, J.", + "givenName": "J.", + "familyName": "Maki", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + } + ], + "titles": [ + { + "title": "InSight Cameras Bundle" + } + ], + "publisher": "NASA Planetary Data System", + "container": {}, + "publicationYear": "2019", + "subjects": [ + { + "subject": "PDS" + }, + { + "subject": "PDS4" + }, + { + "subject": "camera" + }, + { + "subject": "context" + }, + { + "subject": "data" + }, + { + "subject": "deployment" + }, + { + "subject": "edr" + }, + { + "subject": "engineering" + }, + { + "subject": "experiment" + }, + { + "subject": "insight" + }, + { + "subject": "lander" + }, + { + "subject": "mars" + }, + { + "subject": "product" + }, + { + "subject": "raw" + }, + { + "subject": "rdr" + }, + { + "subject": "record" + }, + { + "subject": "reduced" + }, + { + "subject": "science" + } + ], + "contributors": [ + { + "nameType": "Personal", + "name": "Smith, P. H.", + "givenName": "P. H.", + "familyName": "Smith", + "contributorType": "Editor", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Personal", + "name": "Lemmon, M.", + "givenName": "M.", + "familyName": "Lemmon", + "contributorType": "Editor", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Personal", + "name": "Beebe, R. F.", + "givenName": "R. F.", + "familyName": "Beebe", + "contributorType": "Editor", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + }, + { + "nameType": "Organizational", + "name": "Planetary Data System: Engineering Node", + "contributorType": "DataCurator", + "affiliation": ["NASA PDS"], + "nameIdentifiers": [] + } + ], + "dates": [], + "language": "en", + "types": { + "schemaOrg": "Dataset", + "citeproc": "dataset", + "bibtex": "misc", + "ris": "DATA", + "resourceTypeGeneral": "Dataset", + "resourceType": "PDS4 Refereed Data Bundle" + }, + "relatedIdentifiers": [ + { + "relatedIdentifier": "urn:nasa:pds:insight_cameras::1.0", + "relatedIdentifierType": "URN", + "relationType": "HasMetadata" + } + ], + "sizes": [], + "formats": [], + "rightsList": [], + "descriptions": [ + { + "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", + "descriptionType": "Abstract", + "lang": "english" + } + ], + "geoLocations": [], + "fundingReferences": [], + "xml": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJlc291cmNlIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuMTMxNDMvWVpXMi1WWjY2PC9pZGVudGlmaWVyPgogIDxjcmVhdG9ycz4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5EZWVuLCBSLjwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+Ui48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+RGVlbjwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5BYmFyY2EsIEguPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5ILjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5BYmFyY2E8L2ZhbWlseU5hbWU+CiAgICA8L2NyZWF0b3I+CiAgICA8Y3JlYXRvcj4KICAgICAgPGNyZWF0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+WmFtYW5pLCBQLjwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+UC48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+WmFtYW5pPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPk1ha2ksIEouPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5KLjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5NYWtpPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogIDwvY3JlYXRvcnM+CiAgPHRpdGxlcz4KICAgIDx0aXRsZT5JblNpZ2h0IENhbWVyYXMgQnVuZGxlPC90aXRsZT4KICA8L3RpdGxlcz4KICA8cHVibGlzaGVyPk5BU0EgUGxhbmV0YXJ5IERhdGEgU3lzdGVtPC9wdWJsaXNoZXI+CiAgPHB1YmxpY2F0aW9uWWVhcj4yMDE5PC9wdWJsaWNhdGlvblllYXI+CiAgPHJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVHZW5lcmFsPSJEYXRhc2V0Ij5QRFM0IFJlZmVyZWVkIERhdGEgQnVuZGxlPC9yZXNvdXJjZVR5cGU+CiAgPHN1YmplY3RzPgogICAgPHN1YmplY3Q+UERTPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+UERTNDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmNhbWVyYTwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmNvbnRleHQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5kYXRhPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+ZGVwbG95bWVudDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmVkcjwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmVuZ2luZWVyaW5nPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+ZXhwZXJpbWVudDwvc3ViamVjdD4KICAgIDxzdWJqZWN0Pmluc2lnaHQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5sYW5kZXI8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5tYXJzPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+cHJvZHVjdDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJhdzwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJkcjwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJlY29yZDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJlZHVjZWQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5zY2llbmNlPC9zdWJqZWN0PgogIDwvc3ViamVjdHM+CiAgPGNvbnRyaWJ1dG9ycz4KICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IkVkaXRvciI+CiAgICAgIDxjb250cmlidXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5TbWl0aCwgUC4gSC48L2NvbnRyaWJ1dG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5QLiBILjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5TbWl0aDwvZmFtaWx5TmFtZT4KICAgIDwvY29udHJpYnV0b3I+CiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJFZGl0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+TGVtbW9uLCBNLjwvY29udHJpYnV0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPk0uPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkxlbW1vbjwvZmFtaWx5TmFtZT4KICAgIDwvY29udHJpYnV0b3I+CiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJFZGl0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+QmVlYmUsIFIuIEYuPC9jb250cmlidXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+Ui4gRi48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+QmVlYmU8L2ZhbWlseU5hbWU+CiAgICA8L2NvbnRyaWJ1dG9yPgogICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iRGF0YUN1cmF0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJPcmdhbml6YXRpb25hbCI+UGxhbmV0YXJ5IERhdGEgU3lzdGVtOiBFbmdpbmVlcmluZyBOb2RlPC9jb250cmlidXRvck5hbWU+CiAgICA8L2NvbnRyaWJ1dG9yPgogIDwvY29udHJpYnV0b3JzPgogIDxyZWxhdGVkSWRlbnRpZmllcnM+CiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJVUk4iIHJlbGF0aW9uVHlwZT0iSGFzTWV0YWRhdGEiIHJlc291cmNlVHlwZUdlbmVyYWw9IlRleHQiPnVybjpuYXNhOnBkczppbnNpZ2h0X2NhbWVyYXM6OjEuMDwvcmVsYXRlZElkZW50aWZpZXI+CiAgPC9yZWxhdGVkSWRlbnRpZmllcnM+CiAgPHNpemVzLz4KICA8Zm9ybWF0cy8+CiAgPHZlcnNpb24vPgogIDxkZXNjcmlwdGlvbnM+CiAgICA8ZGVzY3JpcHRpb24geG1sOmxhbmc9ImVuZ2xpc2giIGRlc2NyaXB0aW9uVHlwZT0iQWJzdHJhY3QiPkluU2lnaHQgQ2FtZXJhcyBFeHBlcmltZW50IERhdGEgUmVjb3JkIChFRFIpIGFuZCBSZWR1Y2VkIERhdGEgUmVjb3JkIChSRFIpIERhdGEgUHJvZHVjdHM8L2Rlc2NyaXB0aW9uPgogIDwvZGVzY3JpcHRpb25zPgo8L3Jlc291cmNlPgo=", + "url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", + "contentUrl": null, + "metadataVersion": 0, + "schemaVersion": "http://datacite.org/schema/kernel-4", + "source": "api", + "isActive": false, + "state": "draft", + "reason": null, + "landingPage": null, + "viewCount": 0, + "viewsOverTime": [], + "downloadCount": 0, + "downloadsOverTime": [], + "referenceCount": 0, + "citationCount": 0, + "citationsOverTime": [], + "partCount": 0, + "partOfCount": 0, + "versionCount": 0, + "versionOfCount": 0, + "created": "2021-06-03T18:39:13.000Z", + "registered": null, + "published": "2019", + "updated": "2021-06-03T18:39:13.000Z" + } + } +} diff --git a/input/DOI_Reserved_multi_entry.json b/src/pds_doi_service/core/outputs/test/data/DOI_Reserved_multi_entry.json similarity index 100% rename from input/DOI_Reserved_multi_entry.json rename to src/pds_doi_service/core/outputs/test/data/DOI_Reserved_multi_entry.json diff --git a/src/pds_doi_service/core/outputs/test/datacite_test.py b/src/pds_doi_service/core/outputs/test/datacite_test.py index 0c30c426..9f1ba9ec 100644 --- a/src/pds_doi_service/core/outputs/test/datacite_test.py +++ b/src/pds_doi_service/core/outputs/test/datacite_test.py @@ -32,7 +32,7 @@ class DOIDataCiteRecordTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_create_datacite_label_json(self): """Test creation of a DataCite JSON label from a Doi object""" @@ -151,7 +151,7 @@ class DOIDataCiteWebClientTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) @patch.object(requests, "request", requests_valid_request_patch) def test_submit_content(self): @@ -270,7 +270,7 @@ class DOIDataCiteWebParserTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.expected_authors = [ {"name": "R. Deen", "name_identifiers": [], "name_type": "Personal", "affiliation": ["NASA PDS"]}, @@ -404,7 +404,7 @@ class DOIDataCiteValidatorTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_json_label_validation(self): """Test validation against a DataCite label created from a valid Doi object""" diff --git a/src/pds_doi_service/core/outputs/test/osti_test.py b/src/pds_doi_service/core/outputs/test/osti_test.py index 1cf730c1..cfb03f2f 100644 --- a/src/pds_doi_service/core/outputs/test/osti_test.py +++ b/src/pds_doi_service/core/outputs/test/osti_test.py @@ -22,10 +22,7 @@ class DOIOstiRecordTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - # FIXME: moving this code from PACKAGE-DIR to PACKAGE-DIR/src (and, when we add - # namepsace packages, to PACKAGE-DIR/src/pds) shouldn't necessitate re-jiggering - # all the parent directories: - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) def test_create_osti_label_xml(self): """Test creation of an OSTI XML label from a Doi object""" @@ -83,10 +80,7 @@ class DOIOstiWebParserTestCase(unittest.TestCase): @classmethod def setUpClass(cls): cls.test_dir = resource_filename(__name__, "") - # FIXME: moving this code from PACKAGE-DIR to PACKAGE-DIR/src (and, when we add - # namepsace packages, to PACKAGE-DIR/src/pds) shouldn't necessitate re-jiggering - # all the parent directories: - cls.input_dir = abspath(join(cls.test_dir, os.pardir, os.pardir, os.pardir, os.pardir, os.pardir, "input")) + cls.input_dir = abspath(join(cls.test_dir, "data")) cls.expected_authors = [ {"first_name": "R.", "last_name": "Deen"}, @@ -132,7 +126,7 @@ def _compare_doi_to_expected(self, doi): self.assertIsInstance(doi.date_record_added, datetime) self.assertEqual( doi.description, - "InSight Cameras Experiment Data Record (EDR) " "and Reduced Data Record (RDR) Data Products", + "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", ) self.assertEqual(doi.doi, "10.17189/29569") self.assertListEqual(doi.editors, self.expected_editors) From f9dc22af3a4dd7063bcaa8f07c3d30b82ccf67ad Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Fri, 12 Nov 2021 11:48:16 -0800 Subject: [PATCH 2/4] Reorganized test data for the actions package to provide better file names and consolidate redundant files --- .../core/actions/test/check_test.py | 8 +- .../test/data/bundle_in_with_contributors.xml | 124 ------------------ ...ase.json => datacite_record_findable.json} | 0 .../bundle_in_with_contributors.xml | 124 ------------------ .../data/draft_dir_two_files/bundle_in.xml | 117 ----------------- .../bundle_in_with_contributors.xml | 124 ------------------ .../pds4_bundle_with_contributors.xml | 1 + .../data/input_dir_two_files/pds4_bundle.xml | 1 + .../pds4_bundle_with_contributors.xml | 1 + ...7_from_error.xml => osti_record_error.xml} | 0 ...om_release.xml => osti_record_pending.xml} | 0 ...egister.xml => osti_record_registered.xml} | 0 ...m_reserve.xml => osti_record_reserved.xml} | 0 ...from_review.xml => osti_record_review.xml} | 0 .../core/actions/test/data/pds4_bundle.xml | 117 +++++++++++++++++ .../data/pds4_bundle_with_contributors.xml | 118 +++++++++++++++++ ...pds4_bundle_with_doi_and_contributors.xml} | 0 ... => spreadsheet_with_pds3_identifiers.csv} | 0 ... => spreadsheet_with_pds4_identifiers.csv} | 0 ...=> spreadsheet_with_pds4_identifiers.xlsx} | Bin .../core/actions/test/list_test.py | 8 +- .../core/actions/test/release_test.py | 12 +- .../core/actions/test/reserve_test.py | 14 +- .../core/actions/test/update_test.py | 10 +- 24 files changed, 264 insertions(+), 515 deletions(-) delete mode 100644 src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20210615_from_release.json => datacite_record_findable.json} (100%) delete mode 100644 src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml delete mode 100644 src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml delete mode 100644 src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml create mode 120000 src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml create mode 120000 src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml create mode 120000 src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20200727_from_error.xml => osti_record_error.xml} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20200727_from_release.xml => osti_record_pending.xml} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20200727_from_register.xml => osti_record_registered.xml} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20200727_from_reserve.xml => osti_record_reserved.xml} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Release_20200727_from_review.xml => osti_record_review.xml} (100%) create mode 100644 src/pds_doi_service/core/actions/test/data/pds4_bundle.xml create mode 100644 src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml rename src/pds_doi_service/core/actions/test/data/{bundle_in_with_doi_and_contributors.xml => pds4_bundle_with_doi_and_contributors.xml} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Reserved_PDS3.csv => spreadsheet_with_pds3_identifiers.csv} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Reserved_GEO_200318.csv => spreadsheet_with_pds4_identifiers.csv} (100%) rename src/pds_doi_service/core/actions/test/data/{DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx => spreadsheet_with_pds4_identifiers.xlsx} (100%) diff --git a/src/pds_doi_service/core/actions/test/check_test.py b/src/pds_doi_service/core/actions/test/check_test.py index af9b4c2b..aebdb867 100644 --- a/src/pds_doi_service/core/actions/test/check_test.py +++ b/src/pds_doi_service/core/actions/test/check_test.py @@ -88,9 +88,9 @@ def webclient_query_patch_nominal( # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'registered' or 'findable' if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - label = join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_register.xml") + label = join(CheckActionTestCase.input_dir, "osti_record_registered.xml") else: - label = join(CheckActionTestCase.input_dir, "DOI_Release_20210615_from_release.json") + label = join(CheckActionTestCase.input_dir, "datacite_record_findable.json") with open(label, "r") as infile: label_contents = infile.read() @@ -109,7 +109,7 @@ def webclient_query_patch_error(self, query, url=None, username=None, password=N """ # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'error' - with open(join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_error.xml"), "r") as infile: + with open(join(CheckActionTestCase.input_dir, "osti_record_error.xml"), "r") as infile: xml_contents = infile.read() return xml_contents @@ -127,7 +127,7 @@ def webclient_query_patch_no_change( """ # Read an output label that corresponds to the DOI we're # checking for, and that has a status of 'pending' - with open(join(CheckActionTestCase.input_dir, "DOI_Release_20200727_from_release.xml"), "r") as infile: + with open(join(CheckActionTestCase.input_dir, "osti_record_pending.xml"), "r") as infile: xml_contents = infile.read() return xml_contents diff --git a/src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml deleted file mode 100644 index 6aa7a7de..00000000 --- a/src/pds_doi_service/core/actions/test/data/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20210615_from_release.json b/src/pds_doi_service/core/actions/test/data/datacite_record_findable.json similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20210615_from_release.json rename to src/pds_doi_service/core/actions/test/data/datacite_record_findable.json diff --git a/src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml deleted file mode 100644 index 6aa7a7de..00000000 --- a/src/pds_doi_service/core/actions/test/data/draft_dir_one_file/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml deleted file mode 100644 index 5f092b46..00000000 --- a/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in.xml +++ /dev/null @@ -1,117 +0,0 @@ -> - -urn:nasa:pds:insight_cameras -1.1 -InSight Cameras Bundle 1.1 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml deleted file mode 100644 index 8125e1e7..00000000 --- a/src/pds_doi_service/core/actions/test/data/draft_dir_two_files/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle 1.0 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..da003cdf --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_one_file/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml new file mode 120000 index 00000000..fe323bd0 --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle.xml @@ -0,0 +1 @@ +../pds4_bundle.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..da003cdf --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_error.xml b/src/pds_doi_service/core/actions/test/data/osti_record_error.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_error.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_error.xml diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_release.xml b/src/pds_doi_service/core/actions/test/data/osti_record_pending.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_release.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_pending.xml diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_register.xml b/src/pds_doi_service/core/actions/test/data/osti_record_registered.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_register.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_registered.xml diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_reserve.xml b/src/pds_doi_service/core/actions/test/data/osti_record_reserved.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_reserve.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_reserved.xml diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_review.xml b/src/pds_doi_service/core/actions/test/data/osti_record_review.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Release_20200727_from_review.xml rename to src/pds_doi_service/core/actions/test/data/osti_record_review.xml diff --git a/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml new file mode 100644 index 00000000..0106a65c --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/pds4_bundle.xml @@ -0,0 +1,117 @@ + + + urn:nasa:pds:insight_cameras + 1.1 + InSight Cameras Bundle 1.1 + 1.11.1.0 + Product_Bundle + + R. Deen, H. Abarca, P. Zamani, J.Maki + 2019 + + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + + Observational Intent + + 2019-10-02T04:36:06.728Z + 2020-01-01T14:57:01.214Z + + + Science + Raw + + Visible + Surface + Imaging + + + + Insight + Mission + + urn:nasa:pds:context:investigation:mission.insight + bundle_to_investigation + + + + + Insight Lander + Spacecraft + + + urn:nasa:pds:context:instrument_host:spacecraft.insight + + is_instrument_host + Reference to the Insight spacecraft. + + + + Insight Context Camera + Instrument + + urn:nasa:pds:context:instrument:icc.insight + is_instrument + + Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + + Insight Deployment Camera + Instrument + + urn:nasa:pds:context:instrument:idc.insight + is_instrument + + Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + + Mars + Planet + + urn:nasa:pds:context:target:planet.mars + document_to_target + Reference to the Planet - Mars target + + + + + Archive + This Bundle contains InSight camera data. + + + urn:nasa:pds:insight_cameras:browse + Primary + bundle_has_browse_collection + + + urn:nasa:pds:insight_cameras:calibration + Primary + bundle_has_calibration_collection + + + urn:nasa:pds:insight_cameras:data + Primary + bundle_has_data_collection + + + + + urn:nasa:pds:insight_cameras:miscellaneous + Primary + bundle_has_document_collection + + + urn:nasa:pds:insight_cameras:xml_schema + Primary + bundle_has_schema_collection + + diff --git a/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml new file mode 100644 index 00000000..10a6c3b1 --- /dev/null +++ b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_contributors.xml @@ -0,0 +1,118 @@ + + + urn:nasa:pds:insight_cameras + 1.0 + InSight Cameras Bundle + 1.11.1.0 + Product_Bundle + + R. Deen, H. Abarca, P. Zamani, J.Maki + Smith, P. H.; Lemmon, M.; Beebe, R. F. + 2019 + + InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products + + + + + Observational Intent + + 2019-10-02T04:36:06.728Z + 2020-01-01T14:57:01.214Z + + + Science + Raw + + Visible + Surface + Imaging + + + + Insight + Mission + + urn:nasa:pds:context:investigation:mission.insight + bundle_to_investigation + + + + + Insight Lander + Spacecraft + + + urn:nasa:pds:context:instrument_host:spacecraft.insight + + is_instrument_host + Reference to the Insight spacecraft. + + + + Insight Context Camera + Instrument + + urn:nasa:pds:context:instrument:icc.insight + is_instrument + + Reference to the InSight Context Camera instrument onboard the InSight spacecraft. + + + + + Insight Deployment Camera + Instrument + + urn:nasa:pds:context:instrument:idc.insight + is_instrument + + Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. + + + + + + Mars + Planet + + urn:nasa:pds:context:target:planet.mars + document_to_target + Reference to the Planet - Mars target + + + + + Archive + This Bundle contains InSight camera data. + + + urn:nasa:pds:insight_cameras:browse + Primary + bundle_has_browse_collection + + + urn:nasa:pds:insight_cameras:calibration + Primary + bundle_has_calibration_collection + + + urn:nasa:pds:insight_cameras:data + Primary + bundle_has_data_collection + + + + + urn:nasa:pds:insight_cameras:miscellaneous + Primary + bundle_has_document_collection + + + urn:nasa:pds:insight_cameras:xml_schema + Primary + bundle_has_schema_collection + + diff --git a/src/pds_doi_service/core/actions/test/data/bundle_in_with_doi_and_contributors.xml b/src/pds_doi_service/core/actions/test/data/pds4_bundle_with_doi_and_contributors.xml similarity index 100% rename from src/pds_doi_service/core/actions/test/data/bundle_in_with_doi_and_contributors.xml rename to src/pds_doi_service/core/actions/test/data/pds4_bundle_with_doi_and_contributors.xml diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Reserved_PDS3.csv b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds3_identifiers.csv similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Reserved_PDS3.csv rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds3_identifiers.csv diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318.csv b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.csv similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318.csv rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.csv diff --git a/src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx b/src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.xlsx similarity index 100% rename from src/pds_doi_service/core/actions/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx rename to src/pds_doi_service/core/actions/test/data/spreadsheet_with_pds4_identifiers.xlsx diff --git a/src/pds_doi_service/core/actions/test/list_test.py b/src/pds_doi_service/core/actions/test/list_test.py index 7577faef..bccf2908 100644 --- a/src/pds_doi_service/core/actions/test/list_test.py +++ b/src/pds_doi_service/core/actions/test/list_test.py @@ -93,7 +93,7 @@ def test_list_by_status(self): """Test listing of entries, querying by workflow status""" # Submit a reserve, then query by draft status to retrieve reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -186,7 +186,7 @@ def test_get_transaction_for_doi(self): """Test the transaction_for_doi method""" # Submit a reserve, then use the assigned doi to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -223,7 +223,7 @@ def test_get_transaction_for_identifier(self): """Test the transaction_for_identifier method""" # Submit a reserve, then use the PDS identifier to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -260,7 +260,7 @@ def test_get_output_label_for_transaction(self): """Test the output_label_for_transaction method""" # Submit a reserve, then use the PDS identifier to get the transaction record reserve_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, diff --git a/src/pds_doi_service/core/actions/test/release_test.py b/src/pds_doi_service/core/actions/test/release_test.py index 2c8e0add..0a607405 100644 --- a/src/pds_doi_service/core/actions/test/release_test.py +++ b/src/pds_doi_service/core/actions/test/release_test.py @@ -119,7 +119,7 @@ def test_reserve_release_to_review(self): """Test release to review status with a reserved DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_reserve.xml"), + "input": join(self.input_dir, "osti_record_reserved.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -140,7 +140,7 @@ def test_reserve_release_to_provider(self): """Test release directly to the service provider with a reserved DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_reserve.xml"), + "input": join(self.input_dir, "osti_record_reserved.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -153,7 +153,7 @@ def test_unreserved_release_to_review(self): """Test release to review status using a record that has not been reserved (no DOI assigned)""" release_args = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -178,7 +178,7 @@ def test_unreserved_release_to_provider(self): """Test release directly to the service provider using a record that has not been reserved (no DOI assigned)""" release_args = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -198,7 +198,7 @@ def test_review_release_to_review(self): """ release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_review.xml"), + "input": join(self.input_dir, "osti_record_review.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, @@ -219,7 +219,7 @@ def test_review_release_to_osti(self): """Test release directly to the service provider with a review DOI entry""" release_args = { - "input": join(self.input_dir, "DOI_Release_20200727_from_review.xml"), + "input": join(self.input_dir, "osti_record_review.xml"), "node": "img", "submitter": "img-submitter@jpl.nasa.gov", "force": True, diff --git a/src/pds_doi_service/core/actions/test/reserve_test.py b/src/pds_doi_service/core/actions/test/reserve_test.py index cba82eeb..d54b17db 100644 --- a/src/pds_doi_service/core/actions/test/reserve_test.py +++ b/src/pds_doi_service/core/actions/test/reserve_test.py @@ -125,7 +125,7 @@ def test_reserve_xlsx_and_submit(self): result to the service provider. """ reserve_args = { - "input": join(self.input_dir, "DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx"), + "input": join(self.input_dir, "spreadsheet_with_pds4_identifiers.xlsx"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -147,7 +147,7 @@ def test_reserve_csv_and_submit(self): service provider. """ reserve_args = { - "input": join(self.input_dir, "DOI_Reserved_GEO_200318.csv"), + "input": join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -168,7 +168,7 @@ def test_reserve_pds4_label_and_submit(self): Test Reserve action with a local PDS4 XML file, submitting the result to the service provider. """ - input_file = join(self.input_dir, "bundle_in_with_contributors.xml") + input_file = join(self.input_dir, "pds4_bundle_with_contributors.xml") reserve_args = { "input": input_file, @@ -189,7 +189,7 @@ def test_reserve_pds4_label_and_submit(self): ) def test_reserve_local_dir_one_file(self): """Test reserve request with local dir containing one file""" - input_dir = join(self.input_dir, "draft_dir_one_file") + input_dir = join(self.input_dir, "input_dir_one_file") reserve_args = { "input": input_dir, @@ -221,7 +221,7 @@ def test_reserve_local_dir_one_file(self): ) def test_reserve_local_dir_two_files(self): """Test reserve request with local dir containing two files""" - input_dir = join(self.input_dir, "draft_dir_two_files") + input_dir = join(self.input_dir, "input_dir_two_files") reserve_args = { "input": input_dir, @@ -240,9 +240,9 @@ def test_reserve_local_dir_two_files(self): self.assertIsInstance(doi.date_record_added, datetime) self.assertTrue(all(keyword in doi.keywords for keyword in get_global_keywords())) self.assertTrue(doi.pds_identifier.startswith("urn:nasa:pds:insight_cameras::1")) - self.assertTrue(doi.title.startswith("InSight Cameras Bundle 1.")) + self.assertTrue(doi.title.startswith("InSight Cameras Bundle")) - # Make sure for the "bundle_in_with_contributors.xml" file, we + # Make sure for the "pds4_bundle_with_contributors.xml" file, we # parsed the editors if doi.pds_identifier == "urn:nasa:pds:insight_cameras::1.0": self.assertEqual(len(doi.editors), 3) diff --git a/src/pds_doi_service/core/actions/test/update_test.py b/src/pds_doi_service/core/actions/test/update_test.py index d4b72d25..39526ecb 100644 --- a/src/pds_doi_service/core/actions/test/update_test.py +++ b/src/pds_doi_service/core/actions/test/update_test.py @@ -104,7 +104,7 @@ def test_update_reserved_doi(self): # Submit a reserve request to get an entry w/ DOI to update kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -176,7 +176,7 @@ def test_update_reserved_doi(self): def test_update_reserved_doi_with_spreadsheet(self): """Test an update of identifier fields on records via spreadsheet submission""" # Submit a reserve request to get an entry w/ DOI to update - input_csv = join(self.input_dir, "DOI_Reserved_GEO_200318.csv") + input_csv = join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv") kwargs = { "input": input_csv, @@ -248,7 +248,7 @@ def test_update_released_doi(self): """Test an update of identifier fields on a previously released record""" # Submit a release request to get an entry w/ DOI to update kwargs = { - "input": join(self.input_dir, "bundle_in_with_doi_and_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_doi_and_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -328,7 +328,7 @@ def test_invalid_update_requests(self): # Attempting to update a record with no DOI assigned should result in an exception update_kwargs = { - "input": join(self.input_dir, "bundle_in_with_contributors.xml"), + "input": join(self.input_dir, "pds4_bundle_with_contributors.xml"), "node": "img", "submitter": "my_user@my_node.gov", "force": True, @@ -338,7 +338,7 @@ def test_invalid_update_requests(self): self._update_action.run(**update_kwargs) # This should go for spreadsheet submissions as well - update_kwargs["input"] = join(self.input_dir, "DOI_Reserved_PDS3.csv") + update_kwargs["input"] = join(self.input_dir, "spreadsheet_with_pds3_identifiers.csv") with self.assertRaises(CriticalDOIException): self._update_action.run(**update_kwargs) From a727886c43e1a9e43248c1265689643d447af302 Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Fri, 12 Nov 2021 12:24:37 -0800 Subject: [PATCH 3/4] Reorganized test data for the input package to provide better file names and consolidate redundant files --- .../DOI_Release_20200727_from_reserve.xml | 68 ---------- .../test/data/DOI_Reserved_GEO_200318.csv | 4 - ..._GEO_200318_with_corrected_identifier.xlsx | Bin 8997 -> 0 bytes .../input/test/data/DOI_Reserved_PDS3.csv | 2 - .../test/data/bundle_in_with_contributors.xml | 124 ------------------ .../bundle_in_with_doi_and_contributors.xml | 124 ------------------ ...eserve.json => datacite_record_draft.json} | 0 ...datacite_record_draft_with_utf-8-bom.json} | 0 .../data/draft_dir_two_files/bundle_in.xml | 117 ----------------- .../bundle_in_with_contributors.xml | 124 ------------------ .../data/input_dir_two_files/pds4_bundle.xml | 1 + .../pds4_bundle_with_contributors.xml | 1 + ...ecord_registered_with_pds3_identifier.xml} | 0 ...reserve.json => osti_record_reserved.json} | 0 .../input/test/data/osti_record_reserved.xml | 1 + ... osti_record_reserved_with_utf-8-bom.json} | 0 .../data/pds4_bundle_with_contributors.xml | 1 + .../pds4_bundle_with_doi_and_contributors.xml | 1 + ...bom.xml => pds4_bundle_with_utf-8-bom.xml} | 0 ...ws.csv => spreadsheet_with_blank_rows.csv} | 0 ....xlsx => spreadsheet_with_blank_rows.xlsx} | Bin ...spreadsheet_with_invalid_column_names.csv} | 0 ...preadsheet_with_invalid_column_names.xlsx} | Bin ....csv => spreadsheet_with_invalid_rows.csv} | 0 ...lsx => spreadsheet_with_invalid_rows.xlsx} | Bin ...18.xlsx => spreadsheet_with_lid_only.xlsx} | Bin ...readsheet_with_malformed_column_names.csv} | 0 ...eadsheet_with_malformed_column_names.xlsx} | Bin ...v => spreadsheet_with_missing_columns.csv} | 0 ... => spreadsheet_with_missing_columns.xlsx} | Bin ... => spreadsheet_with_optional_columns.csv} | 0 ...=> spreadsheet_with_optional_columns.xlsx} | Bin .../spreadsheet_with_pds3_identifiers.csv | 1 + .../spreadsheet_with_pds4_identifiers.csv | 1 + .../spreadsheet_with_pds4_identifiers.xlsx | 1 + .../core/input/test/input_util_test.py | 55 ++++---- .../core/input/test/pds4_util_test.py | 3 +- 37 files changed, 36 insertions(+), 593 deletions(-) delete mode 100644 src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml delete mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv delete mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx delete mode 100644 src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv delete mode 100644 src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml delete mode 100644 src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml rename src/pds_doi_service/core/input/test/data/{DOI_Release_20210615_from_reserve.json => datacite_record_draft.json} (100%) rename src/pds_doi_service/core/input/test/data/{tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json => datacite_record_draft_with_utf-8-bom.json} (100%) delete mode 100644 src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml delete mode 100644 src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml create mode 120000 src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml create mode 120000 src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml rename src/pds_doi_service/core/input/test/data/{DOI_Release_PDS3.xml => osti_record_registered_with_pds3_identifier.xml} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Release_20210216_from_reserve.json => osti_record_reserved.json} (100%) create mode 120000 src/pds_doi_service/core/input/test/data/osti_record_reserved.xml rename src/pds_doi_service/core/input/test/data/{DOI_Release_20210216_from_reserve_utf-8-bom.json => osti_record_reserved_with_utf-8-bom.json} (100%) create mode 120000 src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml create mode 120000 src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml rename src/pds_doi_service/core/input/test/data/{bundle_in_with_contributors_utf-8-bom.xml => pds4_bundle_with_utf-8-bom.xml} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-blank-rows.csv => spreadsheet_with_blank_rows.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-blank-rows.xlsx => spreadsheet_with_blank_rows.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_invalid_column_names.csv => spreadsheet_with_invalid_column_names.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_invalid_column_names.xlsx => spreadsheet_with_invalid_column_names.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_with_invalid_rows.csv => spreadsheet_with_invalid_rows.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_with_invalid_rows.xlsx => spreadsheet_with_invalid_rows.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318.xlsx => spreadsheet_with_lid_only.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_malformed_column_names.csv => spreadsheet_with_malformed_column_names.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI_Reserved_GEO_200318_malformed_column_names.xlsx => spreadsheet_with_malformed_column_names.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-broken.csv => spreadsheet_with_missing_columns.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-broken.xlsx => spreadsheet_with_missing_columns.xlsx} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-optionals.csv => spreadsheet_with_optional_columns.csv} (100%) rename src/pds_doi_service/core/input/test/data/{DOI-reserve-optionals.xlsx => spreadsheet_with_optional_columns.xlsx} (100%) create mode 120000 src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv create mode 120000 src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv create mode 120000 src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml b/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml deleted file mode 100644 index 5356615b..00000000 --- a/src/pds_doi_service/core/input/test/data/DOI_Release_20200727_from_reserve.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 29569 - InSight Cameras Bundle - 10.17189/29569 - National Aeronautics and Space Administration (NASA) - urn:nasa:pds:insight_cameras::1.0 - NASA Planetary Data System - NASA Planetary Data System - 2019-01-01 - US - InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0 - Dataset - PDS4 Refereed Data Bundle - 2021-04-01 - PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science - - - Deen - R. - - - Abarca - H. - - - Zamani - P. - - - Maki - J. - - - - - - Smith - P. H. - Editor - - - - - Lemmon - M. - Editor - - - - - Beebe - R. F. - Editor - - - - Planetary Data System: Engineering Node - DataCurator - - - PDS Operator - PDS - pds-operator@jpl.nasa.gov - 818.393.7165 - - diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv deleted file mode 100644 index 8c87cda6..00000000 --- a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.csv +++ /dev/null @@ -1,4 +0,0 @@ -status,title,publication_date,product_type_specific,author_last_name,author_first_name,related_resource -Reserved,Laboratory Shocked Feldspars Collection #1,2020-03-11,PDS4 Collection,Johnson,J. R.,urn:nasa:pds:lab_shocked_feldspars::10.0 -Reserved,Laboratory Shocked Feldspars Collection #2,2020-03-12,PDS4 Collection,Johnson_2,J2. R2.,urn:nasa:pds:lab_shocked_feldspars_2::10.0 -Reserved,Laboratory Shocked Feldspars Collection #3,2020-03-13,PDS4 Collection,Johnson_3,J3. R3.,urn:nasa:pds:lab_shocked_feldspars_3::10.0 diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx b/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx deleted file mode 100644 index 37d9c45f02d5c23109121a87aae645b199e1ee14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8997 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 diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv b/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv deleted file mode 100644 index 0e440217..00000000 --- a/src/pds_doi_service/core/input/test/data/DOI_Reserved_PDS3.csv +++ /dev/null @@ -1,2 +0,0 @@ -status,title,publication_date,product_type_specific,author_last_name,author_first_name,related_resource -Reserved,LRO MOON MINI-RF 2/3/5 BISTATIC RADAR V3.0,2019-12-13,PDS3 Dataset,Santo,Andrew,LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0 diff --git a/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml b/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml deleted file mode 100644 index 6aa7a7de..00000000 --- a/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml b/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml deleted file mode 100644 index 44810a0d..00000000 --- a/src/pds_doi_service/core/input/test/data/bundle_in_with_doi_and_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - urn:nasa:pds:insight_cameras - 1.0 - InSight Cameras Bundle - 1.11.1.0 - Product_Bundle - - 10.17189/29569 - R. Deen, H. Abarca, P. Zamani, J.Maki - Smith, P. H.; Lemmon, M.; Beebe, R. F. - 2019 - - InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - - 2020-01-01 - - - - - Observational Intent - - 2019-10-02T04:36:06.728Z - 2020-01-01T14:57:01.214Z - - - Science - Raw - - Visible - Surface - Imaging - - - - Insight - Mission - - urn:nasa:pds:context:investigation:mission.insight - bundle_to_investigation - - - - - Insight Lander - Spacecraft - - - urn:nasa:pds:context:instrument_host:spacecraft.insight - - is_instrument_host - Reference to the Insight spacecraft. - - - - Insight Context Camera - Instrument - - urn:nasa:pds:context:instrument:icc.insight - is_instrument - - Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - - Insight Deployment Camera - Instrument - - urn:nasa:pds:context:instrument:idc.insight - is_instrument - - Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - - Mars - Planet - - urn:nasa:pds:context:target:planet.mars - document_to_target - Reference to the Planet - Mars target - - - - - Archive - This Bundle contains InSight camera data. - - - urn:nasa:pds:insight_cameras:browse - Primary - bundle_has_browse_collection - - - urn:nasa:pds:insight_cameras:calibration - Primary - bundle_has_calibration_collection - - - urn:nasa:pds:insight_cameras:data - Primary - bundle_has_data_collection - - - - - urn:nasa:pds:insight_cameras:miscellaneous - Primary - bundle_has_document_collection - - - urn:nasa:pds:insight_cameras:xml_schema - Primary - bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_20210615_from_reserve.json b/src/pds_doi_service/core/input/test/data/datacite_record_draft.json similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Release_20210615_from_reserve.json rename to src/pds_doi_service/core/input/test/data/datacite_record_draft.json diff --git a/src/pds_doi_service/core/input/test/data/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/datacite_record_draft_with_utf-8-bom.json similarity index 100% rename from src/pds_doi_service/core/input/test/data/tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/datacite_record_draft_with_utf-8-bom.json diff --git a/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml deleted file mode 100644 index 5f092b46..00000000 --- a/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in.xml +++ /dev/null @@ -1,117 +0,0 @@ -> - -urn:nasa:pds:insight_cameras -1.1 -InSight Cameras Bundle 1.1 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml b/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml deleted file mode 100644 index 8125e1e7..00000000 --- a/src/pds_doi_service/core/input/test/data/draft_dir_two_files/bundle_in_with_contributors.xml +++ /dev/null @@ -1,124 +0,0 @@ - - -urn:nasa:pds:insight_cameras -1.0 -InSight Cameras Bundle 1.0 -1.11.1.0 -Product_Bundle - -R. Deen, H. Abarca, P. Zamani, J.Maki - - - -Smith, P. H.; Lemmon, M.; Beebe, R. F. - - - -2019 - -InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - - - - -Observational Intent - -2019-10-02T04:36:06.728Z -2020-01-01T14:57:01.214Z - - -Science -Raw - -Visible -Surface -Imaging - - - -Insight -Mission - -urn:nasa:pds:context:investigation:mission.insight -bundle_to_investigation - - - - -Insight Lander -Spacecraft - - -urn:nasa:pds:context:instrument_host:spacecraft.insight - -is_instrument_host -Reference to the Insight spacecraft. - - - -Insight Context Camera -Instrument - -urn:nasa:pds:context:instrument:icc.insight -is_instrument - -Reference to the InSight Context Camera instrument onboard the InSight spacecraft. - - - - -Insight Deployment Camera -Instrument - -urn:nasa:pds:context:instrument:idc.insight -is_instrument - -Reference to the InSight Deployment Camera instrument onboard the InsSight spacecraft. - - - - - -Mars -Planet - -urn:nasa:pds:context:target:planet.mars -document_to_target -Reference to the Planet - Mars target - - - - -Archive -This Bundle contains InSight camera data. - - -urn:nasa:pds:insight_cameras:browse -Primary -bundle_has_browse_collection - - -urn:nasa:pds:insight_cameras:calibration -Primary -bundle_has_calibration_collection - - -urn:nasa:pds:insight_cameras:data -Primary -bundle_has_data_collection - - - - -urn:nasa:pds:insight_cameras:miscellaneous -Primary -bundle_has_document_collection - - -urn:nasa:pds:insight_cameras:xml_schema -Primary -bundle_has_schema_collection - - diff --git a/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml new file mode 120000 index 00000000..3eab21e5 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle.xml @@ -0,0 +1 @@ +../../../../actions/test/data/pds4_bundle.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..f9f913bd --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/input_dir_two_files/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../../../../actions/test/data/pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_PDS3.xml b/src/pds_doi_service/core/input/test/data/osti_record_registered_with_pds3_identifier.xml similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Release_PDS3.xml rename to src/pds_doi_service/core/input/test/data/osti_record_registered_with_pds3_identifier.xml diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve.json b/src/pds_doi_service/core/input/test/data/osti_record_reserved.json similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve.json rename to src/pds_doi_service/core/input/test/data/osti_record_reserved.json diff --git a/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml b/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml new file mode 120000 index 00000000..3d1ffc42 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/osti_record_reserved.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_reserved.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve_utf-8-bom.json b/src/pds_doi_service/core/input/test/data/osti_record_reserved_with_utf-8-bom.json similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Release_20210216_from_reserve_utf-8-bom.json rename to src/pds_doi_service/core/input/test/data/osti_record_reserved_with_utf-8-bom.json diff --git a/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml new file mode 120000 index 00000000..f9903640 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_contributors.xml @@ -0,0 +1 @@ +../../../actions/test/data/pds4_bundle_with_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml new file mode 120000 index 00000000..a7f43860 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_doi_and_contributors.xml @@ -0,0 +1 @@ +../../../actions/test/data/pds4_bundle_with_doi_and_contributors.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/bundle_in_with_contributors_utf-8-bom.xml b/src/pds_doi_service/core/input/test/data/pds4_bundle_with_utf-8-bom.xml similarity index 100% rename from src/pds_doi_service/core/input/test/data/bundle_in_with_contributors_utf-8-bom.xml rename to src/pds_doi_service/core/input/test/data/pds4_bundle_with_utf-8-bom.xml diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-blank-rows.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_blank_rows.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_invalid_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_column_names.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_with_invalid_rows.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_invalid_rows.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_lid_only.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_lid_only.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI_Reserved_GEO_200318_malformed_column_names.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_malformed_column_names.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-broken.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-broken.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-broken.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-broken.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_missing_columns.xlsx diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.csv similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.csv rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.csv diff --git a/src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.xlsx similarity index 100% rename from src/pds_doi_service/core/input/test/data/DOI-reserve-optionals.xlsx rename to src/pds_doi_service/core/input/test/data/spreadsheet_with_optional_columns.xlsx diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv new file mode 120000 index 00000000..b7ae2cf0 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds3_identifiers.csv @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds3_identifiers.csv \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv new file mode 120000 index 00000000..d7502fc9 --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.csv @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds4_identifiers.csv \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx new file mode 120000 index 00000000..c76ba95d --- /dev/null +++ b/src/pds_doi_service/core/input/test/data/spreadsheet_with_pds4_identifiers.xlsx @@ -0,0 +1 @@ +../../../actions/test/data/spreadsheet_with_pds4_identifiers.xlsx \ No newline at end of file diff --git a/src/pds_doi_service/core/input/test/input_util_test.py b/src/pds_doi_service/core/input/test/input_util_test.py index 3011f9bc..657e3c42 100644 --- a/src/pds_doi_service/core/input/test/input_util_test.py +++ b/src/pds_doi_service/core/input/test/input_util_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import datetime -import os import unittest from os.path import abspath from os.path import join @@ -25,7 +24,7 @@ def test_parse_dois_from_input_file(self): doi_input_util = DOIInputUtil(valid_extensions=".xml") # Test with local file - i_filepath = join(self.input_dir, "bundle_in_with_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_contributors.xml") dois = doi_input_util.parse_dois_from_input_file(i_filepath) self.assertEqual(len(dois), 1) @@ -37,7 +36,7 @@ def test_parse_dois_from_input_file(self): self.assertEqual(len(dois), 1) # Test with local directory - i_filepath = join(self.input_dir, "draft_dir_two_files") + i_filepath = join(self.input_dir, "input_dir_two_files") dois = doi_input_util.parse_dois_from_input_file(i_filepath) self.assertEqual(len(dois), 2) @@ -53,7 +52,7 @@ def test_parse_dois_from_input_file(self): doi_input_util.parse_dois_from_input_file(i_filepath) # Test local file with invalid extension - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_lid_only.xlsx") with self.assertRaises(InputFormatException): doi_input_util.parse_dois_from_input_file(i_filepath) @@ -68,7 +67,7 @@ def test_read_xls(self): doi_input_util = DOIInputUtil() # Test single entry spreadsheet - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_lid_only.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) self.assertEqual(len(dois), 1) @@ -84,7 +83,7 @@ def test_read_xls(self): self.assertIsInstance(doi.publication_date, datetime.datetime) # Test multi entry spreadsheet - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_corrected_identifier.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_pds4_identifiers.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) @@ -98,7 +97,7 @@ def test_read_xls(self): self.assertTrue(all([isinstance(doi.publication_date, datetime.datetime) for doi in dois])) # Test with an invalid spreadsheet (insufficient columns) - i_filepath = join(self.input_dir, "DOI-reserve-broken.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_missing_columns.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -108,7 +107,7 @@ def test_read_xls(self): self.assertIn("only found 5 column(s)", str(err)) # Test with an invalid spreadsheet (wrong column names) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_invalid_column_names.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_column_names.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -118,14 +117,14 @@ def test_read_xls(self): self.assertIn("Please assign the correct column names", str(err)) # Test with a valid spreadsheet with malformed column names (that parser should correct) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_malformed_column_names.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_malformed_column_names.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) self.assertEqual(len(dois), 1) # Test with an invalid spreadsheet (multiple rows with errors) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_invalid_rows.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_rows.xlsx") try: doi_input_util.parse_xls_file(i_filepath) @@ -140,7 +139,7 @@ def test_read_xls(self): self.assertIn("Incorrect publication_date format", str(err)) # Test with a spreadsheet containing optional columns - i_filepath = join(self.input_dir, "DOI-reserve-optionals.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_optional_columns.xlsx") dois = doi_input_util.parse_xls_file(i_filepath) @@ -152,7 +151,7 @@ def test_read_xls(self): self.assertIsNotNone(doi_fields[optional_column]) # Test with a spreadsheet containing blank rows (parser should sanitize these) - i_filepath = join(self.input_dir, "DOI-reserve-blank-rows.xlsx") + i_filepath = join(self.input_dir, "spreadsheet_with_blank_rows.xlsx") # Read the spreadsheet to get a total of rows w/ blanks xl_wb = pd.ExcelFile(i_filepath, engine="openpyxl") @@ -170,7 +169,7 @@ def test_read_csv(self): """Test the DOIInputUtil.parse_csv_file() method""" doi_input_util = DOIInputUtil() - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_pds4_identifiers.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 3) @@ -181,7 +180,7 @@ def test_read_csv(self): self.assertTrue(all([isinstance(doi.publication_date, datetime.datetime) for doi in dois])) # Test on a CSV containing a PD3 style identifier - i_filepath = join(self.input_dir, "DOI_Reserved_PDS3.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_pds3_identifiers.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 1) @@ -192,7 +191,7 @@ def test_read_csv(self): self.assertEqual(doi.pds_identifier, "LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0") # Test with an invalid spreadsheet (insufficient columns) - i_filepath = join(self.input_dir, "DOI-reserve-broken.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_missing_columns.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -202,7 +201,7 @@ def test_read_csv(self): self.assertIn("only found 5 column(s)", str(err)) # Test with an invalid spreadsheet (wrong column names) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_invalid_column_names.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_column_names.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -212,14 +211,14 @@ def test_read_csv(self): self.assertIn("Please assign the correct column names", str(err)) # Test with a valid spreadsheet with malformed column names (that parser should correct) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_malformed_column_names.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_malformed_column_names.csv") dois = doi_input_util.parse_csv_file(i_filepath) self.assertEqual(len(dois), 1) # Test with an invalid spreadsheet (multiple rows with errors) - i_filepath = join(self.input_dir, "DOI_Reserved_GEO_200318_with_invalid_rows.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_invalid_rows.csv") try: doi_input_util.parse_csv_file(i_filepath) @@ -234,7 +233,7 @@ def test_read_csv(self): self.assertIn("Incorrect publication_date format", str(err)) # Test with a spreadsheet containing optional columns - i_filepath = join(self.input_dir, "DOI-reserve-optionals.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_optional_columns.csv") dois = doi_input_util.parse_csv_file(i_filepath) @@ -246,7 +245,7 @@ def test_read_csv(self): self.assertIsNotNone(doi_fields[optional_column]) # Test with a spreadsheet containing blank rows (parser should sanitize these) - i_filepath = join(self.input_dir, "DOI-reserve-blank-rows.csv") + i_filepath = join(self.input_dir, "spreadsheet_with_blank_rows.csv") # Read the spreadsheet to get a total of rows w/ blanks csv_sheet = pd.read_csv(i_filepath, na_filter=False) @@ -264,7 +263,7 @@ def test_read_xml(self): doi_input_util = DOIInputUtil() # Test with a PDS4 label - i_filepath = join(self.input_dir, "bundle_in_with_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_contributors.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -274,7 +273,7 @@ def test_read_xml(self): self.assertIsInstance(doi, Doi) # Test with an OSTI output label - i_filepath = join(self.input_dir, "DOI_Release_20200727_from_reserve.xml") + i_filepath = join(self.input_dir, "osti_record_reserved.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -284,7 +283,7 @@ def test_read_xml(self): self.assertIsInstance(doi, Doi) # Test with an OSTI label containing a PDS3 identifier - i_filepath = join(self.input_dir, "DOI_Release_PDS3.xml") + i_filepath = join(self.input_dir, "osti_record_registered_with_pds3_identifier.xml") dois = doi_input_util.parse_xml_file(i_filepath) self.assertEqual(len(dois), 1) @@ -297,7 +296,7 @@ def test_read_xml(self): self.assertEqual(doi.pds_identifier, "LRO-L-MRFLRO-2/3/5-BISTATIC-V3.0") # Test with a PDS4 label that contains a UTF-8 byte order marker - i_filepath = join(self.input_dir, "bundle_in_with_contributors_utf-8-bom.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_utf-8-bom.xml") # Run a quick sanity check to ensure the input file starts with the BOM with open(i_filepath, "r") as infile: @@ -320,9 +319,9 @@ def test_read_json(self): # Test with the appropriate JSON label for the current service if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - i_filepath = join(self.input_dir, "DOI_Release_20210216_from_reserve.json") + i_filepath = join(self.input_dir, "osti_record_reserved.json") else: - i_filepath = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + i_filepath = join(self.input_dir, "datacite_record_draft.json") dois = doi_input_util.parse_json_file(i_filepath) @@ -334,9 +333,9 @@ def test_read_json(self): # Test with a JSON label that contains a UTF-8 byte order marker if DOIServiceFactory.get_service_type() == SERVICE_TYPE_OSTI: - i_filepath = join(self.input_dir, "DOI_Release_20210216_from_reserve_utf-8-bom.json") + i_filepath = join(self.input_dir, "osti_record_reserved_with_utf-8-bom.json") else: - i_filepath = join(self.input_dir, "tc-4_reserve_RADARGRAM_v2.0_utf-8-bom.json") + i_filepath = join(self.input_dir, "datacite_record_draft_with_utf-8-bom.json") # Run a quick sanity check to ensure the input file starts with the BOM with open(i_filepath, "r") as infile: diff --git a/src/pds_doi_service/core/input/test/pds4_util_test.py b/src/pds_doi_service/core/input/test/pds4_util_test.py index 9054b84b..81d19664 100644 --- a/src/pds_doi_service/core/input/test/pds4_util_test.py +++ b/src/pds_doi_service/core/input/test/pds4_util_test.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -import os import unittest from datetime import datetime from os.path import abspath @@ -53,7 +52,7 @@ def test_parse_dois_from_pds4_label(self): # Test with a PDS4 label containing all the fields we support parsing # DOI metadata for - i_filepath = join(self.input_dir, "bundle_in_with_doi_and_contributors.xml") + i_filepath = join(self.input_dir, "pds4_bundle_with_doi_and_contributors.xml") with open(i_filepath, "r") as infile: xml_contents = infile.read().encode().decode("utf-8-sig") From b291b39e0599f35632e9190cb41ed68eb0c2e6f4 Mon Sep 17 00:00:00 2001 From: Scott Collins Date: Fri, 12 Nov 2021 12:41:57 -0800 Subject: [PATCH 4/4] Reorganized test data for the outputs package to provide better file names and consolidate redundant files --- .../data/DOI_Release_20200727_from_error.xml | 70 ---- .../DOI_Release_20200727_from_release.xml | 68 ---- .../DOI_Release_20210615_from_release.json | 340 ------------------ .../DOI_Release_20210615_from_reserve.json | 210 ----------- .../test/data/datacite_record_draft.json | 1 + .../test/data/datacite_record_findable.json | 1 + ....json => datacite_record_multi_entry.json} | 0 ...from_error.json => osti_record_error.json} | 0 .../outputs/test/data/osti_record_error.xml | 1 + ..._release.json => osti_record_pending.json} | 0 .../outputs/test/data/osti_record_pending.xml | 1 + .../core/outputs/test/datacite_test.py | 15 +- .../core/outputs/test/osti_test.py | 13 +- 13 files changed, 17 insertions(+), 703 deletions(-) delete mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml delete mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml delete mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json delete mode 100644 src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json create mode 120000 src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json create mode 120000 src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json rename src/pds_doi_service/core/outputs/test/data/{DOI_Reserved_multi_entry.json => datacite_record_multi_entry.json} (100%) rename src/pds_doi_service/core/outputs/test/data/{DOI_Release_20210216_from_error.json => osti_record_error.json} (100%) create mode 120000 src/pds_doi_service/core/outputs/test/data/osti_record_error.xml rename src/pds_doi_service/core/outputs/test/data/{DOI_Release_20210216_from_release.json => osti_record_pending.json} (100%) create mode 120000 src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml deleted file mode 100644 index 16e11de6..00000000 --- a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_error.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - 29348 - NASA-PDS - InSight Cameras Bundle 0 - National Aeronautics and Space Administration (NASA) - urn:nasa:pds:insight_cameras::2.0 - 10.17189/29348 - NASA Planetary Data System - NASA Planetary Data System - 2019-01-01 - US - InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&amp;version=1.0 - Dataset - PDS4 Refereed Data Bundle - 2021-02-24 - 2021-03-16 - Camera;Context;Deployment;Insight;Instrument;Lander;Mars;Mission;PDS;Planet;Raw;Science;Spacecraft - Registration update failed: {"errors":[{"source":"url","uid":"10.17189/29348","title":"URL https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&amp;version=1.0 is not allowed by repository osti.nasapds domain settings."}]} - - - H. - Abarca - - - - J. - Maki - - - - R. - Deen - - - - P. - Zamani - - - - - - Planetary Data System: Engineering Node - DataCurator - - - - R. F. - Beebe - Editor - - - - M. - Lemmon - Editor - - - - P. H. - Smith - Editor - - - - - - diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml deleted file mode 100644 index 6a4731b7..00000000 --- a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20200727_from_release.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 29569 - InSight Cameras Bundle - 10.17189/29569 - National Aeronautics and Space Administration (NASA) - urn:nasa:pds:insight_cameras::1.0 - NASA Planetary Data System - NASA Planetary Data System - 2019-01-01 - US - InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products - https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0 - Dataset - PDS4 Refereed Data Bundle - 2021-04-01 - PDS;PDS4;camera;context;data;deployment;edr;engineering;experiment;insight;lander;mars;product;raw;rdr;record;reduced;science - - - Deen - R. - - - Abarca - H. - - - Zamani - P. - - - Maki - J. - - - - - - Smith - P. H. - Editor - - - - - Lemmon - M. - Editor - - - - - Beebe - R. F. - Editor - - - - Planetary Data System: Engineering Node - DataCurator - - - PDS Operator - PDS - pds-operator@jpl.nasa.gov - 818.393.7165 - - diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json deleted file mode 100644 index eaf37772..00000000 --- a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_release.json +++ /dev/null @@ -1,340 +0,0 @@ -{ - "data": [ - { - "id": "10.13143/yzw2-vz66", - "type": "dois", - "attributes": { - "doi": "10.13143/yzw2-vz66", - "identifiers": [ - { - "identifier": "10.13143/yzw2-vz66", - "identifierType": "DOI" - } - ], - "creators": [ - { - "name": "Deen, R.", - "nameType": "Personal", - "givenName": "R.", - "familyName": "Deen", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Abarca, H.", - "nameType": "Personal", - "givenName": "H.", - "familyName": "Abarca", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Zamani, P.", - "nameType": "Personal", - "givenName": "P.", - "familyName": "Zamani", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Maki, J.", - "nameType": "Personal", - "givenName": "J.", - "familyName": "Maki", - "affiliation": [], - "nameIdentifiers": [] - } - ], - "titles": [ - { - "title": "InSight Cameras Bundle" - } - ], - "publisher": "NASA Planetary Data System", - "container": {}, - "publicationYear": "2019", - "subjects": [ - { - "subject": "PDS" - }, - { - "subject": "PDS4" - }, - { - "subject": "camera" - }, - { - "subject": "context" - }, - { - "subject": "data" - }, - { - "subject": "deployment" - }, - { - "subject": "edr" - }, - { - "subject": "engineering" - }, - { - "subject": "experiment" - }, - { - "subject": "insight" - }, - { - "subject": "lander" - }, - { - "subject": "mars" - }, - { - "subject": "product" - }, - { - "subject": "raw" - }, - { - "subject": "rdr" - }, - { - "subject": "record" - }, - { - "subject": "reduced" - }, - { - "subject": "science" - } - ], - "contributors": [ - { - "name": "Smith, P. H.", - "nameType": "Personal", - "givenName": "P. H.", - "familyName": "Smith", - "contributorType": "Editor", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Lemmon, M.", - "nameType": "Personal", - "givenName": "M.", - "familyName": "Lemmon", - "contributorType": "Editor", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Beebe, R. F.", - "nameType": "Personal", - "givenName": "R. F.", - "familyName": "Beebe", - "contributorType": "Editor", - "affiliation": [], - "nameIdentifiers": [] - }, - { - "name": "Planetary Data System: Engineering Node", - "nameType": "Organizational", - "contributorType": "DataCurator", - "affiliation": [], - "nameIdentifiers": [] - } - ], - "dates": [], - "language": "en", - "types": { - "ris": "DATA", - "bibtex": "misc", - "citeproc": "dataset", - "schemaOrg": "Dataset", - "resourceType": "PDS4 Refereed Data Bundle", - "resourceTypeGeneral": "Dataset" - }, - "relatedIdentifiers": [ - { - "relationType": "HasMetadata", - "relatedIdentifier": "urn:nasa:pds:insight_cameras::1.0", - "resourceTypeGeneral": "Text", - "relatedIdentifierType": "URN" - } - ], - "sizes": [], - "formats": [], - "rightsList": [], - "descriptions": [ - { - "lang": "english", - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "descriptionType": "Abstract" - } - ], - "geoLocations": [], - "fundingReferences": [], - "url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "contentUrl": null, - "metadataVersion": 0, - "schemaVersion": "http://datacite.org/schema/kernel-4", - "source": "api", - "isActive": true, - "state": "findable", - "reason": null, - "viewCount": 0, - "downloadCount": 0, - "referenceCount": 0, - "citationCount": 0, - "partCount": 0, - "partOfCount": 0, - "versionCount": 0, - "versionOfCount": 0, - "created": "2021-06-22T22:55:19Z", - "registered": "2021-06-22T22:55:53Z", - "published": null, - "updated": "2021-06-22T23:00:09Z" - }, - "relationships": { - "client": { - "data": { - "id": "dev.fhpuqw", - "type": "clients" - } - } - } - } - ], - "meta": { - "total": 1, - "totalPages": 1, - "page": 1, - "states": [ - { - "id": "findable", - "title": "Findable", - "count": 1 - } - ], - "resourceTypes": [ - { - "id": "dataset", - "title": "Dataset", - "count": 1 - } - ], - "created": [ - { - "id": "2021", - "title": "2021", - "count": 1 - } - ], - "published": [ - { - "id": "2019", - "title": "2019", - "count": 1 - } - ], - "registered": [ - { - "id": "2021", - "title": "2021", - "count": 1 - } - ], - "providers": [ - { - "id": "dev", - "title": "Developer Provider", - "count": 1 - } - ], - "clients": [ - { - "id": "dev.fhpuqw", - "title": "JPL NASA", - "count": 1 - } - ], - "affiliations": [], - "prefixes": [ - { - "id": "10.13143", - "title": "10.13143", - "count": 1 - } - ], - "certificates": [], - "licenses": [], - "schemaVersions": [ - { - "id": "4", - "title": "Schema 4", - "count": 1 - } - ], - "linkChecksStatus": [], - "subjects": [ - { - "id": "PDS", - "title": "Pds", - "count": 1 - }, - { - "id": "PDS4", - "title": "Pds4", - "count": 1 - }, - { - "id": "camera", - "title": "Camera", - "count": 1 - }, - { - "id": "context", - "title": "Context", - "count": 1 - }, - { - "id": "data", - "title": "Data", - "count": 1 - }, - { - "id": "deployment", - "title": "Deployment", - "count": 1 - }, - { - "id": "edr", - "title": "Edr", - "count": 1 - }, - { - "id": "engineering", - "title": "Engineering", - "count": 1 - }, - { - "id": "experiment", - "title": "Experiment", - "count": 1 - }, - { - "id": "insight", - "title": "Insight", - "count": 1 - } - ], - "fieldsOfScience": [], - "citations": [], - "views": [], - "downloads": [] - }, - "links": { - "self": "https://api.test.datacite.org/dois?query=10.13143%2Fd0e6-qs05&client-id=dev.fhpuqw" - } -} diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json b/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json deleted file mode 100644 index f166633d..00000000 --- a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210615_from_reserve.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "data": { - "id": "10.13143/yzw2-vz66", - "type": "dois", - "attributes": { - "doi": "10.13143/yzw2-vz66", - "prefix": "10.13143", - "suffix": "yzw2-vz66", - "identifiers": [ - { - "identifier": "10.13143/yzw2-vz66", - "identifierType": "DOI" - }, - { - "identifier": "urn:nasa:pds:insight_cameras::1.0", - "identifierType": "URN" - } - ], - "alternateIdentifiers": [], - "creators": [ - { - "nameType": "Personal", - "name": "Deen, R.", - "givenName": "R.", - "familyName": "Deen", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Personal", - "name": "Abarca, H.", - "givenName": "H.", - "familyName": "Abarca", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Personal", - "name": "Zamani, P.", - "givenName": "P.", - "familyName": "Zamani", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Personal", - "name": "Maki, J.", - "givenName": "J.", - "familyName": "Maki", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - } - ], - "titles": [ - { - "title": "InSight Cameras Bundle" - } - ], - "publisher": "NASA Planetary Data System", - "container": {}, - "publicationYear": "2019", - "subjects": [ - { - "subject": "PDS" - }, - { - "subject": "PDS4" - }, - { - "subject": "camera" - }, - { - "subject": "context" - }, - { - "subject": "data" - }, - { - "subject": "deployment" - }, - { - "subject": "edr" - }, - { - "subject": "engineering" - }, - { - "subject": "experiment" - }, - { - "subject": "insight" - }, - { - "subject": "lander" - }, - { - "subject": "mars" - }, - { - "subject": "product" - }, - { - "subject": "raw" - }, - { - "subject": "rdr" - }, - { - "subject": "record" - }, - { - "subject": "reduced" - }, - { - "subject": "science" - } - ], - "contributors": [ - { - "nameType": "Personal", - "name": "Smith, P. H.", - "givenName": "P. H.", - "familyName": "Smith", - "contributorType": "Editor", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Personal", - "name": "Lemmon, M.", - "givenName": "M.", - "familyName": "Lemmon", - "contributorType": "Editor", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Personal", - "name": "Beebe, R. F.", - "givenName": "R. F.", - "familyName": "Beebe", - "contributorType": "Editor", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - }, - { - "nameType": "Organizational", - "name": "Planetary Data System: Engineering Node", - "contributorType": "DataCurator", - "affiliation": ["NASA PDS"], - "nameIdentifiers": [] - } - ], - "dates": [], - "language": "en", - "types": { - "schemaOrg": "Dataset", - "citeproc": "dataset", - "bibtex": "misc", - "ris": "DATA", - "resourceTypeGeneral": "Dataset", - "resourceType": "PDS4 Refereed Data Bundle" - }, - "relatedIdentifiers": [ - { - "relatedIdentifier": "urn:nasa:pds:insight_cameras::1.0", - "relatedIdentifierType": "URN", - "relationType": "HasMetadata" - } - ], - "sizes": [], - "formats": [], - "rightsList": [], - "descriptions": [ - { - "description": "InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products", - "descriptionType": "Abstract", - "lang": "english" - } - ], - "geoLocations": [], - "fundingReferences": [], - "xml": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJlc291cmNlIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuMTMxNDMvWVpXMi1WWjY2PC9pZGVudGlmaWVyPgogIDxjcmVhdG9ycz4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5EZWVuLCBSLjwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+Ui48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+RGVlbjwvZmFtaWx5TmFtZT4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5BYmFyY2EsIEguPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5ILjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5BYmFyY2E8L2ZhbWlseU5hbWU+CiAgICA8L2NyZWF0b3I+CiAgICA8Y3JlYXRvcj4KICAgICAgPGNyZWF0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+WmFtYW5pLCBQLjwvY3JlYXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+UC48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+WmFtYW5pPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPk1ha2ksIEouPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5KLjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5NYWtpPC9mYW1pbHlOYW1lPgogICAgPC9jcmVhdG9yPgogIDwvY3JlYXRvcnM+CiAgPHRpdGxlcz4KICAgIDx0aXRsZT5JblNpZ2h0IENhbWVyYXMgQnVuZGxlPC90aXRsZT4KICA8L3RpdGxlcz4KICA8cHVibGlzaGVyPk5BU0EgUGxhbmV0YXJ5IERhdGEgU3lzdGVtPC9wdWJsaXNoZXI+CiAgPHB1YmxpY2F0aW9uWWVhcj4yMDE5PC9wdWJsaWNhdGlvblllYXI+CiAgPHJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVHZW5lcmFsPSJEYXRhc2V0Ij5QRFM0IFJlZmVyZWVkIERhdGEgQnVuZGxlPC9yZXNvdXJjZVR5cGU+CiAgPHN1YmplY3RzPgogICAgPHN1YmplY3Q+UERTPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+UERTNDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmNhbWVyYTwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmNvbnRleHQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5kYXRhPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+ZGVwbG95bWVudDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmVkcjwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmVuZ2luZWVyaW5nPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+ZXhwZXJpbWVudDwvc3ViamVjdD4KICAgIDxzdWJqZWN0Pmluc2lnaHQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5sYW5kZXI8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5tYXJzPC9zdWJqZWN0PgogICAgPHN1YmplY3Q+cHJvZHVjdDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJhdzwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJkcjwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJlY29yZDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PnJlZHVjZWQ8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5zY2llbmNlPC9zdWJqZWN0PgogIDwvc3ViamVjdHM+CiAgPGNvbnRyaWJ1dG9ycz4KICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IkVkaXRvciI+CiAgICAgIDxjb250cmlidXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5TbWl0aCwgUC4gSC48L2NvbnRyaWJ1dG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5QLiBILjwvZ2l2ZW5OYW1lPgogICAgICA8ZmFtaWx5TmFtZT5TbWl0aDwvZmFtaWx5TmFtZT4KICAgIDwvY29udHJpYnV0b3I+CiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJFZGl0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+TGVtbW9uLCBNLjwvY29udHJpYnV0b3JOYW1lPgogICAgICA8Z2l2ZW5OYW1lPk0uPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkxlbW1vbjwvZmFtaWx5TmFtZT4KICAgIDwvY29udHJpYnV0b3I+CiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJFZGl0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJQZXJzb25hbCI+QmVlYmUsIFIuIEYuPC9jb250cmlidXRvck5hbWU+CiAgICAgIDxnaXZlbk5hbWU+Ui4gRi48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+QmVlYmU8L2ZhbWlseU5hbWU+CiAgICA8L2NvbnRyaWJ1dG9yPgogICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iRGF0YUN1cmF0b3IiPgogICAgICA8Y29udHJpYnV0b3JOYW1lIG5hbWVUeXBlPSJPcmdhbml6YXRpb25hbCI+UGxhbmV0YXJ5IERhdGEgU3lzdGVtOiBFbmdpbmVlcmluZyBOb2RlPC9jb250cmlidXRvck5hbWU+CiAgICA8L2NvbnRyaWJ1dG9yPgogIDwvY29udHJpYnV0b3JzPgogIDxyZWxhdGVkSWRlbnRpZmllcnM+CiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJVUk4iIHJlbGF0aW9uVHlwZT0iSGFzTWV0YWRhdGEiIHJlc291cmNlVHlwZUdlbmVyYWw9IlRleHQiPnVybjpuYXNhOnBkczppbnNpZ2h0X2NhbWVyYXM6OjEuMDwvcmVsYXRlZElkZW50aWZpZXI+CiAgPC9yZWxhdGVkSWRlbnRpZmllcnM+CiAgPHNpemVzLz4KICA8Zm9ybWF0cy8+CiAgPHZlcnNpb24vPgogIDxkZXNjcmlwdGlvbnM+CiAgICA8ZGVzY3JpcHRpb24geG1sOmxhbmc9ImVuZ2xpc2giIGRlc2NyaXB0aW9uVHlwZT0iQWJzdHJhY3QiPkluU2lnaHQgQ2FtZXJhcyBFeHBlcmltZW50IERhdGEgUmVjb3JkIChFRFIpIGFuZCBSZWR1Y2VkIERhdGEgUmVjb3JkIChSRFIpIERhdGEgUHJvZHVjdHM8L2Rlc2NyaXB0aW9uPgogIDwvZGVzY3JpcHRpb25zPgo8L3Jlc291cmNlPgo=", - "url": "https://pds.nasa.gov/ds-view/pds/viewBundle.jsp?identifier=urn%3Anasa%3Apds%3Ainsight_cameras&version=1.0", - "contentUrl": null, - "metadataVersion": 0, - "schemaVersion": "http://datacite.org/schema/kernel-4", - "source": "api", - "isActive": false, - "state": "draft", - "reason": null, - "landingPage": null, - "viewCount": 0, - "viewsOverTime": [], - "downloadCount": 0, - "downloadsOverTime": [], - "referenceCount": 0, - "citationCount": 0, - "citationsOverTime": [], - "partCount": 0, - "partOfCount": 0, - "versionCount": 0, - "versionOfCount": 0, - "created": "2021-06-03T18:39:13.000Z", - "registered": null, - "published": "2019", - "updated": "2021-06-03T18:39:13.000Z" - } - } -} diff --git a/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json new file mode 120000 index 00000000..28cec153 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/datacite_record_draft.json @@ -0,0 +1 @@ +../../../input/test/data/datacite_record_draft.json \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json new file mode 120000 index 00000000..eb24b27f --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/datacite_record_findable.json @@ -0,0 +1 @@ +../../../actions/test/data/datacite_record_findable.json \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Reserved_multi_entry.json b/src/pds_doi_service/core/outputs/test/data/datacite_record_multi_entry.json similarity index 100% rename from src/pds_doi_service/core/outputs/test/data/DOI_Reserved_multi_entry.json rename to src/pds_doi_service/core/outputs/test/data/datacite_record_multi_entry.json diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_error.json b/src/pds_doi_service/core/outputs/test/data/osti_record_error.json similarity index 100% rename from src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_error.json rename to src/pds_doi_service/core/outputs/test/data/osti_record_error.json diff --git a/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml b/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml new file mode 120000 index 00000000..a56156f4 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/osti_record_error.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_error.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_release.json b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.json similarity index 100% rename from src/pds_doi_service/core/outputs/test/data/DOI_Release_20210216_from_release.json rename to src/pds_doi_service/core/outputs/test/data/osti_record_pending.json diff --git a/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml new file mode 120000 index 00000000..8fc8fbc3 --- /dev/null +++ b/src/pds_doi_service/core/outputs/test/data/osti_record_pending.xml @@ -0,0 +1 @@ +../../../actions/test/data/osti_record_pending.xml \ No newline at end of file diff --git a/src/pds_doi_service/core/outputs/test/datacite_test.py b/src/pds_doi_service/core/outputs/test/datacite_test.py index 9f1ba9ec..bab8395e 100644 --- a/src/pds_doi_service/core/outputs/test/datacite_test.py +++ b/src/pds_doi_service/core/outputs/test/datacite_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import json -import os import unittest from datetime import datetime from os.path import abspath @@ -37,7 +36,7 @@ def setUpClass(cls): def test_create_datacite_label_json(self): """Test creation of a DataCite JSON label from a Doi object""" # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -79,7 +78,7 @@ def test_create_datacite_label_json(self): def test_update_datacite_label_json(self): """Test creation of a DataCite label for a DOI record where the identifier has been updated""" - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -116,7 +115,7 @@ def requests_valid_request_patch(method, url, **kwargs): response = Response() response.status_code = 200 - with open(join(DOIDataCiteWebClientTestCase.input_dir, "DOI_Release_20210615_from_release.json")) as infile: + with open(join(DOIDataCiteWebClientTestCase.input_dir, "datacite_record_findable.json")) as infile: response._content = infile.read().encode() return response @@ -335,7 +334,7 @@ def _compare_doi_to_expected(self, doi): def test_parse_datacite_response_json(self): """Test parsing of an DataCite label in JSON format""" # Test with a nominal file containing most of the optional fields - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -350,7 +349,7 @@ def test_parse_datacite_response_json(self): def test_get_record_for_identifier(self): """Test isolation of specific record based on PDS identifier""" - input_json_file = join(self.input_dir, "DOI_Reserved_multi_entry.json") + input_json_file = join(self.input_dir, "datacite_record_multi_entry.json") # Test extraction of a single record from a multi-entry label, parse the # DOI from the result, and ensure we get the record back we expected @@ -376,7 +375,7 @@ def test_get_record_for_identifier(self): def test_get_record_for_doi(self): """Test isolation of a specific record based on DOI""" - input_json_file = join(self.input_dir, "DOI_Reserved_multi_entry.json") + input_json_file = join(self.input_dir, "datacite_record_multi_entry.json") # Test extraction of a single record from a multi-entry label, parse the DOI # from the result, and ensure we got the record back we expected @@ -411,7 +410,7 @@ def test_json_label_validation(self): validator = DOIDataCiteValidator() # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210615_from_reserve.json") + input_json_file = join(self.input_dir, "datacite_record_draft.json") # Next, create a valid output DataCite label from the parsed Doi with open(input_json_file, "r") as infile: diff --git a/src/pds_doi_service/core/outputs/test/osti_test.py b/src/pds_doi_service/core/outputs/test/osti_test.py index cfb03f2f..ec2e082a 100644 --- a/src/pds_doi_service/core/outputs/test/osti_test.py +++ b/src/pds_doi_service/core/outputs/test/osti_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python import json -import os import unittest from datetime import datetime from os.path import abspath @@ -27,7 +26,7 @@ def setUpClass(cls): def test_create_osti_label_xml(self): """Test creation of an OSTI XML label from a Doi object""" # Parse sample input to obtain a Doi object - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_release.xml") + input_xml_file = join(self.input_dir, "osti_record_pending.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -52,7 +51,7 @@ def test_create_osti_label_xml(self): def test_create_osti_label_json(self): """Test creation of an OSTI JSON label from Doi objects""" # Parse sample input to obtain a Doi object - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_release.json") + input_json_file = join(self.input_dir, "osti_record_pending.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -147,7 +146,7 @@ def _compare_doi_to_expected(self, doi): def test_parse_osti_response_xml(self): """Test parsing of an OSTI label in XML format""" # Test with a nominal file containing most of the optional fields - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_release.xml") + input_xml_file = join(self.input_dir, "osti_record_pending.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -161,7 +160,7 @@ def test_parse_osti_response_xml(self): self._compare_doi_to_expected(doi) # Test with an erroneous file to ensure errors are parsed as we expect - input_xml_file = join(self.input_dir, "DOI_Release_20200727_from_error.xml") + input_xml_file = join(self.input_dir, "osti_record_error.xml") with open(input_xml_file, "r") as infile: input_xml = infile.read() @@ -173,7 +172,7 @@ def test_parse_osti_response_xml(self): def test_parse_osti_response_json(self): """Test parsing of an OSTI label in JSON format""" # Test with a nominal file containing most of the optional fields - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_release.json") + input_json_file = join(self.input_dir, "osti_record_pending.json") with open(input_json_file, "r") as infile: input_json = infile.read() @@ -187,7 +186,7 @@ def test_parse_osti_response_json(self): self._compare_doi_to_expected(doi) # Test with an erroneous file to ensure errors are parsed as we expect - input_json_file = join(self.input_dir, "DOI_Release_20210216_from_error.json") + input_json_file = join(self.input_dir, "osti_record_error.json") with open(input_json_file, "r") as infile: input_json = infile.read()