Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Profile resolver: Test finish phase, plus minor XSLT enhancements and fixes #1377

Merged
merged 1 commit into from
Jul 25, 2022
Merged

Profile resolver: Test finish phase, plus minor XSLT enhancements and fixes #1377

merged 1 commit into from
Jul 25, 2022

Conversation

galtm
Copy link
Contributor

@galtm galtm commented Jul 17, 2022

Committer Notes

This pull request adds template- and function-level XSpec tests for the finish phase of the XSLT profile resolver. It also updates the underlying XSLT, mostly to align with the latest specification.

XSLT

  • Remove template that provides link to source, because metadata phase accomplished that
  • Add "[last()]" predicate when passing through elements that cannot appear twice
  • Align with schema by passing through revisions, document-id, location, and group/link but not control/annotation
  • Align with schema for param insertions, <insert type="param" id-ref="...">
  • Align with schema and spec for keeping items, <prop name="keep" value="always">

XSpec

  • Add tests at the level of individual templates

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

@galtm
Test finish phase, plus minor XSLT enhancements and fixes
eecbdc8 
XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
@galtm galtm changed the title Test finish phase, plus minor XSLT enhancements and fixes Profile resolver: Test finish phase, plus minor XSLT enhancements and fixes Jul 17, 2022
@galtm galtm mentioned this pull request Jul 17, 2022
Merged
9 tasks
wendellpiez
wendellpiez approved these changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@wendellpiez wendellpiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, thanks @galtm

david-waltermire
david-waltermire approved these changes Jul 25, 2022
View reviewed changes
Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@david-waltermire david-waltermire merged commit 67503b2 into usnistgov:develop Jul 25, 2022
david-waltermire pushed a commit that referenced this pull request Aug 23, 2022
@galtm @david-waltermire
Test finish phase, plus minor XSLT enhancements and fixes (#1377)
7a20513 
XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Oct 6, 2022
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
68ef2f7 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit that referenced this pull request Oct 18, 2022
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (#1377)
0b1c29c 
XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
david-waltermire pushed a commit that referenced this pull request Oct 31, 2022
@galtm @david-waltermire
Test finish phase, plus minor XSLT enhancements and fixes (#1377)
69f3fb1 
XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jan 10, 2023
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
bd33bf7 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Feb 6, 2023
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
214d857 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jun 29, 2023
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
ab56289 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
aj-stein-nist pushed a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jul 10, 2023
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
76ff697 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
@aj-stein-nist aj-stein-nist added this to the v1.1.0 milestone Jul 27, 2023
aj-stein-nist pushed a commit to galtm/OSCAL that referenced this pull request Sep 28, 2023
@galtm @aj-stein-nist
Test finish phase, plus minor XSLT enhancements and fixes (usnistgov#…
38169b3 
…1377)

XSLT
- Remove template that provides link to source, because metadata phase accomplished that
- Add "[last()]" predicate when passing through elements that cannot appear twice
- Align with schema by passing through revisions, document-id, location, and
  group/link but not control/annotation
- Align with schema for param insertions, `<insert type="param" id-ref="...">`
- Align with schema and spec for keeping items, `<prop name="keep" value="always">`

XSpec
- Add tests at the level of individual templates
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@david-waltermire david-waltermire david-waltermire approved these changes

@wendellpiez wendellpiez wendellpiez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@galtm @wendellpiez @david-waltermire @aj-stein-nist