Skip to content

Commit

Permalink
fixes on last bugfix
Browse files Browse the repository at this point in the history 
Updated the pom to use a patched version of xml-resolver. Not sure why it is not published by the original authors, but it did fix the test killing eclipse.

Moved the last set of problems to bottom of the test stack so that {reportDir}/catalog.xml will be for those three last troublesome tests.
  • Loading branch information
Al Niessner authored and Al Niessner committed Dec 21, 2024
1 parent 435be35 commit 8237c73
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
12 changes: 9 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,13 @@
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>OSGeo</id>
<name>OSGeo</name>
<url> https://repo.osgeo.org/repository/release/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.verapdf</groupId>
Expand Down Expand Up @@ -276,8 +282,8 @@
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.2</version>
<artifactId>xml-resolver-patched</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down
13 changes: 6 additions & 7 deletions src/test/resources/features/pre.3.6.x.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,13 +481,6 @@ Scenario Outline: <testId>

| NASA-PDS/validate#7 |"NASA-PDS/validate#7 Success with ComplexLSB8" | "github7" | 0 | "0 errors expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github7.json -s json --skip-context-validation -t {resourceDir}/github7/ch2_sar_ncxs_20090107t163003745_d_sli_xx_fp_hh_pb1_19111.xml" | "report_github7.json" |

# BIG_NOTE: The tests for github6 has to be moved toward the beginning as leave them here results in error in information model.
# BIG_NOTE: The tests for github240 has to be moved toward the beginning as leave them here results in error in information model.
# FIXME 1058: Oh boy. It seems clearing the cache has now broken these tests both 71 and 84 --> they also kill eclipse for scary reasons. Ignore them for now as the schema is not working with the test: namespace
#| NASA-PDS/validate#71-1 |"NASA-PDS/validate#71 1" | "github71" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github71_1.json -s json -C {reportDir}/github71/catalog.xml --skip-content-validation -t {resourceDir}/github71/ELE_MOM.xml" | "report_github71_1.json" |
#| NASA-PDS/validate#71-2 |"NASA-PDS/validate#71 2" | "github71" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github71_2.json -s json -C {reportDir}/github71/catalog.xml -t {resourceDir}/github71/ELE_MOM_2.xml" | "report_github71_2.json" |
| NASA-PDS/validate#84-1 |"NASA-PDS/validate#84 1" | "github84" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github84_1.json -s json --skip-content-validation --skip-context-validation -c {resourceDir}/github84/config.txt -t {resourceDir}/github71/ELE_MOM.xml" | "report_github84_1.json" |

| NASA-PDS/validate#87 |"NASA-PDS/validate#87 1" | "github87" | 0 | "0 errors expected" | "LABEL_UNRESOLVABLE_RESOURCE" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github87_1.json -s json -R pds4.label --skip-content-validation -t {resourceDir}/github87/2t126632959btr0200p3002n0a1.xml {resourceDir}/github87/2t126646972btr0200p3001n0a1.xml -C {reportDir}/catalog.xml" | "report_github87_1.json" |

# Moved github292 tests to the end as they interfer with other test with the following error message:
Expand Down Expand Up @@ -520,3 +513,9 @@ Scenario Outline: <testId>
| NASA-PDS/validate#292-5 |"NASA-PDS/validate#292 INVENTORY VALID CRLF" | "github292" | 0 | "0 error messages expected." | "totalErrors" | "src/test/resources" | "target/test" | "--skip-context-validation -C {reportDir}/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 {reportDir}/report_github292_label_inventory_valid_crlf.json -s json -R pds4.label -t {resourceDir}/github292/inventory/collection_eetable_inventory_CRLF_VALID.xml" | "report_github292_label_inventory_valid_crlf.json" |
| NASA-PDS/validate#292-6 |"NASA-PDS/validate#292 INVENTORY INVALID LF" | "github292" | 3 | "3 error messages expected for MISSING_LF." | "MISSING_LF" | "src/test/resources" | "target/test" | "--skip-context-validation -C {reportDir}/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 {reportDir}/report_github292_label_inventory_invalid_lf.json -s json -R pds4.label -t {resourceDir}/github292/inventory/collection_eetable_inventory_LF_FAIL.xml" | "report_github292_label_inventory_invalid_lf.json" |
| NASA-PDS/validate#292-7 |"NASA-PDS/validate#292 INVENTORY INVALID CRLF" | "github292" | 3 | "3 error messages expected for MISSING_CRLF." | "MISSING_CRLF" | "src/test/resources" | "target/test" | "--skip-context-validation -C {reportDir}/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 {reportDir}/report_github292_label_inventory_invalid_crlf.json -s json -R pds4.label -t {resourceDir}/github292/inventory/collection_eetable_inventory_CRLF_FAIL.xml" | "report_github292_label_inventory_invalid_crlf.json" |

# FIXME 1058: Oh boy. It seems clearing the cache has now broken these tests both 71 and 84 --> they also kill eclipse for scary reasons. Ignore them for now as the schema is not working with the test: namespace
| NASA-PDS/validate#71-1 |"NASA-PDS/validate#71 1" | "github71" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github71_1.json -s json -C {reportDir}/catalog.xml --skip-content-validation --skip-context-validation -t {resourceDir}/github71/ELE_MOM.xml" | "report_github71_1.json" |
| NASA-PDS/validate#71-2 |"NASA-PDS/validate#71 2" | "github71" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github71_2.json -s json -C {reportDir}/catalog.xml --skip-context-validation -t {resourceDir}/github71/ELE_MOM_2.xml" | "report_github71_2.json" |
| NASA-PDS/validate#84-1 |"NASA-PDS/validate#84 1" | "github84" | 0 | "0 error messages expected" | "totalErrors" | "src/test/resources" | "target/test" | "-r {reportDir}/report_github84_1.json -s json --skip-content-validation --skip-context-validation -c {resourceDir}/github84/config.txt -t {resourceDir}/github71/ELE_MOM.xml" | "report_github84_1.json" |

0 comments on commit 8237c73

Please sign in to comment.