Skip to content

HIT-34 Add nts:contentAsserts/@warningOnly support #43

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

HIT-34 Add nts:contentAsserts/@warningOnly support #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion generate/xslt/_generateContentAsserts.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="stopTestOnFail" select="true()"/>
<xsl:with-param name="warningOnly" select="@warningOnly = 'true'"/>
</xsl:call-template>

<!-- Add an explicit assert to check Resource.id in case of server response checks -->
Expand All @@ -212,6 +213,7 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="stopTestOnFail" select="true()"/>
<xsl:with-param name="warningOnly" select="@warningOnly = 'true'"/>
</xsl:call-template>

<!-- If the assert above passes, we know by definition that this variable will be evaluated. TestScripts will fail with an error if a variable cannot be evaluated, but to users it is not really clear what happens. The setup with the asserts above will prevent that hopefully. -->
Expand Down Expand Up @@ -260,6 +262,11 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="parentLabel" select="$resourceCount"/>
<xsl:with-param name="warningOnly" as="xs:boolean?">
<xsl:if test="@warningOnly">
<xsl:value-of select="@warningOnly = 'true'"/>
</xsl:if>
</xsl:with-param>
</xsl:apply-templates>
</test>
</xsl:for-each>
Expand Down Expand Up @@ -606,6 +613,7 @@
<xsl:param name="resourceIdExpression" tunnel="yes"/>
<xsl:param name="parentLabel" required="yes"/>
<xsl:param name="skipExtensions" select="false()"/>
<xsl:param name="warningOnly" as="xs:boolean?"/>

<xsl:variable name="parentFhirPath" select="parent::*/@nts:fhirPath"/>
<xsl:variable name="fhirPath" select="@nts:fhirPath"/>
Expand Down Expand Up @@ -673,6 +681,10 @@
<xsl:with-param name="label" select="$label"/>
<xsl:with-param name="warningOnly">
<xsl:choose>
<xsl:when test="not(empty($warningOnly))">
<!--<xsl:message>DEBUG: contentAssert warningOnly - <xsl:value-of select="$warningOnly"/></xsl:message>-->
<xsl:value-of select="$warningOnly"/>
</xsl:when>
<!-- Impossible to determine if code-specification is required without accessing ConceptMaps, so putting them all on warningOnly for now -->
<xsl:when test="descendant-or-self::f:extension[@url = 'http://nictiz.nl/fhir/StructureDefinition/code-specification'] and $skipExtensions = false()">
<xsl:value-of select="true()"/>
Expand Down Expand Up @@ -725,6 +737,7 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="label" select="concat($label,'-1')"/>
<xsl:with-param name="warningOnly" select="$warningOnly = true()"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="$skipExtensions = false() and ((not(@value) and count(f:*) gt 1) or @value and f:*)">
Expand Down Expand Up @@ -760,7 +773,7 @@
<xsl:param name="description" required="yes"/>
<xsl:param name="expression" required="yes"/>
<xsl:param name="label"/>
<xsl:param name="warningOnly" select="false()"/>
<xsl:param name="warningOnly" select="false()" as="xs:boolean"/>
<xsl:param name="stopTestOnFail" select="false()"/>

<action>
Expand Down