Skip to content

Commit

Permalink
maybe last set of fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Al Niessner authored and Al Niessner committed Jan 24, 2025
1 parent b48c28e commit 9b64749
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/test/java/cucumber/StepDefs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ private List<String> resolveArgumentStrings(String args) {
}
if (catalogNext) {
catalogNext = false;
if (!this.createCatalogFile(this.normalize(arg), this.datasink.toAbsolutePath().toString())) {
arg = arg.replace("datasrc", "datasink");
if (!this.createCatalogFile(this.normalize(arg), this.datasrc.toAbsolutePath().toString())) {
arg = arg.replace("{datasrc}", "{datasink}");
}
}
if (manifestNext) {
Expand Down
32 changes: 16 additions & 16 deletions src/test/resources/features/pre.3.6.x.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ Feature: < 3.6
| 611 | | "github611" | "-t {datasrc}/GRD-L1A-150313-150319_150625-BGO.xml" | "summary:totalWarnings=9,summary:messageTypes:warning.table.field_value_out_of_special_constant_min_max_range=9" |
| 605 | | "github605" | "--skip-context-validation -t {datasrc}/video_and_audio.xml" | |
| 604 | | "github604" | "--skip-context-validation -t {datasrc}/video.xml" | |
| 599 | 1 | "github599" | "--skip-context-validation -t {datasrc}/AREA_Camelot_1radii.xml" | |
| 599 | 2 | "github599" | "--skip-context-validation -x {datasrc}/PDS4_PDS_1I00.xsd -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=1" |
| 599 | 3 | "github599" | "--skip-context-validation -S {datasrc}/PDS4_PDS_1I00.sch -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=1" |
| 599 | 4 | "github599" | "--skip-context-validation -S {datasrc}/PDS4_PDS_1I00.sch -x {datasrc}/PDS4_PDS_1I00.xsd -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=1" |
| 599 | 1 | "github599" | "--skip-context-validation -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalWarnings=1,summary:messageTypes:warning.label.schematron=1" |
| 599 | 2 | "github599" | "--skip-context-validation -x {datasrc}/PDS4_PDS_1I00.xsd -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=1" |
| 599 | 3 | "github599" | "--skip-context-validation -S {datasrc}/PDS4_PDS_1I00.sch -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=1,summary:totalWarnings=1,summary:productValidation:failed=1,summary:messageTypes:error.label.schematron=1,summary:messageTypes:warning.label.schematron=1" |
| 599 | 4 | "github599" | "--skip-context-validation -S {datasrc}/PDS4_PDS_1I00.sch -x {datasrc}/PDS4_PDS_1I00.xsd -t {datasrc}/AREA_Camelot_1radii.xml" | "summary:totalErrors=2,summary:totalWarnings=1,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=1,summary:messageTypes:error.label.schematron=1,summary:messageTypes:warning.label.schematron=1" |
| 597 | 1 | "github597" | "--skip-context-validation -R pds4.bundle -t {datasrc}" | "summary:totalWarnings=70,summary:productValidation:skipped=4,summary:messageTypes:warning.file.not_referenced_in_label=1,summary:messageTypes:warning.integrity.reference_not_found=69" |
| 597 | 2 | "github562" | "-t {datasrc}" | |
| 597 | 3 | "github561" | "-R pds4.collection --label-extension lblx --skip-context-validation -t {datasrc}" | |
Expand Down Expand Up @@ -140,23 +140,23 @@ Feature: < 3.6
| 299 | 1 | "github299" | "-R pds4.label -t {datasrc}/valid/gbo_ast_fieber-beyer_spectra_v2.0_20210211_aip_v1.0.xml" | |
| 299 | 2 | "github299" | "-R pds4.label -t {datasrc}/invalid/gbo_ast_fieber-beyer_spectra_v2.0_20210211_aip_v1.0.xml" | "summary:totalErrors=3,summary:productValidation:failed=1,summary:messageTypes:error.table.field_value_data_type_mismatch=3" |
| 298 | 1 | "github298" | "-R pds4.label --skip-context-validation {datasrc}/valid/sentences.xml" | |
| 298 | 2 | "github298" | "-R pds4.label --skip-context-validation {datasrc}/invalid/sentences.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.validation.invalid_field_value=1" |
| 298 | 2 | "github298" | "-R pds4.label --skip-context-validation {datasrc}/invalid/sentences.xml" | "summary:totalErrors=43,summary:productValidation:failed=1,summary:messageTypes:error.validation.invalid_field_value=43" |
| 297 | 1 | "github297" | "--skip-context-validation -R pds4.label -t {datasrc}/valid/rimfax_rdr_0081_example.xml" | |
| 297 | 2 | "github297" | "--skip-context-validation -R pds4.label -t {datasrc}/invalid/rimfax_rdr_0081_example.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.table.field_value_out_of_min_max_range=1" |
| 294 | 1 | "github294" | "--skip-context-validation -R pds4.label -t {datasrc}/valid/minmax-error.xml" | |
| 294 | 2 | "github294" | "--skip-context-validation -R pds4.label -t {datasrc}/invalid/minmax-error.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.table.records_mismatch=1" |
| 292 | 1 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_LF_VALID.xml" | |
| 292 | 2 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_CRLF_VALID.xml" | |
| 292 | 3 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_LF_FAIL.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_LF=1" |
| 292 | 4 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_CRLF_FAIL.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_CRLF=1" |
| 292 | 5 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/valid/minimal_test_product_lf.xml" | "summary:totalErrors=3,summary:productValidation:failed=1,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=1" |
| 292 | 6 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/valid/minimal_test_product_crlf.xml" | "summary:totalErrors=3,summary:productValidation:failed=1,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=1" |
| 292 | 7 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/invalid/minimal_test_product_lf.xml" | "summary:totalErrors=13,summary:productValidation:failed=1,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=1,summary:messageTypes:error.table.field_value_data_type_mismatch=6,summary:messageTypes:error.table.missing_LF=4" |
| 292 | 8 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/invalid/minimal_test_product_crlf.xml" | "summary:totalErrors=4,summary:productValidation:failed=1,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=1,summary:messageTypes:error.table.record_length_mismatch=1" |
| 292 | 3 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_LF_FAIL.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_LF=1" |
| 292 | 4 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_delimited/kgrs_calibrated_spectra_per1_CRLF_FAIL.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_CRLF=1" |
| 292 | 5 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/valid/minimal_test_product_lf.xml" | |
| 292 | 6 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/valid/minimal_test_product_crlf.xml" | |
| 292 | 7 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/invalid/minimal_test_product_lf.xml" | "summary:totalErrors=10,summary:productValidation:failed=1,summary:messageTypes:error.table.field_value_data_type_mismatch=6,summary:messageTypes:error.table.missing_LF=4" |
| 292 | 8 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/table_character/invalid/minimal_test_product_crlf.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.table.record_length_mismatch=1" |
| 292 | 9 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_LF_VALID.xml" | |
| 292 | 10 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_CRLF_VALID.xml" | |
| 292 | 11 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_LF_FAIL.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_LF=1" |
| 292 | 12 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_CRLF_FAIL.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_CRLF=1" |
| 292 | 11 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_LF_FAIL.xml" | "summary:totalErrors=3,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_LF=3" |
| 292 | 12 | "github292" | "--skip-context-validation -C {datasink}/catalog.xml -schema src/test/resources/github292/pds/v1/PDS4_PDS_1G00.xsd -schematron src/test/resources/github292/pds/v1/PDS4_PDS_1G00.sch -R pds4.label -t {datasrc}/inventory/collection_eetable_inventory_CRLF_FAIL.xml" | "summary:totalErrors=3,summary:productValidation:failed=1,summary:messageTypes:error.table.missing_CRLF=3" |
| 291 | 1 | "github291" | "--skip-context-validation -R pds4.bundle -t {datasrc}/valid/bundle_kaguya_derived.xml" | "summary:totalWarnings=8,summary:productValidation:skipped=6,summary:messageTypes:warning.file.not_referenced_in_label=2,summary:messageTypes:warning.integrity.pds4_version_mismatch=1,summary:messageTypes:warning.integrity.reference_not_found=3,summary:messageTypes:warning.integrity.unreferenced_member=2" |
| 291 | 2 | "github291" | "--skip-context-validation -R pds4.bundle -t {datasrc}/invalid/bundle_kaguya_derived.xml" | "summary:totalWarnings=10,summary:productValidation:skipped=6,summary:messageTypes:warning.file.not_referenced_in_label=2,summary:messageTypes:warning.integrity.pds4_version_mismatch=1,summary:messageTypes:warning.integrity.reference_not_found=3,summary:messageTypes:warning.integrity.unreferenced_member=2,summary:messageTypes:warning.label.bad_schematypens=1,summary:messageTypes:warning.label.missing_schematron_spec=1" |
| 281 | 1 | "github281" | "-R pds4.label {datasrc}/invalid/collection_gwe_spk_invalid_1_bad_filesize.xml" | "summary:totalErrors=1,summary:totalWarnings=2,summary:productValidation:failed=1,summary:messageTypes:error.label.filesize_mismatch=1,summary:messageTypes:warning.label.context_ref_mismatch=2" |
Expand Down Expand Up @@ -190,13 +190,13 @@ Feature: < 3.6
| 149 | 2 | "github173" | "--skip-context-validation -t {datasrc}/invalid/bundle_kaguya_derived.xml" | |
| 137 | 1 | "github137" | "-t {datasrc}/delimited_table_good.xml" | "summary:totalErrors=4,summary:productValidation:failed=1,summary:messageTypes:error.label.context_ref_not_found=3,summary:messageTypes:error.label.filesize_mismatch=1" |
| 137 | 2 | "github137" | "-t {datasrc}/delimited_table_bad.xml" | "summary:totalErrors=5,summary:productValidation:failed=1,summary:messageTypes:error.label.context_ref_not_found=3,summary:messageTypes:error.table.field_value_data_type_mismatch=2" |
| 87 | | "github87" | "-R pds4.label --skip-content-validation -t {datasrc}/2t126632959btr0200p3002n0a1.xml {datasrc}/2t126646972btr0200p3001n0a1.xml -C {datasink}/catalog.xml" | |
| 87 | | "github87" | "-R pds4.label --skip-content-validation -t {datasrc}/2t126632959btr0200p3002n0a1.xml {datasrc}/2t126646972btr0200p3001n0a1.xml -C {datasink}/catalog.xml" | "summary:totalWarnings=2,summary:messageTypes:warning.label.context_ref_mismatch=2" |
| 84 | 1 | "github84" | "--no-data-check -c {datasrc}/config.txt -t {datasrc}/../github71/ELE_MOM.xml" | "summary:totalErrors=1,summary:totalWarnings=2,summary:productValidation:failed=1,summary:messageTypes:error.label.context_ref_not_found=1,summary:messageTypes:warning.label.context_ref_mismatch=1,summary:messageTypes:warning.label.schema=1" |
| 84 | 2 | "github84" | "--skip-content-validation --skip-context-validation -c {datasrc}/config.txt -t {datasrc}/../github71/ELE_MOM.xml" | "summary:totalWarnings=1,summary:messageTypes:warning.label.schema=1" |
| 71 | 1 | "github71" | "-C {datasrc}/catalog.xml --skip-content-validation --skip-context-validation -t {datasrc}/ELE_MOM.xml" | "summary:totalErrors=9,summary:totalWarnings=3,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=2,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=5,summary:messageTypes:warning.label.schema=3" |
| 71 | 2 | "github71" | "-C {datasrc}/catalog.xml --skip-context-validation -t {datasrc}/ELE_MOM_2.xml" | "summary:totalErrors=9,summary:totalWarnings=3,summary:productValidation:failed=1,summary:messageTypes:error.label.schema=2,summary:messageTypes:error.label.schematron=2,summary:messageTypes:error.label.unresolvable_resource=5,summary:messageTypes:warning.label.schema=3" |
| 62 | 1 | "github62" | "-v1 --no-data-check -t {datasrc}/ele_mom_tblChar.xml" | "summary:totalErrors=0,summary:totalWarnings=0,summary:messageTypes:info.label.context_ref_found=1" |
| 62 | 2 | "github62" | "-v1 --no-data-check -t {datasrc}/spacecraft.orex_1.1.xml" | "summary:totalErrors=1,summary:totalWarnings=0,summary:productValidation:failed=1,summary:messageTypes:info.label.context_ref_found=1,summary:messageTypes:error.label.context_ref_not_found=1" |
| 62 | 1 | "github62" | "-v1 --no-data-check -t {datasrc}/ele_mom_tblChar.xml" | "summary:totalErrors=4,summary:totalWarnings=3,summary:productValidation:failed=1,summary:messageTypes:error.label.context_ref_not_found=1,summary:messageTypes:error.label.schema=1,summary:messageTypes:error.label.schematron=1,summary:messageTypes:error.label.table_definition_problem=1,summary:messageTypes:info.label.context_ref_found=3,summary:messageTypes:warning.label.context_ref_mismatch=1,summary:messageTypes:warning.label.schema=1,summary:messageTypes:warning.label.schematron=1" |
| 62 | 2 | "github62" | "-v1 --no-data-check -t {datasrc}/spacecraft.orex_1.1.xml" | "summary:totalErrors=1,summary:productValidation:failed=1,summary:messageTypes:error.label.context_ref_not_found=1,summary:messageTypes:info.label.context_ref_found=7" |
| 57 | 1 | "github57" | "-R pds4.label --strict-field-checks --skip-context-validation -t {datasrc}/validate_57a_valid.xml" | "summary:totalWarnings=5,summary:messageTypes:warning.table.characters_between_fields=5" |
| 57 | 2 | "github57" | "-R pds4.label --skip-context-validation -t {datasrc}/validate_57a_valid.xml" | |
| 57 | 3 | "github57" | "-R pds4.label --strict-field-checks --skip-context-validation -t {datasrc}/validate_57a_invalid.xml" | "summary:totalErrors=4,summary:productValidation:failed=1,summary:messageTypes:error.table.field_value_overlap=2,summary:messageTypes:error.table.records_mismatch=1,summary:messageTypes:info.validation.general=1" |
Expand Down

0 comments on commit 9b64749

Please sign in to comment.