diff --git a/src/release/content-upgrade/json-prop-to-props.xsl b/src/release/content-upgrade/json-prop-to-props.xsl new file mode 100644 index 0000000000..d986a18aa1 --- /dev/null +++ b/src/release/content-upgrade/json-prop-to-props.xsl @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/specifications/profile-resolution/.gitignore b/src/specifications/profile-resolution/.gitignore new file mode 100644 index 0000000000..c3dbbe3538 --- /dev/null +++ b/src/specifications/profile-resolution/.gitignore @@ -0,0 +1,2 @@ +!oscal-specs_share.xpr +requirement-tests/output-actual/ \ No newline at end of file diff --git a/src/specifications/profile-resolution/example-set.xspec b/src/specifications/profile-resolution/example-set.xspec new file mode 100644 index 0000000000..3a9945b3b0 --- /dev/null +++ b/src/specifications/profile-resolution/example-set.xspec @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/lib/build-examples-xspec.xsl b/src/specifications/profile-resolution/lib/build-examples-xspec.xsl new file mode 100644 index 0000000000..68ea425445 --- /dev/null +++ b/src/specifications/profile-resolution/lib/build-examples-xspec.xsl @@ -0,0 +1,111 @@ + + + + + + + + + + autogenerated { current-dateTime() } following model in example-set.xspec + href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron" + type="text/css" href="lib/xspec-oxygen.css" + { replace(document-uri(/),'.*/','') } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + [spec] + + + + + + + + + + + + + + { $req-id} + + + + + + + [Section {@rid}] + + diff --git a/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl b/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl new file mode 100644 index 0000000000..f4aaa279fb --- /dev/null +++ b/src/specifications/profile-resolution/lib/build-reqs-xspec.xsl @@ -0,0 +1,94 @@ + + + + + + + + autogenerated { current-dateTime() } following model in example-set.xspec + href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron" + type="text/css" href="lib/xspec-oxygen.css" + { replace(document-uri(/),'.*/','') } + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + [dev] + + + + + + + + + + { replace(.,'^PENDING:?\s*','') } + + + + Example { $basename }.xml - {.} + { ancestor::req[1]/@id } + + + + + + + + + + [Section {@rid}] + + diff --git a/src/specifications/profile-resolution/lib/build-xspec.xsl b/src/specifications/profile-resolution/lib/build-xspec.xsl new file mode 100644 index 0000000000..c3468468c1 --- /dev/null +++ b/src/specifications/profile-resolution/lib/build-xspec.xsl @@ -0,0 +1,111 @@ + + + + + + + + + + autogenerated { current-dateTime() } following model in example-set.xspec + href="lib/xspec-test-dev.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron" + type="text/css" href="lib/xspec-oxygen.css" + { replace(document-uri(/),'.*/','') } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + requirement-tests/{$filename} + + + + + + + { @id } + + + + + + + + [Section {@rid}] + + diff --git a/src/specifications/profile-resolution/html-to-specml.xsl b/src/specifications/profile-resolution/lib/html-to-specml.xsl similarity index 100% rename from src/specifications/profile-resolution/html-to-specml.xsl rename to src/specifications/profile-resolution/lib/html-to-specml.xsl diff --git a/src/specifications/profile-resolution/lib/illustrate-resolution.xsl b/src/specifications/profile-resolution/lib/illustrate-resolution.xsl new file mode 100644 index 0000000000..9eccf19845 --- /dev/null +++ b/src/specifications/profile-resolution/lib/illustrate-resolution.xsl @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +

In { name(child::*) } { $href }

+
+ +
+
+
+ +
No document found at { $href }
+
+
+ + +
+ + + +

Importing { @href }

+
+ + + + + + + +

Profile { document-uri(/) => replace('.*/','') }

+
+ +
+
+ + + { /document-uri(.) } + { $where => replace('.+/','') => replace('\.xml$','_RESOLVED.xml') } + output-expected/{ $resolvedname } +

Result { $resultpath }

+
+ +
+
+ + + + + + + + + + + + +
+ +
+ + +
+
+ +
+
+ + +
+
+ + +
+
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+ + + +
+ +
+
+
+ + + + +

{ name() }

+
+ + +

{ name() }

+
+ + +

+ import + + + +

+
+ + + + + + + +

with-id { . }

+
+ + +

set-parameter { @param-id }

+
+ + +

alter { @control-id }

+
+ + +

{ local-name() } { @id }

+
+ + +

{ local-name() } { @id }

+
+ + +

resource { @uuid }

+
+ + +

insert { @type } { @id-ref }

+
+ + +

combine { @method }

+
+ + +

{ local-name() } { . }

+
+ + + + ID_{ parent::*/(@id,@param-id)[1] }-{ local-name(.) } +

{ local-name() } { . }

+
+ + +

rlink { @href }

+
+ + +

title

+
+ + +

{ local-name(.) } { @name } { @id } { [1 to count(child::*) ] ! '▮' }

+
+ + + +

{ local-name(.) } { @name }{ @value }

+
+ + +

{ local-name() } { (1 to count(child::*)) ! '▮' }

+
+ + +
+

with child controls { . }

+
+
+ + +
+

{ replace(local-name(.),'\-',' ') } { . }

+
+
+ + + + + + + +
\ No newline at end of file diff --git a/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl b/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl new file mode 100644 index 0000000000..44eb91412b --- /dev/null +++ b/src/specifications/profile-resolution/lib/oscal-profile-test-helper.xsl @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ... + + + + ... + + + + ... + + + + ... + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl b/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl new file mode 100644 index 0000000000..327b870b08 --- /dev/null +++ b/src/specifications/profile-resolution/lib/reqs-md-punchlist.xsl @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + - [{ if (eg/@href != '') then 'x' else ' ' }] + + + + + [test { @href ! ('`' || . || '`')} + + ] + + + `{.}` + + + + + + `{ @id }` + + + + + + + + + + + + + * + + + + * + + + + + + + + + { replace(.,'\s+',' ') } + + + + [Section {@rid}] + + + diff --git a/src/specifications/profile-resolution/lib/spec-checkup.sch b/src/specifications/profile-resolution/lib/spec-checkup.sch new file mode 100644 index 0000000000..cc1e238418 --- /dev/null +++ b/src/specifications/profile-resolution/lib/spec-checkup.sch @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + section is too deep + + + + + + + + + Requirement id '' is not distinct + + No example yet for requirement "" + + + + + + + + No file found for example(s) + Example is not an OSCAL profile + + + + + + + + + + or + , + + + + + + + + + + + + + + and + , + + + + + + + + diff --git a/src/specifications/profile-resolution/specml-html-hugo-uswds.xsl b/src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl similarity index 97% rename from src/specifications/profile-resolution/specml-html-hugo-uswds.xsl rename to src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl index f02f0a2799..68a2eb8d7c 100644 --- a/src/specifications/profile-resolution/specml-html-hugo-uswds.xsl +++ b/src/specifications/profile-resolution/lib/specml-html-hugo-uswds.xsl @@ -28,6 +28,7 @@ + diff --git a/src/specifications/profile-resolution/specml-html-preview.xsl b/src/specifications/profile-resolution/lib/specml-html-preview.xsl similarity index 64% rename from src/specifications/profile-resolution/specml-html-preview.xsl rename to src/specifications/profile-resolution/lib/specml-html-preview.xsl index c98065bec8..b7bab0f301 100644 --- a/src/specifications/profile-resolution/specml-html-preview.xsl +++ b/src/specifications/profile-resolution/lib/specml-html-preview.xsl @@ -24,10 +24,16 @@ - +
@@ -43,14 +49,25 @@ body {{ line-height: 140%; font-family: "Cambria", serif }} * {{ box-sizing: border-box }} -aside.toc {{ position: fixed; overflow-y: scroll; max-width: 36%; top: 1em; bottom: 0px; font-family: { $display-font } }} +aside.navpanel {{ position: fixed; overflow-y: scroll; max-width: 36%; top: 1em; bottom: 0px; font-family: { $display-font } }} + +aside.navpanel div.rqrmts * {{ margin: 0em }} + +.req {{ background-color: pink; padding: 0.2em; font-size: 110%; margin-top: 0.2em !important }} +div.rqrmts .req {{ font-size: 90%; border-top: thin solid red; border-bottom: thin solid red }} +.req.should {{ background-color: peachpuff; border-top: thin solid orange; border-bottom: thin solid orange }} +.req.may {{ background-color: cornsilk; border-top: thin solid gold; border-bottom: thin solid gold }} +.req.recommended {{ background-color: mintcream; border-top: thin solid blue; border-bottom: thin solid blue }} + +span.reqlabel {{ background-color: mintcream; color: forestgreen; margin-right: 0.4em; padding: 0.1em; border: thin solid green }} + .toc ul {{ list-style: none; padding-left: 1em }} main {{ margin-left: 40%; max-width: 48em }} details {{ margin-top: 1.5em }} -details details {{ margin-left: 2em; border-left: thin solid black; padding-left: 1em }} +details details {{ border-left: thin solid black; padding-left: 1em }} summary > * {{ display: inline }} @@ -69,6 +86,8 @@ a {{ color: inherit }} a.linked {{ color: inherit }} .toc a {{ text-decoration: none }} +span.req {{ color: royalblue }} +span.req:hover {{ background-color: beige }} .example {{ padding: 0.5em; border: thin dotted black; margin-top: 1em }} .example > *:first-child {{ margin-top: 0em }} @@ -85,7 +104,52 @@ a.linked {{ color: inherit }} + + + + + + + + + + + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + +

+ + + + + + +

+
+
    @@ -111,10 +175,14 @@ a.linked {{ color: inherit }} - + + + + + @@ -151,7 +219,6 @@ a.linked {{ color: inherit }}

    Source (profile):

    -

    Intermediate (catalog):

    diff --git a/src/specifications/profile-resolution/specml-html-static.xsl b/src/specifications/profile-resolution/lib/specml-html-static.xsl similarity index 100% rename from src/specifications/profile-resolution/specml-html-static.xsl rename to src/specifications/profile-resolution/lib/specml-html-static.xsl diff --git a/src/specifications/profile-resolution/specml-html-xslt1.xsl b/src/specifications/profile-resolution/lib/specml-html-xslt1.xsl similarity index 90% rename from src/specifications/profile-resolution/specml-html-xslt1.xsl rename to src/specifications/profile-resolution/lib/specml-html-xslt1.xsl index 3228178bdf..249f3160c6 100644 --- a/src/specifications/profile-resolution/specml-html-xslt1.xsl +++ b/src/specifications/profile-resolution/lib/specml-html-xslt1.xsl @@ -100,7 +100,13 @@ - + + + + + + +
      @@ -143,7 +149,21 @@ - + + + + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/specml-html-xslt3.xsl b/src/specifications/profile-resolution/lib/specml-html-xslt3.xsl similarity index 100% rename from src/specifications/profile-resolution/specml-html-xslt3.xsl rename to src/specifications/profile-resolution/lib/specml-html-xslt3.xsl diff --git a/src/specifications/profile-resolution/lib/specml-tidy-config.xml b/src/specifications/profile-resolution/lib/specml-tidy-config.xml new file mode 100644 index 0000000000..672af71c06 --- /dev/null +++ b/src/specifications/profile-resolution/lib/specml-tidy-config.xml @@ -0,0 +1,9 @@ + + + Basic whitespace cleanup + + + +
      +

      Importing catalogs/abc-mixed-up_catalog.xml

      +

      In catalog catalogs/abc-mixed-up_catalog.xml

      +
      +
      + +
      +

      catalog

      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group B of C

      +
      +
      +
      +
      +
      + +
      +

      control b2

      +
      +
      +

      title Control B2

      +
      +
      +
      +
      +
      +
      +

      part statementb2-stmt

      +
      +
      +
      +
      + +
      +

      control b1

      +
      +
      +

      title Control B1

      +
      +
      +
      +
      +
      +
      +

      part statementb1-stmt

      +
      +
      +
      +
      + +
      +

      control b3

      +
      +
      +

      title Control B3

      +
      +
      +
      +
      +
      +
      +

      part statementb3-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group A of C

      +
      +
      +
      +
      +
      + +
      +

      control a3

      +
      +
      +

      title Control A3

      +
      +
      +
      +
      +
      +
      +

      param a3_prm1

      +
      +
      +

      label A3 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa3-stmt

      +
      +
      +
      +
      + +
      +

      control a2

      +
      +
      +

      title Control A2

      +
      +
      +
      +
      +
      +
      +

      part statementa2-stmt

      +
      +
      +
      +
      + +
      +

      control a1

      +
      +
      +

      title Control A1

      +
      +
      +
      +
      +
      +
      +

      param a1_prm1

      +
      +
      +

      label A1 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa1-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group C of C

      +
      +
      +
      +
      +
      + +
      +

      control c3

      +
      +
      +

      title Control C3

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a

      +
      +
      +

      title Control C3-A

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a-1

      +
      +
      +

      title Control C3-A-1

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      +
      +
      +
      + +
      +

      control c1

      +
      +
      +

      title Control C1

      +
      +
      +
      +
      +
      +
      +

      part statementc1-stmt

      +
      +
      +
      +
      + +
      +

      control c2

      +
      +
      +

      title Control C2

      +
      +
      +
      +
      +
      +
      +

      part statementc2-stmt

      +
      +
      +
      +
      +
      +
      +
      +
      +

      Profile req-include-all-asis.xml

      +
      +
      + +
      +

      profile

      +
      +
      +
      + +
      +

      importcatalogs/abc-mixed-up_catalog.xml

      +
      +
      +
      +
      +

      include-all

      +
      +
      +
      +
      + +
      +

      merge

      +
      +
      +
      +
      +

      as-is true

      +
      +
      +
      +
      +
      +
      +
      +

      Result output-expected/req-include-all-asis_RESOLVED.xml

      +
      +
      + +
      +

      catalog

      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group B of C

      +
      +
      +
      +
      +
      + +
      +

      control b2

      +
      +
      +

      title Control B2

      +
      +
      +
      +
      +
      +
      +

      part statementb2-stmt

      +
      +
      +
      +
      + +
      +

      control b1

      +
      +
      +

      title Control B1

      +
      +
      +
      +
      +
      +
      +

      part statementb1-stmt

      +
      +
      +
      +
      + +
      +

      control b3

      +
      +
      +

      title Control B3

      +
      +
      +
      +
      +
      +
      +

      part statementb3-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group A of C

      +
      +
      +
      +
      +
      + +
      +

      control a3

      +
      +
      +

      title Control A3

      +
      +
      +
      +
      +
      +
      +

      param a3_prm1

      +
      +
      +

      label A3 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa3-stmt

      +
      +
      +
      +
      + +
      +

      control a2

      +
      +
      +

      title Control A2

      +
      +
      +
      +
      +
      +
      +

      part statementa2-stmt

      +
      +
      +
      +
      + +
      +

      control a1

      +
      +
      +

      title Control A1

      +
      +
      +
      +
      +
      +
      +

      param a1_prm1

      +
      +
      +

      label A1 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa1-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group C of C

      +
      +
      +
      +
      +
      + +
      +

      control c3

      +
      +
      +

      title Control C3

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a

      +
      +
      +

      title Control C3-A

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a-1

      +
      +
      +

      title Control C3-A-1

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      +
      +
      +
      + +
      +

      control c1

      +
      +
      +

      title Control C1

      +
      +
      +
      +
      +
      +
      +

      part statementc1-stmt

      +
      +
      +
      +
      + +
      +

      control c2

      +
      +
      +

      title Control C2

      +
      +
      +
      +
      +
      +
      +

      part statementc2-stmt

      +
      +
      +
      +
      +
      +
      +
      + + \ No newline at end of file diff --git a/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html new file mode 100644 index 0000000000..5e4084d0fd --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/illustrations/req-include-by-id-view.html @@ -0,0 +1,487 @@ + + + + + + + + +
      +

      Importing catalogs/abc-simple_catalog.xml

      +

      In catalog catalogs/abc-simple_catalog.xml

      +
      +
      + +
      +

      catalog

      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group A of C

      +
      +
      +
      +
      +
      + +
      +

      control a1

      +
      +
      +

      title Control A1

      +
      +
      +
      +
      +
      +
      +

      param a1_prm1

      +
      +
      +

      label A1 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa1-stmt

      +
      +
      +
      +
      + +
      +

      control a2

      +
      +
      +

      title Control A2

      +
      +
      +
      +
      +
      +
      +

      part statementa2-stmt

      +
      +
      +
      +
      + +
      +

      control a3

      +
      +
      +

      title Control A3

      +
      +
      +
      +
      +
      +
      +

      param a3_prm1

      +
      +
      +

      label A3 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa3-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group B of C

      +
      +
      +
      +
      +
      + +
      +

      control b1

      +
      +
      +

      title Control B1

      +
      +
      +
      +
      +
      +
      +

      part statementb1-stmt

      +
      +
      +
      +
      + +
      +

      control b2

      +
      +
      +

      title Control B2

      +
      +
      +
      +
      +
      +
      +

      part statementb2-stmt

      +
      +
      +
      +
      + +
      +

      control b3

      +
      +
      +

      title Control B3

      +
      +
      +
      +
      +
      +
      +

      part statementb3-stmt

      +
      +
      +
      +
      +
      + +
      +

      group

      +
      +
      +

      title Group C of C

      +
      +
      +
      +
      +
      + +
      +

      control c1

      +
      +
      +

      title Control C1

      +
      +
      +
      +
      +
      +
      +

      part statementc1-stmt

      +
      +
      +
      +
      + +
      +

      control c2

      +
      +
      +

      title Control C2

      +
      +
      +
      +
      +
      +
      +

      part statementc2-stmt

      +
      +
      +
      +
      + +
      +

      control c3

      +
      +
      +

      title Control C3

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a

      +
      +
      +

      title Control C3-A

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a-1

      +
      +
      +

      title Control C3-A-1

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +

      Profile req-include-by-id.xml

      +
      +
      + +
      +

      profile

      +
      +
      +
      + +
      +

      importcatalogs/abc-simple_catalog.xml

      +
      +
      +
      + +
      +

      include-controls

      +
      +
      +

      with child controls yes

      +
      +
      +
      +
      +
      +
      +

      with-id a1

      +
      +
      +
      +
      +

      with-id b1

      +
      +
      +
      +
      +

      with-id c1

      +
      +
      +
      +
      +

      with-id c3

      +
      +
      +
      +
      +
      +
      +
      +
      +

      Result output-expected/req-include-by-id_RESOLVED.xml

      +
      +
      + +
      +

      catalog

      +
      +
      +
      + +
      +

      control a1

      +
      +
      +

      title Control A1

      +
      +
      +
      +
      +
      +
      +

      param a1_prm1

      +
      +
      +

      label A1 Parameter 1

      +
      +
      +
      +
      +
      +
      +

      part statementa1-stmt

      +
      +
      +
      +
      + +
      +

      control b1

      +
      +
      +

      title Control B1

      +
      +
      +
      +
      +
      +
      +

      part statementb1-stmt

      +
      +
      +
      +
      + +
      +

      control c1

      +
      +
      +

      title Control C1

      +
      +
      +
      +
      +
      +
      +

      part statementc1-stmt

      +
      +
      +
      +
      + +
      +

      control c3

      +
      +
      +

      title Control C3

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a

      +
      +
      +

      title Control C3-A

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      + +
      +

      control c3.a-1

      +
      +
      +

      title Control C3-A-1

      +
      +
      +
      +
      +
      +
      +

      part statementc3-stmt

      +
      +
      +
      +
      +
      +
      +
      +
      + + \ No newline at end of file diff --git a/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml b/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml new file mode 100644 index 0000000000..7452b3f9f4 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/keep-everything-twice.xml @@ -0,0 +1,17 @@ + + + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml new file mode 100644 index 0000000000..4ad03f7a78 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-asis_RESOLVED.xml @@ -0,0 +1,103 @@ + + + + Test Profile + 2022-04-18T15:24:18.5370204-04:00 + 1.0 + 1.0.0 + + + + Group B of C + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      +
      + + Group A of C + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      +
      + + Group C of C + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml new file mode 100644 index 0000000000..d9e8500563 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-actual/req-include-all-flat_RESOLVED.xml @@ -0,0 +1,94 @@ + + + + Test Profile + 2022-04-18T15:24:19.2090219-04:00 + 1.0 + 1.0.0 + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml new file mode 100644 index 0000000000..7f603bcf77 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/keep-everything-twice_RESOLVED.xml @@ -0,0 +1,178 @@ + + + + Test Profile + 2022-04-25T16:32:27.0669689-04:00 + 1.0 + 1.0.0 + + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml new file mode 100644 index 0000000000..5e00340e8a --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-all-asis_RESOLVED.xml @@ -0,0 +1,104 @@ + + + + Test Profile + 2022-04-18T15:24:15.880015-04:00 + 1.0 + 1.0.0 + + + + + Group B of C + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      +
      + + Group A of C + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      +
      + + Group C of C + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml new file mode 100644 index 0000000000..8c843136a6 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-chained-deepA_RESOLVED.xml @@ -0,0 +1,81 @@ + + + + Test Profile + 2022-04-25T15:47:00.2942155-04:00 + 1.0 + 1.0.0 + + + + Group B of C + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      +
      + + Group A of C + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      +
      + + Group C of C + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml new file mode 100644 index 0000000000..90d7c81aef --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-circular_import_RESOLVED.xml @@ -0,0 +1,12 @@ + + + + Test Profile + 2022-04-18T15:24:16.5210188-04:00 + 1.0 + 1.0.0 + + + Import of href="req-circular_importer.xml" fails - circular import + diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml new file mode 100644 index 0000000000..5764fb3933 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-import-by-resource_RESOLVED.xml @@ -0,0 +1,103 @@ + + + + Test Profile + 2022-04-18T15:24:17.90803-04:00 + 1.0 + 1.0.0 + + + + Group B of C + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      +
      + + Group A of C + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      +
      + + Group C of C + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml new file mode 100644 index 0000000000..d618bc1891 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-asis_RESOLVED.xml @@ -0,0 +1,103 @@ + + + + Test Profile + 2022-02-15T13:27:39.019088-05:00 + 1.0 + 1.0.0 + + + + Group B of C + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      +
      + + Group A of C + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      +
      + + Group C of C + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml new file mode 100644 index 0000000000..0b2ae6a52d --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-all-flat_RESOLVED.xml @@ -0,0 +1,94 @@ + + + + Test Profile + 2022-02-15T16:39:33.396588-05:00 + 1.0 + 1.0.0 + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control B3 + + +

      B3 bbbb bbbbbbb bbbb.

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C2 + + +

      C2 cccccccc ccccccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml new file mode 100644 index 0000000000..d392c4d5d3 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-id_RESOLVED.xml @@ -0,0 +1,56 @@ + + + + Test Profile + 2022-04-19T15:51:51.3807658-04:00 + 1.0 + 1.0.0 + + + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml new file mode 100644 index 0000000000..519a5c30e3 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match-empty_RESOLVED.xml @@ -0,0 +1,11 @@ + + + + Test Profile + 2022-04-19T16:10:50.306097-04:00 + 1.0 + 1.0.0 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml new file mode 100644 index 0000000000..57215dbe01 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-by-match_RESOLVED.xml @@ -0,0 +1,52 @@ + + + + Test Profile + 2022-04-19T16:07:09.7400721-04:00 + 1.0 + 1.0.0 + + + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml new file mode 100644 index 0000000000..01d7ff07eb --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude1_RESOLVED.xml @@ -0,0 +1,42 @@ + + + + Test Profile + 2022-04-20T11:25:08.5989517-04:00 + 1.0 + 1.0.0 + + + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml new file mode 100644 index 0000000000..2611d1817a --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude2_RESOLVED.xml @@ -0,0 +1,28 @@ + + + + Test Profile + 2022-04-20T11:27:11.0114457-04:00 + 1.0 + 1.0.0 + + + + Control A2 + + +

      A2 aaa aaaaaaaaaa aaaaaaaaaaaaa

      +
      +
      + + Control A3 + + + + + +

      A3 aaaaa aaaaaaaaaa

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml new file mode 100644 index 0000000000..3a26a74414 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude3_RESOLVED.xml @@ -0,0 +1,25 @@ + + + + Test Profile + 2022-04-20T11:29:12.5084741-04:00 + 1.0 + 1.0.0 + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml new file mode 100644 index 0000000000..31f7820633 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude4_RESOLVED.xml @@ -0,0 +1,25 @@ + + + + Test Profile + 2022-04-25T16:18:40.4891642-04:00 + 1.0 + 1.0.0 + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml new file mode 100644 index 0000000000..f192200e80 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-include-exclude5_RESOLVED.xml @@ -0,0 +1,25 @@ + + + + Test Profile + 2022-04-25T16:20:19.1426274-04:00 + 1.0 + 1.0.0 + + + + Control B2 + + +

      B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml new file mode 100644 index 0000000000..76b78502ff --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-no_RESOLVED.xml @@ -0,0 +1,42 @@ + + + + Test Profile + 2022-04-19T16:25:49.1221541-04:00 + 1.0 + 1.0.0 + + + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml new file mode 100644 index 0000000000..3d9c352467 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-child-controls-none_RESOLVED.xml @@ -0,0 +1,42 @@ + + + + Test Profile + 2022-04-19T16:27:33.9704261-04:00 + 1.0 + 1.0.0 + + + + Control A1 + + + + + +

      A1 aaaaa aaaaaaaaaa

      +
      +
      + + Control B1 + + +

      B1 bbbb bbbbbbb.

      +
      +
      + + Control C1 + + +

      C1 ccccc ccc ccccccccccccccccc.

      +
      +
      + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml new file mode 100644 index 0000000000..5605cb1acb --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-no1_RESOLVED.xml @@ -0,0 +1,24 @@ + + + + Test Profile + 2022-04-26T17:10:21.286142-04:00 + 1.0 + 1.0.0 + + + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml new file mode 100644 index 0000000000..229f9cabd2 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-none_RESOLVED.xml @@ -0,0 +1,25 @@ + + + + Test Profile + 2022-04-26T17:19:59.7102091-04:00 + 1.0 + 1.0.0 + + + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml new file mode 100644 index 0000000000..90cd98f27f --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes1_RESOLVED.xml @@ -0,0 +1,32 @@ + + + + Test Profile + 2022-04-26T17:11:18.9602994-04:00 + 1.0 + 1.0.0 + + + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      + + Control C3-A-1 + + +

      C3 A-1 ccccc cccccccccccccc.

      +
      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml new file mode 100644 index 0000000000..813f9ac4b9 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/output-expected/req-with-parent-controls-yes2_RESOLVED.xml @@ -0,0 +1,25 @@ + + + + Test Profile + 2022-04-26T17:11:18.9602994-04:00 + 1.0 + 1.0.0 + + + + Control C3 + + +

      C3 ccccc cccccccccccccc.

      +
      + + Control C3-A + + +

      C3 A ccccc cccccccccccccc.

      +
      +
      +
      +
      diff --git a/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml b/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml new file mode 100644 index 0000000000..86c6a6cfd8 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-broken-import.xml @@ -0,0 +1,17 @@ + + + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + true + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml b/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml new file mode 100644 index 0000000000..a10fcb9a17 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-chained-all-asis.xml @@ -0,0 +1,18 @@ + + + + + Test Profile + 2022-04-18T15:14:17.679398100-04:00 + 1.0 + 1.0.0 + + + + + + + true + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml b/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml new file mode 100644 index 0000000000..bd62a69304 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-chained-deepA.xml @@ -0,0 +1,29 @@ + + + + + Test Profile + 2022-04-18T15:14:17.679398100-04:00 + 1.0 + 1.0.0 + + + + + a1 + b1 + c1 + c3 + + + + + a3 + b3 + + + + true + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml b/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml new file mode 100644 index 0000000000..ff0a12a7b3 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-circular_import.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2020-05-30T14:39:39.562-04:00 + 1.0 + 1.0.0 + + + + a1 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml b/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml new file mode 100644 index 0000000000..8e766511ac --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-circular_importer.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2020-05-30T14:39:39.562-04:00 + 1.0 + 1.0.0 + + + + a1 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml new file mode 100644 index 0000000000..f943f2a5a4 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-import-by-resource.xml @@ -0,0 +1,22 @@ + + + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + true + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml b/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml new file mode 100644 index 0000000000..69d1c64cf6 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-all-asis.xml @@ -0,0 +1,17 @@ + + + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + true + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml b/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml new file mode 100644 index 0000000000..0ef0dc3d57 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-all-flat.xml @@ -0,0 +1,14 @@ + + + + + Test Profile + 2022-02-15T13:33:09.325121-05:00 + 1.0 + 1.0.0 + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml new file mode 100644 index 0000000000..f6a0a7a1ca --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-id.xml @@ -0,0 +1,20 @@ + + + + + + Test Profile + 2020-05-30T14:39:45.684-04:00 + 1.0 + 1.0.0 + + + + a1 + b1 + c1 + c3 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml new file mode 100644 index 0000000000..2e08675d5a --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-match-empty.xml @@ -0,0 +1,18 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml b/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml new file mode 100644 index 0000000000..ae3eebf018 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-by-match.xml @@ -0,0 +1,18 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml new file mode 100644 index 0000000000..16127a2df0 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude1.xml @@ -0,0 +1,21 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + a1 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml new file mode 100644 index 0000000000..f8bb596091 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude2.xml @@ -0,0 +1,20 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml new file mode 100644 index 0000000000..45c32f4187 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude3.xml @@ -0,0 +1,22 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml new file mode 100644 index 0000000000..ad8bf1a3f3 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude4.xml @@ -0,0 +1,22 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml b/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml new file mode 100644 index 0000000000..55609abb5a --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-include-exclude5.xml @@ -0,0 +1,25 @@ + + + + + + Test Profile + 2020-05-30T14:39:47.217-04:00 + 1.0 + 1.0.0 + + + + + + + + + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml new file mode 100644 index 0000000000..1f4f255edd --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-missing-resource.xml @@ -0,0 +1,22 @@ + + + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + true + + + + + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml b/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml new file mode 100644 index 0000000000..4261620265 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-spoofing-resource.xml @@ -0,0 +1,22 @@ + + + ]> + + + Test Profile + 2022-02-14T17:44:59.245623-05:00 + 1.0 + 1.0.0 + + + + + + true + + + &spoof; + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml new file mode 100644 index 0000000000..4223dd4b53 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-no.xml @@ -0,0 +1,20 @@ + + + + + + Test Profile + 2020-05-30T14:39:45.684-04:00 + 1.0 + 1.0.0 + + + + a1 + b1 + c1 + c3 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml new file mode 100644 index 0000000000..3874fd3cb0 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-child-controls-none.xml @@ -0,0 +1,20 @@ + + + + + + Test Profile + 2020-05-30T14:39:45.684-04:00 + 1.0 + 1.0.0 + + + + a1 + b1 + c1 + c3 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml new file mode 100644 index 0000000000..6925264970 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-no1.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2022-04-26T16:46:04.8198642-04:00 + 1.0 + 1.0.0 + + + + c3 + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml new file mode 100644 index 0000000000..e911c6ef89 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-none.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2022-04-26T17:19:08.8113625-04:00 + 1.0 + 1.0.0 + + + + c3.a + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml new file mode 100644 index 0000000000..eefb32678e --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes1.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2022-04-26T17:09:44.5371952-04:00 + 1.0 + 1.0.0 + + + + c3.a + + + diff --git a/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml new file mode 100644 index 0000000000..6c73c9c3a5 --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/req-with-parent-controls-yes2.xml @@ -0,0 +1,17 @@ + + + + + + Test Profile + 2022-04-26T17:09:44.5371952-04:00 + 1.0 + 1.0.0 + + + + c3.a + + + diff --git a/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml b/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml new file mode 100644 index 0000000000..31b577d67e --- /dev/null +++ b/src/specifications/profile-resolution/requirement-tests/spoofed-resource.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/specifications/profile-resolution/spec-checkup.sch b/src/specifications/profile-resolution/spec-checkup.sch deleted file mode 100644 index bf2c4034a6..0000000000 --- a/src/specifications/profile-resolution/spec-checkup.sch +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - section is too deep - - - diff --git a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl index a423068823..612b5507db 100644 --- a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl +++ b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl @@ -3,7 +3,8 @@ xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution" xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="#all" - xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0"> + xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0" + default-mode="scrubbing">