Add support to utilize both online and local schema/schematron files #632

al-niessner · 2023-04-19T19:35:40Z

🗒️ Summary

There was a simple bug preventing the code from doing what is desired. Fixed the bug, then added 4 tests:

should work as is
provide -x to override with local copy of schema that will generate a single error
provide -S to override with local copy of schematron that will generate a single error
provide both -x and -S to generate one error because the XSD error prevents the schematron.

⚙️ Test Data and/or Report

No Overrides Success

$ validate -S src/test/resources/github599/PDS4_PDS_1I00.sch -t src/test/resources/github599/AREA_Camelot_1radii.xml

PDS Validate Tool Report

Configuration:
   Version                       3.3.0-SNAPSHOT
   Date                          2023-04-24T19:00:22Z

Parameters:
   Targets                       [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]
   Severity Level                WARNING
   Recurse Directories           true
   File Filters Used             [*.xml, *.XML]
   Data Content Validation       on
   Product Level Validation      on
   Max Errors                    100000
   Registered Contexts File      /home/niessner/Projects/PDS/validate/src/main/resources/util/registered_context_products.json



Product Level Validation Results

  PASS: file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml
      WARNING  [warning.label.schematron]   line 48, 35: The value Spacecraft for attribute Observing_System_Component.type is deprecated and should not be used.
        1 product validation(s) completed
Apr 24, 2023 12:00:27 PM gov.nasa.pds.tools.validate.task.ValidationTask execute
INFO: Validation complete for location 'file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml'

Summary:

  0 error(s)
  1 warning(s)

  Product Validation Summary:
    1          product(s) passed
    0          product(s) failed
    0          product(s) skipped

  Referential Integrity Check Summary:
    0          check(s) passed
    0          check(s) failed
    0          check(s) skipped

  Message Types:
    1            warning.label.schematron

End of Report

Override Schema Failure:

$ validate -x src/test/resources/github599/PDS4_PDS_1I00.xsd -t src/test/resources/github599/AREA_Camelot_1radii.xml

PDS Validate Tool Report

Configuration:
   Version                       3.3.0-SNAPSHOT
   Date                          2023-04-24T18:47:48Z

Parameters:
   Targets                       [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]
   User Specified Schemas        [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/PDS4_PDS_1I00.xsd]
   Severity Level                WARNING
   Recurse Directories           true
   File Filters Used             [*.xml, *.XML]
   Data Content Validation       on
   Product Level Validation      on
   Max Errors                    100000
   Registered Contexts File      /home/niessner/Projects/PDS/validate/src/main/resources/util/registered_context_products.json



Product Level Validation Results

  FAIL: file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml
      ERROR  [error.label.schema]   line 12, 25: cvc-complex-type.2.4.a: Invalid content was found starting with element '{"http://pds.nasa.gov/pds4/pds/v1":logical_identifier}'. One of '{"http://pds.nasa.gov/pds4/pds/v1":logical_id}' is expected.
        1 product validation(s) completed
Apr 24, 2023 11:47:50 AM gov.nasa.pds.tools.validate.task.ValidationTask execute
INFO: Validation complete for location 'file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml'

Summary:

  1 error(s)
  0 warning(s)

  Product Validation Summary:
    0          product(s) passed
    1          product(s) failed
    0          product(s) skipped

  Referential Integrity Check Summary:
    0          check(s) passed
    0          check(s) failed
    0          check(s) skipped

  Message Types:
    1            error.label.schema

End of Report

Override Schematron Failure

$ validate -S src/test/resources/github599/PDS4_PDS_1I00.sch  -t src/test/resources/github599/AREA_Camelot_1radii.xml

PDS Validate Tool Report

Configuration:
   Version                       3.3.0-SNAPSHOT
   Date                          2023-04-24T18:54:19Z

Parameters:
   Targets                       [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]
   User Specified Schematrons    [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/PDS4_PDS_1I00.sch]
   Severity Level                WARNING
   Recurse Directories           true
   File Filters Used             [*.xml, *.XML]
   Data Content Validation       on
   Product Level Validation      on
   Max Errors                    100000
   Registered Contexts File      /home/niessner/Projects/PDS/validate/src/main/resources/util/registered_context_products.json



Product Level Validation Results

  FAIL: file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml
      WARNING  [warning.label.schematron]   line 48, 35: The value Spacecraft for attribute Observing_System_Component.type is deprecated and should not be used.
      ERROR  [error.label.schematron]   line 50, 15: The attribute pds:Observing_System_Component/pds:type must be equal to one of the following values 'Airborne', 'Aircraft', 'Artificial Illumination', 'Balloon', 'Computer', 'Facility', 'Host', 'Instrument', 'Laboratory', 'Literature Search', 'Naked Eye', 'Observatory', 'Spacecraft', 'Suborbital Rocket', 'Telescope'.
        1 product validation(s) completed
Apr 24, 2023 11:54:23 AM gov.nasa.pds.tools.validate.task.ValidationTask execute
INFO: Validation complete for location 'file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml'

Summary:

  1 error(s)
  1 warning(s)

  Product Validation Summary:
    0          product(s) passed
    1          product(s) failed
    0          product(s) skipped

  Referential Integrity Check Summary:
    0          check(s) passed
    0          check(s) failed
    0          check(s) skipped

  Message Types:
    1            error.label.schematron
    1            warning.label.schematron

End of Report

Override Schema+Schematron Failure

$ validate -S src/test/resources/github599/PDS4_PDS_1I00.sch -x src/test/resources/github599/PDS4_PDS_1I00.xsd -t src/test/resources/github599/AREA_Camelot_1radii.xml

PDS Validate Tool Report

Configuration:
   Version                       3.3.0-SNAPSHOT
   Date                          2023-04-24T18:55:51Z

Parameters:
   Targets                       [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]
   User Specified Schemas        [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/PDS4_PDS_1I00.xsd]
   User Specified Schematrons    [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/PDS4_PDS_1I00.sch]
   Severity Level                WARNING
   Recurse Directories           true
   File Filters Used             [*.xml, *.XML]
   Data Content Validation       on
   Product Level Validation      on
   Max Errors                    100000
   Registered Contexts File      /home/niessner/Projects/PDS/validate/src/main/resources/util/registered_context_products.json



Product Level Validation Results

  FAIL: file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml
      ERROR  [error.label.schema]   line 12, 25: cvc-complex-type.2.4.a: Invalid content was found starting with element '{"http://pds.nasa.gov/pds4/pds/v1":logical_identifier}'. One of '{"http://pds.nasa.gov/pds4/pds/v1":logical_id}' is expected.
      WARNING  [warning.label.schematron]   line 48, 35: The value Spacecraft for attribute Observing_System_Component.type is deprecated and should not be used.
      ERROR  [error.label.schematron]   line 50, 15: The attribute pds:Observing_System_Component/pds:type must be equal to one of the following values 'Airborne', 'Aircraft', 'Artificial Illumination', 'Balloon', 'Computer', 'Facility', 'Host', 'Instrument', 'Laboratory', 'Literature Search', 'Naked Eye', 'Observatory', 'Spacecraft', 'Suborbital Rocket', 'Telescope'.
        1 product validation(s) completed
Apr 24, 2023 11:55:53 AM gov.nasa.pds.tools.validate.task.ValidationTask execute
INFO: Validation complete for location 'file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml'

Summary:

  2 error(s)
  1 warning(s)

  Product Validation Summary:
    0          product(s) passed
    1          product(s) failed
    0          product(s) skipped

  Referential Integrity Check Summary:
    0          check(s) passed
    0          check(s) failed
    0          check(s) skipped

  Message Types:
    1            error.label.schematron
    1            error.label.schema
    1            warning.label.schematron

End of Report

♻️ Related Issues

Closes #599

nutjob4life

👍

nutjob4life

Approved … again! 👍

nutjob4life · 2023-04-19T21:01:25Z

Maybe this PR should be marked as a draft? There have been a lot of commits since my first two approvals 🤷

al-niessner · 2023-04-19T21:10:11Z

@nutjob4life Sorry but the cucumber file is giving me lots of grief for reasons my eye is having a very hard detecting. I probably should write a script to check that the features file is going to be interpreted well enough.

nutjob4life · 2023-04-19T21:53:14Z

@al-niessner no worries, no rush!

al-niessner · 2023-04-19T22:03:16Z

@jordanpadams @nutjob4life @tloubrieu-jpl

Who is the expert on cucumber and the validate tests that run in Jenkins? I am getting a different result from the command line and Jenkins.

On mine:

Parameters:
   Targets                       [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]
   User Specified Schemas        [file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/PDS4_PDS_1I00.xsd]
><...snip...><
  FAIL: file:/home/niessner/Projects/PDS/validate/src/test/resources/github599/AREA_Camelot_1radii.xml
      ERROR  [error.label.schema]   line 12, 25: cvc-complex-type.2.4.a: Invalid content was found starting with element '{"http://pds.nasa.gov/pds4/pds/v1":logical_identifier}'. One of '{"http://pds.nasa.gov/pds4/pds/v1":logical_id}' is expected.

but on Jenkins

[file:/home/runner/work/validate/validate/src/test/resources/github599/AREA_Camelot_1radii.xml]","userSpecifiedSchemas":"[file:/home/runner/work/validate/validate/src/test/resources/github599/PDS4_PDS_1I00.xsd]","severityLevel":"WARNING","recurseDirectories":"true","fileFiltersUsed":"[*.xml, *.XML]","dataContentValidation":"on","productLevelValidation":"on","maxErrors":"100000","registeredContextsFile":"/home/runner/work/validate/validate/src/main/resources/util/registered_context_products.json"},"productLevelValidationResults":[{"status":"PASS","label":"file:/home/runner/work/validate/validate/src/test/resources/github599/AREA_Camelot_1radii.xml","messages":[{"severity":"WARNING","type":"warning.label.schematron","line":48,"column":35,"message":"The value Spacecraft for attribute Observing_System_Component.type is deprecated and should not be used."}],"fragments":[],"dataContents":[]}],"summary":{"totalProducts":1,"totalErrors":0,"totalWarnings":1,"messageTypes":[{"messageType":"warning.label.schematron","total":1}]}} ==> expected: <0> but was: <1>

It seems that -x is overriding downloading but not whatever is happening on Jenkins runs. Who is the expert to help sort this out -- I am going to take a wild stab and say it is testing defined a schema dir in core.properties and it is not being overridden?

Do we want to ignore this (not add the unit tests and just trust me) or pursue to its grizzly end? Moving to another ticket until then...

jordanpadams · 2023-04-19T22:29:27Z

@al-niessner we have experienced this weirdness on occasion with the ordering of the tests in cucumber. for whatever reason cucumber does not flush the java cache between tests (even if we try to force it), so it is using previous test information and throwing errors. maybe play around with the ordering of tests in the features file? maybe move it to the very bottom?

al-niessner · 2023-04-19T23:31:25Z

@jordanpadams I already tried order and more casting suspicions on the cache because my -S makes almost all tests fail. Seems prudent to remove this unit test and call it done.

…

On Wed, Apr 19, 2023, 15:29 Jordan Padams ***@***.***> wrote: @al-niessner <https://github.com/al-niessner> we have experienced this weirdness on occasion with the ordering of the tests in cucumber. for whatever reason cucumber does not flush the java cache between tests (even if we try to force it), so it is using previous test information and throwing errors. maybe play around with the ordering of tests in the features file? maybe move it to the very bottom? — Reply to this email directly, view it on GitHub <#632 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIUBIUK42ZRJXN3KJ2VCATXCBRNDANCNFSM6AAAAAAXEQRUIA> . You are receiving this because you were mentioned.Message ID: ***@***.***>

Al Niessner added 4 commits April 19, 2023 09:53

add unit test first

d9ed44f

rename to check override

c64cb69

complete the unit test

3da3001

fix

40b1a93

al-niessner self-assigned this Apr 19, 2023

al-niessner requested review from jordanpadams, tloubrieu-jpl and nutjob4life as code owners April 19, 2023 19:35

xsd failure prevents schematron error

79194dc

nutjob4life approved these changes Apr 19, 2023

View reviewed changes

run tests again

2235e01

nutjob4life approved these changes Apr 19, 2023

View reviewed changes

Al Niessner added 7 commits April 19, 2023 13:11

see if order fixes it

591a92a

try original

2908649

try one test at a time to see which is the problem

47a2dea

try schema

fc8e5ba

just the good one

0f409f8

maybe it is the bundle bit

94a2c95

override schema

43011cf

update schema override check

15d9f27

al-niessner marked this pull request as draft April 19, 2023 21:09

fix typo

b9ed49d

save the checks but inactivate them

0d19267

al-niessner marked this pull request as ready for review April 24, 2023 19:01

jordanpadams changed the title ~~Issue 599: override schema/schematron via -x and -S respectively~~ Add support to utilize both online and local schema/schematron files May 3, 2023

jordanpadams approved these changes May 3, 2023

View reviewed changes

jordanpadams merged commit 0fecc57 into main May 3, 2023

jordanpadams deleted the issue_599 branch May 3, 2023 02:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support to utilize both online and local schema/schematron files #632

Add support to utilize both online and local schema/schematron files #632

al-niessner commented Apr 19, 2023 •

edited

Loading

nutjob4life left a comment

nutjob4life left a comment

nutjob4life commented Apr 19, 2023

al-niessner commented Apr 19, 2023

nutjob4life commented Apr 19, 2023

al-niessner commented Apr 19, 2023

jordanpadams commented Apr 19, 2023

al-niessner commented Apr 19, 2023 via email

Add support to utilize both online and local schema/schematron files #632

Add support to utilize both online and local schema/schematron files #632

Conversation

al-niessner commented Apr 19, 2023 • edited Loading

🗒️ Summary

⚙️ Test Data and/or Report

♻️ Related Issues

nutjob4life left a comment

Choose a reason for hiding this comment

nutjob4life left a comment

Choose a reason for hiding this comment

nutjob4life commented Apr 19, 2023

al-niessner commented Apr 19, 2023

nutjob4life commented Apr 19, 2023

al-niessner commented Apr 19, 2023

jordanpadams commented Apr 19, 2023

al-niessner commented Apr 19, 2023 via email

al-niessner commented Apr 19, 2023 •

edited

Loading