From abfa9c5479b15c64625f659efeea9c2cc493da24 Mon Sep 17 00:00:00 2001 From: dotasek Date: Wed, 20 Nov 2024 16:16:18 -0500 Subject: [PATCH] Bump core version + update tests --- gradle.properties | 2 +- http-client-tests/tests/explicit-queries.http | 13 ++++++++----- http-client-tests/tests/preset-queries.http | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59235fc..607036f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official kotlin.js.generate.executable.default=false # versions -fhirCoreVersion= 6.3.32 +fhirCoreVersion= 6.4.2 junitVersion=5.7.1 mockk_version=1.10.2 diff --git a/http-client-tests/tests/explicit-queries.http b/http-client-tests/tests/explicit-queries.http index db6dedf..13279e5 100644 --- a/http-client-tests/tests/explicit-queries.http +++ b/http-client-tests/tests/explicit-queries.http @@ -52,6 +52,7 @@ Content-Type: application/json ### US-CDA # @name US-CDA # Check that a request with explicit IG settings returns an expected response +# @timeout 120 POST {{host}}/validate Content-Type: application/json @@ -73,6 +74,7 @@ Content-Type: application/json ### IPS # @name IPS +# @timeout 120 POST {{host}}/validate Content-Type: application/json @@ -86,7 +88,7 @@ Content-Type: application/json client.test("Issues are Correct", function() { let issues = response.body.outcomes[0].issues client.log("issues:" + issues.length) - client.assert(issues.length === 45); + client.assert(issues.length === 44); client.assert(containsIssue(issues, 1, 2, "The Snomed CT code 373270004 (Substance with penicillin structure and antibacterial mechanism of action) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION")) client.assert(containsIssue(issues, 1, 2, "The Snomed CT code 108774000 (Product containing anastrozole (medicinal product)) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION")) @@ -98,6 +100,7 @@ Content-Type: application/json ### IPS-AU # @name IPS-AU +# @timeout 120 POST {{host}}/validate Content-Type: application/json @@ -111,7 +114,7 @@ Content-Type: application/json client.test("Issues are Correct", function() { let issues = response.body.outcomes[0].issues client.log("issues:" + issues.length) - client.assert(issues.length === 53); + client.assert(issues.length === 49); client.assert(containsIssue(issues, 1, 2, "The Snomed CT code 373270004 (Substance with penicillin structure and antibacterial mechanism of action) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION")) client.assert(containsIssue(issues, 1, 2, "The Snomed CT code 108774000 (Product containing anastrozole (medicinal product)) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION")) client.assert(containsIssue(issues, 314, 4, "This element does not match any known slice defined in the profile http://hl7.org.au/fhir/ips/StructureDefinition/Bundle-au-ips|0.0.1 (this may not be a problem, but you should check that it's not intended to match a slice)", "INFORMATIONAL", "INFORMATION")) @@ -156,8 +159,8 @@ Content-Type: application/json let issues = response.body.outcomes[0].issues client.log("issues:" + issues.length) client.assert(issues.length === 3); - client.assert(containsIssue(issues, 20, 21, "The column 'use' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) - client.assert(containsIssue(issues, 24, 21, "The column 'city' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) - client.assert(containsIssue(issues, 28, 21, "The column 'zip' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) + client.assert(containsIssue(issues, 19, 11, "This column is not defined as a collection, but the path statement 'use' might return multiple values for the column 'use' for some inputs", "BUSINESSRULE", "WARNING")) + client.assert(containsIssue(issues, 23, 11, "This column is not defined as a collection, but the path statement 'city' might return multiple values for the column 'city' for some inputs", "BUSINESSRULE", "WARNING")) + client.assert(containsIssue(issues, 27, 11, "This column is not defined as a collection, but the path statement 'postalCode' might return multiple values for the column 'zip' for some inputs", "BUSINESSRULE", "WARNING")) }); %} \ No newline at end of file diff --git a/http-client-tests/tests/preset-queries.http b/http-client-tests/tests/preset-queries.http index f792978..2d02424 100644 --- a/http-client-tests/tests/preset-queries.http +++ b/http-client-tests/tests/preset-queries.http @@ -156,9 +156,9 @@ Content-Type: application/json client.test("Issues are Correct", function() { let issues = response.body.outcomes[0].issues client.log("issues:" + issues.length) - client.assert(issues.length === 8); - client.assert(containsIssue(issues, 20, 21, "The column 'use' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) - client.assert(containsIssue(issues, 24, 21, "The column 'city' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) - client.assert(containsIssue(issues, 28, 21, "The column 'zip' appears to be a collection based on it's path. Collections are not supported in all execution contexts", "BUSINESSRULE", "WARNING")) + client.assert(issues.length === 3); + client.assert(containsIssue(issues, 19, 11, "This column is not defined as a collection, but the path statement 'use' might return multiple values for the column 'use' for some inputs", "BUSINESSRULE", "WARNING")) + client.assert(containsIssue(issues, 23, 11, "This column is not defined as a collection, but the path statement 'city' might return multiple values for the column 'city' for some inputs", "BUSINESSRULE", "WARNING")) + client.assert(containsIssue(issues, 27, 11, "This column is not defined as a collection, but the path statement 'postalCode' might return multiple values for the column 'zip' for some inputs", "BUSINESSRULE", "WARNING")) }); %} \ No newline at end of file