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

Feature profile resolution unittesting a #1770

Merged
merged 10 commits into from
Apr 21, 2023
Merged

Feature profile resolution unittesting a #1770

merged 10 commits into from
Apr 21, 2023

Conversation

nikitawootten-nist
Copy link
Contributor

Committer Notes

Closes #1735

All Submissions:

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

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

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.

wendellpiez and others added 8 commits April 7, 2023 17:49
@wendellpiez @aj-stein-nist
Profile resolution unit tests and specification updates (#1219)
b5df610 
* Updates to tests including whitespace scrub test
* Adding oXygen project
* Integration work on specs and unit tests / XSLT and Schematron
* Profile resolution testing infrastructure, plus some tests
* Some test files with expected results
* Updated and improved XSpec generation and tests - now driven directly from SpecML source
* Adjusted gitignore; extended spec with more bindings; illustrator XSLT
* Added XSLT producing Markdown summary of requirements w/ examples; updates
* Added a small utility for converting JSON "prop" fields to "props" fields (emended 1.0.2 syntax)
* Updated to Profile Resolution spec (with example files now tagged) and readme.md
* Updated profile resolution (spec) readme with clarification regarding unit testing
@wendellpiez @aj-stein-nist
Adding XSLT provisionally to produce a unit testing harness after @da…
96baa43 
…vid-waltermire-nist model, with example and schema; also cleanup
@wendellpiez @aj-stein-nist
Removed working file included by accident
36f5a41
@wendellpiez @aj-stein-nist
More unit tests with edits to spec for tracking.
37a4716
@wendellpiez @aj-stein-nist
Catching up various outstanding profile resolution work
2177651
@wendellpiez @aj-stein-nist
Small update to oXygen setup
11d0de0
@aj-stein-nist
Update metaschema submodule to existing commit.
2d7b4db
@aj-stein-nist
Move up Metaschema submodule
c497eb7 
Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of #1754.
@nikitawootten-nist @aj-stein-nist
XSpec test suites script & CI (#1754)
2c4b21f 
* XSpec test suites script & CI

* Helper script to build and tag the OSCAL env

* Move up Metaschema submodule

Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of #1754.

* Save XSpec test summary + pull appropriate tag

* Escape TEST_SUITE in XSpec runner

Co-authored-by: A.J. Stein <[email protected]>

* Update test script to address shellcheck guidance

* Grab branch from GHA

* Fix for builds on the M1

---------

Co-authored-by: A.J. Stein <[email protected]>
@nikitawootten-nist nikitawootten-nist force-pushed the feature-profile-resolution-unittestingA branch from 893b8f5 to 2c4b21f Compare April 21, 2023 20:43
@nikitawootten-nist nikitawootten-nist force-pushed the feature-profile-resolution-unittestingA branch from 562eb38 to 7db27d4 Compare April 21, 2023 21:11
@aj-stein-nist aj-stein-nist requested review from aj-stein-nist and removed request for wendellpiez April 21, 2023 21:15
@aj-stein-nist aj-stein-nist linked an issue Apr 21, 2023 that may be closed by this pull request
Profile resolution spec has unusual rlink constraint #1752
Open
aj-stein-nist
aj-stein-nist approved these changes Apr 21, 2023
View reviewed changes
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

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

I cancelled the builds prematurely that mark the tests failed to not auto-generate the artifacts. This looks good.

@aj-stein-nist aj-stein-nist merged commit 3318dd3 into develop Apr 21, 2023
@aj-stein-nist aj-stein-nist removed a link to an issue Apr 21, 2023
Profile resolution spec has unusual rlink constraint #1752
Open
@nikitawootten-nist nikitawootten-nist deleted the feature-profile-resolution-unittestingA branch May 4, 2023 16:59
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jun 29, 2023
@nikitawootten-nist @wendellpiez @aj-stein-nist
Feature profile resolution unittesting a (usnistgov#1770)
77e2699 
* Profile resolution unit tests and specification updates (usnistgov#1219)

* Updates to tests including whitespace scrub test
* Adding oXygen project
* Integration work on specs and unit tests / XSLT and Schematron
* Profile resolution testing infrastructure, plus some tests
* Some test files with expected results
* Updated and improved XSpec generation and tests - now driven directly from SpecML source
* Adjusted gitignore; extended spec with more bindings; illustrator XSLT
* Added XSLT producing Markdown summary of requirements w/ examples; updates
* Added a small utility for converting JSON "prop" fields to "props" fields (emended 1.0.2 syntax)
* Updated to Profile Resolution spec (with example files now tagged) and readme.md
* Updated profile resolution (spec) readme with clarification regarding unit testing

* Adding XSLT provisionally to produce a unit testing harness after @david-waltermire-nist model, with example and schema; also cleanup

* Removed working file included by accident

* More unit tests with edits to spec for tracking.

* Catching up various outstanding profile resolution work

* Small update to oXygen setup

* Update metaschema submodule to existing commit.

* Move up Metaschema submodule

Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of usnistgov#1754.

* XSpec test suites script & CI (usnistgov#1754)

* XSpec test suites script & CI

* Helper script to build and tag the OSCAL env

* Move up Metaschema submodule

Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of usnistgov#1754.

* Save XSpec test summary + pull appropriate tag

* Escape TEST_SUITE in XSpec runner

Co-authored-by: A.J. Stein <[email protected]>

* Update test script to address shellcheck guidance

* Grab branch from GHA

* Fix for builds on the M1

---------

Co-authored-by: A.J. Stein <[email protected]>

* Fixed logic for when a tag does not exist

---------

Co-authored-by: Wendell Piez <[email protected]>
Co-authored-by: A.J. Stein <[email protected]>
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jul 10, 2023
@nikitawootten-nist @wendellpiez @aj-stein-nist
Feature profile resolution unittesting a (usnistgov#1770)
ff951bd 
* Profile resolution unit tests and specification updates (usnistgov#1219)

* Updates to tests including whitespace scrub test
* Adding oXygen project
* Integration work on specs and unit tests / XSLT and Schematron
* Profile resolution testing infrastructure, plus some tests
* Some test files with expected results
* Updated and improved XSpec generation and tests - now driven directly from SpecML source
* Adjusted gitignore; extended spec with more bindings; illustrator XSLT
* Added XSLT producing Markdown summary of requirements w/ examples; updates
* Added a small utility for converting JSON "prop" fields to "props" fields (emended 1.0.2 syntax)
* Updated to Profile Resolution spec (with example files now tagged) and readme.md
* Updated profile resolution (spec) readme with clarification regarding unit testing

* Adding XSLT provisionally to produce a unit testing harness after @david-waltermire-nist model, with example and schema; also cleanup

* Removed working file included by accident

* More unit tests with edits to spec for tracking.

* Catching up various outstanding profile resolution work

* Small update to oXygen setup

* Update metaschema submodule to existing commit.

* Move up Metaschema submodule

Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of usnistgov#1754.

* XSpec test suites script & CI (usnistgov#1754)

* XSpec test suites script & CI

* Helper script to build and tag the OSCAL env

* Move up Metaschema submodule

Prior work on pushing up the XSpec dependency and pulling in other
file relocation improvements were merged and it appears I pushed the
wrong commit into this branch and inadvertently led to more confusion
where builds failed in current version of usnistgov#1754.

* Save XSpec test summary + pull appropriate tag

* Escape TEST_SUITE in XSpec runner

Co-authored-by: A.J. Stein <[email protected]>

* Update test script to address shellcheck guidance

* Grab branch from GHA

* Fix for builds on the M1

---------

Co-authored-by: A.J. Stein <[email protected]>

* Fixed logic for when a tag does not exist

---------

Co-authored-by: Wendell Piez <[email protected]>
Co-authored-by: A.J. Stein <[email protected]>
@aj-stein-nist aj-stein-nist added this to the v1.1.0 milestone Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aj-stein-nist aj-stein-nist aj-stein-nist approved these changes

Assignees

@nikitawootten-nist nikitawootten-nist

Labels
None yet
Projects
None yet
Milestone
v1.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@nikitawootten-nist @aj-stein-nist @wendellpiez