Skip to content

Commit

Permalink
Update "expected" profile resolver output for the base tests. (#15)
Browse files Browse the repository at this point in the history
These are selective imports from the catalogs/abc-simple_catalog.xml, essentially identical except for how the
catalog is referenced.
  • Loading branch information
bradh authored and david-waltermire committed Mar 27, 2020
1 parent 4e95d19 commit 5b0a5df
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,55 @@
<prop name="resolution-timestamp">2019-12-10T15:21:19.329-05:00</prop>
<link rel="resolution-source" href="../base-test_profile.xml">Test Profile</link>
</metadata>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
<control id="c1">
<title>Control C1</title>
<prop name="place">first</prop>
<part name="statement" id="c1-stmt">
<p>C1 ccccc ccc ccccccccccccccccc.</p>
</part>
</control>
<control id="c3">
<title>Control C3</title>
<prop name="place">third</prop>
<part name="statement" id="c3-stmt">
<p>C3 ccccc cccccccccccccc.</p>
</part>
<control id="c3.a">
<title>Control C3-A</title>
<prop name="place">first</prop>
<part name="statement" id="c3-stmt">
<p>C3 A ccccc cccccccccccccc.</p>
</part>
</control>
</control>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
<group>
<title>Group C of C</title>
<control id="c1">
<title>Control C1</title>
<prop name="place">first</prop>
<part name="statement" id="c1-stmt">
<p>C1 ccccc ccc ccccccccccccccccc.</p>
</part>
</control>
<control id="c3">
<title>Control C3</title>
<prop name="place">third</prop>
<part name="statement" id="c3-stmt">
<p>C3 ccccc cccccccccccccc.</p>
</part>
<control id="c3.a">
<title>Control C3-A</title>
<prop name="place">first</prop>
<part name="statement" id="c3-stmt">
<p>C3 A ccccc cccccccccccccc.</p>
</part>
<control id="c3.a-1">
<title>Control C3-A-1</title>
<prop name="place">first</prop>
<part name="statement" id="c3-stmt">
<p>C3 A-1 ccccc cccccccccccccc.</p>
</part>
</control>
</control>
</control>
</group>
</catalog>
Original file line number Diff line number Diff line change
@@ -1,11 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="base2-test_profile-RESOLVED">
<metadata>
<title>Test Profile</title>
<last-modified>2019-10-13T13:41:58.548-04:00</last-modified>
<version>1.0</version>
<oscal-version>1.0-MR2</oscal-version>
<prop name="resolution-timestamp">2019-12-10T15:21:19.676-05:00</prop>
<link rel="resolution-source" href="../base2-test_profile.xml">Test Profile</link>
</metadata>
<metadata>
<title>Test Profile</title>
<last-modified>2019-10-13T13:41:58.548-04:00</last-modified>
<version>1.0</version>
<oscal-version>1.0-MR2</oscal-version>
<prop name="resolution-timestamp">2019-12-10T15:21:19.676-05:00</prop>
<link rel="resolution-source" href="../base2-test_profile.xml">Test Profile</link>
</metadata>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
<group>
<title>Group C of C</title>
<control id="c1">
<title>Control C1</title>
<prop name="place">first</prop>
<part name="statement" id="c1-stmt">
<p>C1 ccccc ccc ccccccccccccccccc.</p>
</part>
</control>
<control id="c3">
<title>Control C3</title>
<prop name="place">third</prop>
<part name="statement" id="c3-stmt">
<p>C3 ccccc cccccccccccccc.</p>
</part>
<control id="c3.a">
<title>Control C3-A</title>
<prop name="place">first</prop>
<part name="statement" id="c3-stmt">
<p>C3 A ccccc cccccccccccccc.</p>
</part>
<control id="c3.a-1">
<title>Control C3-A-1</title>
<prop name="place">first</prop>
<part name="statement" id="c3-stmt">
<p>C3 A-1 ccccc cccccccccccccc.</p>
</part>
</control>
</control>
</control>
</group>
</catalog>

0 comments on commit 5b0a5df

Please sign in to comment.