Profile resolver: Test merge phase, plus minor XSLT enhancements#1207
Merged
david-waltermire merged 1 commit intousnistgov:developfrom May 4, 2022
Merged
Profile resolver: Test merge phase, plus minor XSLT enhancements#1207david-waltermire merged 1 commit intousnistgov:developfrom
david-waltermire merged 1 commit intousnistgov:developfrom
Conversation
galtm
commented
Apr 17, 2022
| If there is also a merge/custom directive, we apply the | ||
| higher-priority template instead of this one. --> | ||
| <xsl:template match="catalog[merge/as-is=$true-content]" priority="12" as="element(catalog)"> | ||
| <xsl:call-template name="detect-multiple-structuring-directives"/> |
Contributor
Author
There was a problem hiding this comment.
Adding detection here and in custom merge template because the spec says, "If more than one appears, processors MUST generate an error and cease processing."
Comment on lines
-85
to
+112
| <xsl:for-each-group select="current-group()" group-by="(@opr:id,@id,generate-id())[1]"> | ||
| <xsl:for-each-group select="back-matter/* | selection/back-matter/*" group-by="(@opr:id,@uuid,generate-id())[1]"> |
Contributor
Author
There was a problem hiding this comment.
Change in group-by: Current schema says the attribute on resource is @uuid rather than @id.
The other changes on this line relate to use of xsl:where-populated on line 109, which I just thought was more intuitive than <xsl:for-each-group group-by="true()" ...> on line 82 of the old revision. (The GitHub diff is a little hard to read because of the new detect-multiple-structuring-directives template in the middle.)
| <xsl:apply-templates select="control | .//group/control"/> | ||
| </xsl:template> | ||
|
|
||
| <xsl:key name="control-by-id" match="control" use="@id"/> |
Contributor
Author
There was a problem hiding this comment.
No longer needed because of included code shared with Selection phase
| is in downstream template. --> | ||
| <xsl:template match="insert-controls" mode="o:custom-merge"> | ||
| <xsl:variable name="inserted-controls"> | ||
| <xsl:variable name="inserted-controls" as="element()*"> |
Contributor
Author
There was a problem hiding this comment.
Here, a sequence data type rather than a document node is important so xsl:perform-sort can sort the elements.
Comment on lines
-123
to
-129
| <xsl:template match="include-controls" mode="o:custom-merge"> | ||
| <xsl:variable name="match-patterns" select="matching/@pattern"/> | ||
| <xsl:call-template name="combine-elements"> | ||
| <xsl:with-param name="who" select="key('control-by-id', with-id), | ||
| /*/selection//control[some $p in ($match-patterns) satisfies (matches(@id,o:glob-as-regex(string($p))))]"/> | ||
| </xsl:call-template> | ||
| </xsl:template> |
Contributor
Author
There was a problem hiding this comment.
No longer needed because of included code shared with Selection phase
| </xsl:call-template> | ||
| </xsl:template> | ||
|
|
||
| <xsl:include href="oscal-profile-resolve-functions.xsl"/> |
Contributor
Author
There was a problem hiding this comment.
Included from select-or-custom-merge.xsl, so it doesn't need to be included from here, too.
Comment on lines
+24
to
+28
| <xsl:otherwise> | ||
| <!-- Visit child controls in case they are selected using | ||
| with-parent-controls="no". --> | ||
| <xsl:apply-templates mode="#current" select="control"/> | ||
| </xsl:otherwise> |
Contributor
Author
There was a problem hiding this comment.
This wasn't in the original Selection phase code from which this file was created. Adding it makes with-parent-controls="no" work correctly in both the Selection and Merge phases.
Comment on lines
+268
to
+275
| <x:scenario label="as-is element appears but content is not true"> | ||
| <x:variable name="ov:as-is-content">0</x:variable> | ||
| <x:like label="SHARED: as-is element with placeholder for content"/> | ||
| </x:scenario> | ||
| <x:scenario label="as-is element appears but has no content"> | ||
| <x:variable name="ov:as-is-content"/> | ||
| <x:like label="SHARED: as-is element with placeholder for content"/> | ||
| </x:scenario> |
Contributor
Author
There was a problem hiding this comment.
FYI: x:variable and x:like make a good pair if you find yourself doing a lot of copy-paste-modify operations in an XSpec file. See also x:expand-text on line 292, which helps with parameterizing the shared content.
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
wendellpiez
approved these changes
Apr 18, 2022
Contributor
wendellpiez
left a comment
There was a problem hiding this comment.
Fantastic progress thanks @galtm!
Contributor
|
Wanting this PR to repair lapses exposed in unit testing! 🥇 |
1 similar comment
Contributor
|
Wanting this PR to repair lapses exposed in unit testing! 🥇 |
Contributor
|
Oops - I meant to say (or hint) I am finding errors in my unit testing in another branch, which are addressed by corrections in this PR. Way too cryptic! |
3 tasks
david-waltermire
pushed a commit
that referenced
this pull request
May 17, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
david-waltermire
pushed a commit
that referenced
this pull request
Jun 21, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
david-waltermire
pushed a commit
that referenced
this pull request
Jul 13, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
david-waltermire
pushed a commit
that referenced
this pull request
Aug 23, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Oct 6, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
that referenced
this pull request
Oct 18, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
david-waltermire
pushed a commit
that referenced
this pull request
Oct 31, 2022
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jan 10, 2023
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Feb 6, 2023
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jun 29, 2023
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jul 10, 2023
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
aj-stein-nist
pushed a commit
to galtm/OSCAL
that referenced
this pull request
Sep 28, 2023
XSLT - Move some code from oscal-profile-resolve-select.xsl to new file, select-or-custom-merge.xsl, and share it between Selection phase and Merge phase. - Add error checking for multiple structuring directives. - Finish the incomplete support for `insert-controls/@order`. - Fix bug in support for `@with-parent-controls` in Selection phase. XSpec - In select.xspec, add test for order of controls matching imported document, not profile document. Also, add test for `@with-parent-controls` bug fix. - Create merge-combine.xspec for testing combine-elements and mode="o:combine-elements" templates. - Organize tests among merge.xspec, merge-combine.xspec, merge-as-is.xspec, and merge-custom.xspec. - Integrate back-matter testing into template-level tests in merge.xspec and merge-as-is.xspec, and delete merge-back-matter.xspec.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Committer Notes
This pull request tests the Merge phase of the XSLT profile resolver. It also updates the XSLT as listed below.
XSLT Changes
insert-controls/@order.@with-parent-controlsin Selection phase.XSpec Changes
@with-parent-controlsbug fix.All Submissions:
"?
Changes to Core Features: