From 2cda0605faecf48ec351f7239494033cc4956ee8 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 28 Dec 2023 13:40:21 +1100 Subject: [PATCH] Add expression and issue type to test cases --- .../expand-withdrawn-request-parameters.json | 3 ++ .../expand-withdrawn-response-valueSet.json | 48 +++++++++--------- .../validate-draft-response-parameters.json | 5 ++ ...date-experimental-response-parameters.json | 5 ++ ...ate-not-withdrawn-response-parameters.json | 10 ++++ ...alidate-withdrawn-response-parameters.json | 10 ++++ .../errors-unknown-system1-response.json | 14 +++++- .../errors-unknown-system2-response.json | 18 ++++++- ...idate-inactive-2a-response-parameters.json | 9 +++- ...idate-inactive-3a-response-parameters.json | 9 +++- tx/messages-tx.fhir.org.json | 20 ++++---- ...n-dual-filter-out-response-parameters.json | 16 +++++- tx/test-cases.json | 25 ++++++++++ ...nomed-validation-1-request-parameters.json | 1 + ...omed-validation-1-response-parameters.json | 49 +++++++++++++++++++ ...eableconcept-full-response-parameters.json | 29 +++++++++-- ...bleconcept-vsonly-response-parameters.json | 28 +++++++++-- .../cs-code-bad-code-request-parameters.json | 10 ++++ .../cs-code-bad-code-response-parameters.json | 40 +++++++++++++++ .../cs-code-good-request-parameters.json | 10 ++++ .../cs-code-good-response-parameters.json | 23 +++++++++ ...ple-code-bad-code-response-parameters.json | 18 ++++++- ...-code-bad-display-response-parameters.json | 9 +++- ...de-bad-display-ws-response-parameters.json | 9 +++- ...code-bad-displayW-response-parameters.json | 9 +++- ...code-bad-language-response-parameters.json | 9 +++- ...le-code-bad-regex-response-parameters.json | 9 +++- ...e-code-bad-system-response-parameters.json | 18 ++++++- ...code-bad-version1-response-parameters.json | 14 +++++- ...-implied-bad-code-response-parameters.json | 18 ++++++- ...econcept-bad-code-response-parameters.json | 25 ++++++++-- ...ncept-bad-display-response-parameters.json | 9 +++- ...cept-bad-displayW-response-parameters.json | 9 +++- ...cept-bad-language-response-parameters.json | 9 +++- ...oncept-bad-system-response-parameters.json | 27 ++++++++-- ...cept-bad-version1-response-parameters.json | 18 ++++++- ...e-coding-bad-code-response-parameters.json | 18 ++++++- ...oding-bad-display-response-parameters.json | 9 +++- ...ding-bad-displayW-response-parameters.json | 9 +++- ...d-language-header-response-parameters.json | 9 +++- ...ding-bad-language-response-parameters.json | 9 +++- ...g-bad-language-vs-response-parameters.json | 9 +++- ...d-language-vslang-response-parameters.json | 9 +++- ...coding-bad-system-response-parameters.json | 18 ++++++- ...ding-bad-version1-response-parameters.json | 19 +++++-- validator/manifest.json | 46 +++++++++++++++++ validator/obs-temp-code2.json | 41 ++++++++++++++++ 47 files changed, 703 insertions(+), 85 deletions(-) create mode 100644 tx/tx.fhir.org/snomed-validation-1-request-parameters.json create mode 100644 tx/tx.fhir.org/snomed-validation-1-response-parameters.json create mode 100644 tx/validation/cs-code-bad-code-request-parameters.json create mode 100644 tx/validation/cs-code-bad-code-response-parameters.json create mode 100644 tx/validation/cs-code-good-request-parameters.json create mode 100644 tx/validation/cs-code-good-response-parameters.json create mode 100644 validator/obs-temp-code2.json diff --git a/tx/deprecated/expand-withdrawn-request-parameters.json b/tx/deprecated/expand-withdrawn-request-parameters.json index 461924f7..79482308 100644 --- a/tx/deprecated/expand-withdrawn-request-parameters.json +++ b/tx/deprecated/expand-withdrawn-request-parameters.json @@ -3,5 +3,8 @@ "parameter" : [{ "name" : "url", "valueUrl" : "http://hl7.org/fhir/test/ValueSet/withdrawn" + },{ + "name" : "excludeNested", + "valueBoolean" : true }] } \ No newline at end of file diff --git a/tx/deprecated/expand-withdrawn-response-valueSet.json b/tx/deprecated/expand-withdrawn-response-valueSet.json index a593d2f2..0a81e84e 100644 --- a/tx/deprecated/expand-withdrawn-response-valueSet.json +++ b/tx/deprecated/expand-withdrawn-response-valueSet.json @@ -19,11 +19,15 @@ "timestamp" : "$instant$", "total" : 7, "parameter" : [{ + "name" : "excludeNested", + "valueBoolean" : true + }, + { "name" : "used-codesystem", "valueUri" : "http://hl7.org/fhir/test/CodeSystem/deprecated|0.1.0" }, { - "$optional$" : true, + "$optional$" : true, "name" : "version", "valueUri" : "http://hl7.org/fhir/test/CodeSystem/deprecated|0.1.0" }, @@ -43,27 +47,27 @@ { "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", "code" : "code2", - "display" : "Display 2", - "contains" : [{ - "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", - "code" : "code2a", - "display" : "Display 2a", - "contains" : [{ - "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", - "code" : "code2aI", - "display" : "Display 2aI" - }, - { - "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", - "code" : "code2aII", - "display" : "Display 2aII" - }] - }, - { - "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", - "code" : "code2b", - "display" : "Display 2b" - }] + "display" : "Display 2" + }, + { + "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", + "code" : "code2a", + "display" : "Display 2a" + }, + { + "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", + "code" : "code2aI", + "display" : "Display 2aI" + }, + { + "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", + "code" : "code2aII", + "display" : "Display 2aII" + }, + { + "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", + "code" : "code2b", + "display" : "Display 2b" }, { "system" : "http://hl7.org/fhir/test/CodeSystem/deprecated", diff --git a/tx/deprecated/validate-draft-response-parameters.json b/tx/deprecated/validate-draft-response-parameters.json index aa647476..741f8551 100644 --- a/tx/deprecated/validate-draft-response-parameters.json +++ b/tx/deprecated/validate-draft-response-parameters.json @@ -16,6 +16,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to draft CodeSystem http://hl7.org/fhir/test/CodeSystem/draft|0.1.0" } }] diff --git a/tx/deprecated/validate-experimental-response-parameters.json b/tx/deprecated/validate-experimental-response-parameters.json index 9d262c40..9768c771 100644 --- a/tx/deprecated/validate-experimental-response-parameters.json +++ b/tx/deprecated/validate-experimental-response-parameters.json @@ -16,6 +16,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to experimental CodeSystem http://hl7.org/fhir/test/CodeSystem/experimental|0.1.0" } }] diff --git a/tx/deprecated/validate-not-withdrawn-response-parameters.json b/tx/deprecated/validate-not-withdrawn-response-parameters.json index 79851a5f..524fee6b 100644 --- a/tx/deprecated/validate-not-withdrawn-response-parameters.json +++ b/tx/deprecated/validate-not-withdrawn-response-parameters.json @@ -16,6 +16,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to deprecated CodeSystem http://hl7.org/fhir/test/CodeSystem/deprecated|0.1.0" } }, @@ -23,6 +28,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to withdrawn ValueSet http://hl7.org/fhir/test/ValueSet/withdrawn|5.0.0" } }] diff --git a/tx/deprecated/validate-withdrawn-response-parameters.json b/tx/deprecated/validate-withdrawn-response-parameters.json index 79851a5f..524fee6b 100644 --- a/tx/deprecated/validate-withdrawn-response-parameters.json +++ b/tx/deprecated/validate-withdrawn-response-parameters.json @@ -16,6 +16,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to deprecated CodeSystem http://hl7.org/fhir/test/CodeSystem/deprecated|0.1.0" } }, @@ -23,6 +28,11 @@ "severity" : "information", "code" : "business-rule", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "status-check" + }], "text" : "Reference to withdrawn ValueSet http://hl7.org/fhir/test/ValueSet/withdrawn|5.0.0" } }] diff --git a/tx/errors/errors-unknown-system1-response.json b/tx/errors/errors-unknown-system1-response.json index 8daccb3c..d9a0ac36 100644 --- a/tx/errors/errors-unknown-system1-response.json +++ b/tx/errors/errors-unknown-system1-response.json @@ -9,17 +9,29 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "The code system http://hl7.org/fhir/test/CodeSystem/simpleX could not be found" }, - "location" : ["system"] + "location" : ["system"], + "expression" : ["system"] }, { "severity" : "warning", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "vs-invalid" + }], "text" : "Unable to check whether the code is in the value set http://hl7.org/fhir/test/ValueSet/unknown-system|5.0.0" } }] diff --git a/tx/errors/errors-unknown-system2-response.json b/tx/errors/errors-unknown-system2-response.json index 209a8e17..fc39553c 100644 --- a/tx/errors/errors-unknown-system2-response.json +++ b/tx/errors/errors-unknown-system2-response.json @@ -9,20 +9,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simpleXX#code1' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/unknown-system|5.0.0'" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "The code system http://hl7.org/fhir/test/CodeSystem/simpleXX could not be found" }, - "location" : ["system"] + "location" : ["system"], + "expression" : ["system"] }] } }, diff --git a/tx/inactive/validate-inactive-2a-response-parameters.json b/tx/inactive/validate-inactive-2a-response-parameters.json index 80c0f196..c5489386 100644 --- a/tx/inactive/validate-inactive-2a-response-parameters.json +++ b/tx/inactive/validate-inactive-2a-response-parameters.json @@ -15,12 +15,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/inactive-all-active|5.0.0$" }, - "location" : ["Coding.code"] + "location" : ["Coding.code"], + "expression" : ["Coding.code"] }] } }, diff --git a/tx/inactive/validate-inactive-3a-response-parameters.json b/tx/inactive/validate-inactive-3a-response-parameters.json index 3f170f3b..06a2ccde 100644 --- a/tx/inactive/validate-inactive-3a-response-parameters.json +++ b/tx/inactive/validate-inactive-3a-response-parameters.json @@ -15,12 +15,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/inactive-all-active|5.0.0$" }, - "location" : ["Coding.code"] + "location" : ["Coding.code"], + "expression" : ["Coding.code"] }] } }, diff --git a/tx/messages-tx.fhir.org.json b/tx/messages-tx.fhir.org.json index 8281a732..1fb0f6e2 100644 --- a/tx/messages-tx.fhir.org.json +++ b/tx/messages-tx.fhir.org.json @@ -1,23 +1,23 @@ { "validation/simple-code-bad-code-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'", - "2" : "Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'", - "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'" + "2" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'", + "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" }, "validation/simple-code-implied-bad-code-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'", - "2" : "Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'", - "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'" + "2" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'", + "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" }, "validation/simple-coding-bad-code-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'", - "2" : "Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'", - "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'" + "2" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'", + "3" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" }, "validation/simple-codeableconcept-bad-code-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'", - "2" : "Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'", - "3" : "No valid coding was found for the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown Code 'code1x' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'" + "2" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'", + "3" : "No valid coding was found for the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#code1x' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'; Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" }, "validation/simple-code-bad-system-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simplex#code1' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'", @@ -105,9 +105,9 @@ }, "validation/complex-codeableconcept-full-response-parameters.json" : { "1" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#xxxx' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/version-all-1|1.1.0'", - "2" : "Unknown Code 'xxxx' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'", + "2" : "Unknown code 'xxxx' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'", "3" : "Wrong Display Name 'xxxxx' for http://hl7.org/fhir/test/CodeSystem/version#code1 - should be 'Display 1 (1.0)' (en) (for the language(s) '--')", - "4" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#xxxx' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/version-all-1|1.1.0'; Unknown Code 'xxxx' in the system 'http://hl7.org/fhir/test/CodeSystem/simple|0.1.0'; Wrong Display Name 'xxxxx' for http://hl7.org/fhir/test/CodeSystem/version#code1 - should be 'Display 1 (1.0)' (en) (for the language(s) '--')" + "4" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simple#xxxx' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/version-all-1|1.1.0'; Unknown code 'xxxx' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'; Wrong Display Name 'xxxxx' for http://hl7.org/fhir/test/CodeSystem/version#code1 - should be 'Display 1 (1.0)' (en) (for the language(s) '--')" }, "validation/simple-coding-bad-version1-response-parameters.json" : { "1" : "The code system http://hl7.org/fhir/test/CodeSystem/simple version 1.0.0 could not be found. Valid versions: [0.1.0]", diff --git a/tx/other/validation-dual-filter-out-response-parameters.json b/tx/other/validation-dual-filter-out-response-parameters.json index 905fda8e..207c65bb 100644 --- a/tx/other/validation-dual-filter-out-response-parameters.json +++ b/tx/other/validation-dual-filter-out-response-parameters.json @@ -17,16 +17,28 @@ "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "No valid coding was found for the value set 'http://hl7.org/fhir/test/ValueSet/dual-filter'" } }, { - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/dual-filter#AA' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/dual-filter'" }, - "location" : ["CodeableConcept.coding[0].code"] + "location" : ["CodeableConcept.coding[0].code"], + "expression" : ["CodeableConcept.coding[0].code"] }] } }, diff --git a/tx/test-cases.json b/tx/test-cases.json index 3ba5065f..22b96db0 100644 --- a/tx/test-cases.json +++ b/tx/test-cases.json @@ -689,6 +689,18 @@ "profile" : "version/parameters-default-version.json", "request" : "validation/version-profile-coding-request-parameters.json", "response" : "validation/version-profile-coding-response-parameters.json" + }, + { + "name" : "validation-cs-code-good", + "operation" : "cs-validate-code", + "request" : "validation/cs-code-good-request-parameters.json", + "response" : "validation/cs-code-good-response-parameters.json" + }, + { + "name" : "validation-cs-code-bad-code", + "operation" : "cs-validate-code", + "request" : "validation/cs-code-bad-code-request-parameters.json", + "response" : "validation/cs-code-bad-code-response-parameters.json" } ] },{ @@ -898,6 +910,19 @@ "response" : "inactive/validate-inactive-3b-response-parameters.json" } ] + },{ + "name" : "tx.fhir.org", + "mode" : "tx.fhir.org", + "description" : "These are tx.fhir.org specific tests. There's no expectation that other servers will pass these tests, and they are not executed by default. (other servers can, but they depend on other set up not controlled by the tests", + "setup" : [ ], + "tests" : [ + { + "name" : "snomed-validation-1", + "operation" : "cs-validate-code", + "request" : "tx.fhir.org/snomed-validation-1-request-parameters.json", + "response" : "tx.fhir.org/snomed-validation-1-response-parameters.json" + } + ] }], "todo" : "incomplete code systems, inactive/abstract, filter = notSelectable", "not-done" : [ diff --git a/tx/tx.fhir.org/snomed-validation-1-request-parameters.json b/tx/tx.fhir.org/snomed-validation-1-request-parameters.json new file mode 100644 index 00000000..7176cd9a --- /dev/null +++ b/tx/tx.fhir.org/snomed-validation-1-request-parameters.json @@ -0,0 +1 @@ +{"resourceType":"Parameters","parameter":[{"name":"code","valueCode":"276885007x"},{"name" : "system", "valueUri":"http://snomed.info/sct"}]} diff --git a/tx/tx.fhir.org/snomed-validation-1-response-parameters.json b/tx/tx.fhir.org/snomed-validation-1-response-parameters.json new file mode 100644 index 00000000..39c3e803 --- /dev/null +++ b/tx/tx.fhir.org/snomed-validation-1-response-parameters.json @@ -0,0 +1,49 @@ +{ + "resourceType" : "Parameters", + "parameter" : [{ + "name" : "code", + "valueCode" : "276885007x" + }, + { + "name" : "issues", + "resource" : { + "resourceType" : "OperationOutcome", + "issue" : [{ + "severity" : "error", + "code" : "code-invalid", + "details" : { + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], + "text" : "Unknown code '276885007x' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'" + }, + "location" : ["code"], + "expression" : ["code"] + }, + { + "severity" : "information", + "code" : "code-invalid", + "details" : { + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], + "text" : "Code 276885007x is not a valid SNOMED CT Term, and neither could it be parsed as an expression (Found content (\"x\") after end of expression at character 10)" + } + }] + } + }, + { + "name" : "message", + "valueString" : "Unknown code '276885007x' in the CodeSystem 'http://snomed.info/sct' version 'http://snomed.info/sct/900000000000207008/version/20230901'" + }, + { + "name" : "result", + "valueBoolean" : false + }, + { + "name" : "system", + "valueUri" : "http://snomed.info/sct" + }] +} \ No newline at end of file diff --git a/tx/validation/complex-codeableconcept-full-response-parameters.json b/tx/validation/complex-codeableconcept-full-response-parameters.json index 19c2a41f..8ce70733 100644 --- a/tx/validation/complex-codeableconcept-full-response-parameters.json +++ b/tx/validation/complex-codeableconcept-full-response-parameters.json @@ -29,28 +29,49 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], "text" : "$external:2:xxxx$" }, - "location" : ["CodeableConcept.coding[1].code"] + "location" : ["CodeableConcept.coding[1].code"], + "expression" : ["CodeableConcept.coding[1].code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:3:xxxxx$" }, - "location" : ["CodeableConcept.coding[0].display"] + "location" : ["CodeableConcept.coding[0].display"], + "expression" : ["CodeableConcept.coding[0].display"] }, { - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "$external:1:xxxx$" }, - "location" : ["CodeableConcept.coding[1].code"] + "location" : ["CodeableConcept.coding[1].code"], + "expression" : ["CodeableConcept.coding[1].code"] }] } }, diff --git a/tx/validation/complex-codeableconcept-vsonly-response-parameters.json b/tx/validation/complex-codeableconcept-vsonly-response-parameters.json index 69b9b4a5..587b09d7 100644 --- a/tx/validation/complex-codeableconcept-vsonly-response-parameters.json +++ b/tx/validation/complex-codeableconcept-vsonly-response-parameters.json @@ -25,25 +25,43 @@ "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:2:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" } }, { - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "$external:3:code1$" }, - "location" : ["CodeableConcept.coding[0].code"] + "location" : ["CodeableConcept.coding[0].code"], + "expression" : ["CodeableConcept.coding[0].code"] }, { - "$optional$" : true, - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "$external:1:xxx$" }, - "location" : ["CodeableConcept.coding[1].code"] + "location" : ["CodeableConcept.coding[1].code"], + "expression" : ["CodeableConcept.coding[1].code"] }] } }, diff --git a/tx/validation/cs-code-bad-code-request-parameters.json b/tx/validation/cs-code-bad-code-request-parameters.json new file mode 100644 index 00000000..ce42a664 --- /dev/null +++ b/tx/validation/cs-code-bad-code-request-parameters.json @@ -0,0 +1,10 @@ +{ + "resourceType" : "Parameters", + "parameter" : [{ + "name" : "code", + "valueCode" : "code1x" + },{ + "name" : "system", + "valueCanonical" : "http://hl7.org/fhir/test/CodeSystem/simple" + }] +} \ No newline at end of file diff --git a/tx/validation/cs-code-bad-code-response-parameters.json b/tx/validation/cs-code-bad-code-response-parameters.json new file mode 100644 index 00000000..aac05d52 --- /dev/null +++ b/tx/validation/cs-code-bad-code-response-parameters.json @@ -0,0 +1,40 @@ +{ + "resourceType" : "Parameters", + "parameter" : [{ + "name" : "code", + "valueCode" : "code1x" + }, + { + "name" : "issues", + "resource" : { + "resourceType" : "OperationOutcome", + "issue" : [{ + "$optional-properties$" : ["expression" ], + "severity" : "error", + "code" : "code-invalid", + "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], + "text" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" + }, + "location" : ["code"], + "expression" : ["$.code"] + }] + } + }, + { + "name" : "message", + "valueString" : "Unknown code 'code1x' in the CodeSystem 'http://hl7.org/fhir/test/CodeSystem/simple' version '0.1.0'" + }, + { + "name" : "result", + "valueBoolean" : false + }, + { + "name" : "system", + "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple" + }] +} \ No newline at end of file diff --git a/tx/validation/cs-code-good-request-parameters.json b/tx/validation/cs-code-good-request-parameters.json new file mode 100644 index 00000000..b842ea9f --- /dev/null +++ b/tx/validation/cs-code-good-request-parameters.json @@ -0,0 +1,10 @@ +{ + "resourceType" : "Parameters", + "parameter" : [{ + "name" : "code", + "valueCode" : "code1" + },{ + "name" : "system", + "valueCanonical" : "http://hl7.org/fhir/test/CodeSystem/simple" + }] +} \ No newline at end of file diff --git a/tx/validation/cs-code-good-response-parameters.json b/tx/validation/cs-code-good-response-parameters.json new file mode 100644 index 00000000..6aad355a --- /dev/null +++ b/tx/validation/cs-code-good-response-parameters.json @@ -0,0 +1,23 @@ +{ + "resourceType" : "Parameters", + "parameter" : [{ + "name" : "code", + "valueCode" : "code1" + }, + { + "name" : "display", + "valueString" : "Display 1" + }, + { + "name" : "result", + "valueBoolean" : true + }, + { + "name" : "system", + "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple" + }, + { + "name" : "version", + "valueString" : "0.1.0" + }] +} \ No newline at end of file diff --git a/tx/validation/simple-code-bad-code-response-parameters.json b/tx/validation/simple-code-bad-code-response-parameters.json index d271cd57..b79929c5 100644 --- a/tx/validation/simple-code-bad-code-response-parameters.json +++ b/tx/validation/simple-code-bad-code-response-parameters.json @@ -10,20 +10,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simple$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["code"] }] } }, diff --git a/tx/validation/simple-code-bad-display-response-parameters.json b/tx/validation/simple-code-bad-display-response-parameters.json index 8190937b..2459a35f 100644 --- a/tx/validation/simple-code-bad-display-response-parameters.json +++ b/tx/validation/simple-code-bad-display-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["display"] + "location" : ["display"], + "expression" : ["$.display"] }] } }, diff --git a/tx/validation/simple-code-bad-display-ws-response-parameters.json b/tx/validation/simple-code-bad-display-ws-response-parameters.json index 5e489238..c4cd9885 100644 --- a/tx/validation/simple-code-bad-display-ws-response-parameters.json +++ b/tx/validation/simple-code-bad-display-ws-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1 (1.0)$" }, - "location" : ["display"] + "location" : ["display"], + "expression" : ["$.display"] }] } }, diff --git a/tx/validation/simple-code-bad-displayW-response-parameters.json b/tx/validation/simple-code-bad-displayW-response-parameters.json index 5a7cc3de..ce1dfc1c 100644 --- a/tx/validation/simple-code-bad-displayW-response-parameters.json +++ b/tx/validation/simple-code-bad-displayW-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "warning", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["display"] + "location" : ["display"], + "expression" : ["display"] }] } }, diff --git a/tx/validation/simple-code-bad-language-response-parameters.json b/tx/validation/simple-code-bad-language-response-parameters.json index 67ae8cbc..f637cd95 100644 --- a/tx/validation/simple-code-bad-language-response-parameters.json +++ b/tx/validation/simple-code-bad-language-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["display"] + "location" : ["display"], + "expression" : ["display"] }] } }, diff --git a/tx/validation/simple-code-bad-regex-response-parameters.json b/tx/validation/simple-code-bad-regex-response-parameters.json index 6af8bef0..b08cdcad 100644 --- a/tx/validation/simple-code-bad-regex-response-parameters.json +++ b/tx/validation/simple-code-bad-regex-response-parameters.json @@ -9,12 +9,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-filter-regex|5.0.0$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["code"] }] } }, diff --git a/tx/validation/simple-code-bad-system-response-parameters.json b/tx/validation/simple-code-bad-system-response-parameters.json index 6364b960..543588f3 100644 --- a/tx/validation/simple-code-bad-system-response-parameters.json +++ b/tx/validation/simple-code-bad-system-response-parameters.json @@ -9,20 +9,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simplex$" }, - "location" : ["system"] + "location" : ["system"], + "expression" : ["system"] }] } }, diff --git a/tx/validation/simple-code-bad-version1-response-parameters.json b/tx/validation/simple-code-bad-version1-response-parameters.json index c75884c1..4971a6e4 100644 --- a/tx/validation/simple-code-bad-version1-response-parameters.json +++ b/tx/validation/simple-code-bad-version1-response-parameters.json @@ -9,18 +9,30 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "$external:1:http://hl7.org/fhir/test/CodeSystem/simple|1.0.0$" }, - "location" : ["system"] + "location" : ["system"], + "expression" : ["$.system"] }, { "$optional$" : true, "severity" : "warning", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "vs-invalid" + }], "text" : "$external:2:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" } }] diff --git a/tx/validation/simple-code-implied-bad-code-response-parameters.json b/tx/validation/simple-code-implied-bad-code-response-parameters.json index 03e303d3..32d71ebc 100644 --- a/tx/validation/simple-code-implied-bad-code-response-parameters.json +++ b/tx/validation/simple-code-implied-bad-code-response-parameters.json @@ -9,21 +9,35 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["$.code"] }, { + "$optional-properties$" : ["expression" ], "$optional$" : true, "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simple$" }, - "location" : ["code"] + "location" : ["code"], + "expression" : ["$.code"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-code-response-parameters.json b/tx/validation/simple-codeableconcept-bad-code-response-parameters.json index 958e896b..294369a6 100644 --- a/tx/validation/simple-codeableconcept-bad-code-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-code-response-parameters.json @@ -17,24 +17,43 @@ "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "No valid coding was found for the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'" } }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simple$" }, - "location" : ["CodeableConcept.coding[0].code"] + "location" : ["CodeableConcept.coding[0].code"], + "expression" : ["CodeableConcept.coding[0].code"] }, { - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["CodeableConcept.coding[0].code"] + "location" : ["CodeableConcept.coding[0].code"], + "expression" : ["CodeableConcept.coding[0].code"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-display-response-parameters.json b/tx/validation/simple-codeableconcept-bad-display-response-parameters.json index 424f8aaa..ac88d7cd 100644 --- a/tx/validation/simple-codeableconcept-bad-display-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-display-response-parameters.json @@ -23,12 +23,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["CodeableConcept.coding[0].display"] + "location" : ["CodeableConcept.coding[0].display"], + "expression" : ["CodeableConcept.coding[0].display"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-displayW-response-parameters.json b/tx/validation/simple-codeableconcept-bad-displayW-response-parameters.json index 92686d04..6deee670 100644 --- a/tx/validation/simple-codeableconcept-bad-displayW-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-displayW-response-parameters.json @@ -23,12 +23,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "warning", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["CodeableConcept.coding[0].display"] + "location" : ["CodeableConcept.coding[0].display"], + "expression" : ["CodeableConcept.coding[0].display"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-language-response-parameters.json b/tx/validation/simple-codeableconcept-bad-language-response-parameters.json index a6a565c9..d183a51b 100644 --- a/tx/validation/simple-codeableconcept-bad-language-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-language-response-parameters.json @@ -23,12 +23,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["CodeableConcept.coding[0].display"] + "location" : ["CodeableConcept.coding[0].display"], + "expression" : ["CodeableConcept.coding[0].display"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-system-response-parameters.json b/tx/validation/simple-codeableconcept-bad-system-response-parameters.json index 40982133..458010b1 100644 --- a/tx/validation/simple-codeableconcept-bad-system-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-system-response-parameters.json @@ -17,24 +17,43 @@ "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "No valid coding was found for the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'" } }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simplex$" }, - "location" : ["CodeableConcept.coding[0].system"] - }, + "location" : ["CodeableConcept.coding[0].system"], + "expression" : ["CodeableConcept.coding[0].system"] + }, { - "severity" : "warning", + "$optional-properties$" : ["expression" ], + "severity" : "information", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "this-code-not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/CodeSystem/simplex#code1$" }, - "location" : ["CodeableConcept.coding[0].code"] + "location" : ["CodeableConcept.coding[0].code"], + "expression" : ["CodeableConcept.coding[0].code"] }] } }, diff --git a/tx/validation/simple-codeableconcept-bad-version1-response-parameters.json b/tx/validation/simple-codeableconcept-bad-version1-response-parameters.json index a2bc37b3..ee562584 100644 --- a/tx/validation/simple-codeableconcept-bad-version1-response-parameters.json +++ b/tx/validation/simple-codeableconcept-bad-version1-response-parameters.json @@ -15,21 +15,35 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "$external:1:http://hl7.org/fhir/test/CodeSystem/simple|1.0.0$" }, - "location" : ["CodeableConcept.coding[0].system"] + "location" : ["CodeableConcept.coding[0].system"], + "expression" : ["CodeableConcept.coding[0].system"] }, { + "$optional-properties$" : ["expression" ], "$optional$" : true, "severity" : "warning", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "vs-invalid" + }], "text" : "$external:2:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["CodeableConcept"] + "location" : ["CodeableConcept"], + "expression" : ["CodeableConcept"] }] } }, diff --git a/tx/validation/simple-coding-bad-code-response-parameters.json b/tx/validation/simple-coding-bad-code-response-parameters.json index 85cd567e..13605f44 100644 --- a/tx/validation/simple-coding-bad-code-response-parameters.json +++ b/tx/validation/simple-coding-bad-code-response-parameters.json @@ -9,20 +9,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "$external:1:http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0$" }, - "location" : ["Coding.code"] + "location" : ["Coding.code"], + "expression" : ["Coding.code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-code" + }], "text" : "$external:2:http://hl7.org/fhir/test/CodeSystem/simple$" }, - "location" : ["Coding.code"] + "location" : ["Coding.code"], + "expression" : ["Coding.code"] }] } }, diff --git a/tx/validation/simple-coding-bad-display-response-parameters.json b/tx/validation/simple-coding-bad-display-response-parameters.json index a6860cb7..8341f366 100644 --- a/tx/validation/simple-coding-bad-display-response-parameters.json +++ b/tx/validation/simple-coding-bad-display-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-displayW-response-parameters.json b/tx/validation/simple-coding-bad-displayW-response-parameters.json index 43c4e03b..bbb00944 100644 --- a/tx/validation/simple-coding-bad-displayW-response-parameters.json +++ b/tx/validation/simple-coding-bad-displayW-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "warning", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Display 1X$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-language-header-response-parameters.json b/tx/validation/simple-coding-bad-language-header-response-parameters.json index a4fd3658..5a76a928 100644 --- a/tx/validation/simple-coding-bad-language-header-response-parameters.json +++ b/tx/validation/simple-coding-bad-language-header-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-language-response-parameters.json b/tx/validation/simple-coding-bad-language-response-parameters.json index 4001fac3..c688e7eb 100644 --- a/tx/validation/simple-coding-bad-language-response-parameters.json +++ b/tx/validation/simple-coding-bad-language-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-language-vs-response-parameters.json b/tx/validation/simple-coding-bad-language-vs-response-parameters.json index a4fd3658..5a76a928 100644 --- a/tx/validation/simple-coding-bad-language-vs-response-parameters.json +++ b/tx/validation/simple-coding-bad-language-vs-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-language-vslang-response-parameters.json b/tx/validation/simple-coding-bad-language-vslang-response-parameters.json index a4fd3658..5a76a928 100644 --- a/tx/validation/simple-coding-bad-language-vslang-response-parameters.json +++ b/tx/validation/simple-coding-bad-language-vslang-response-parameters.json @@ -13,12 +13,19 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "invalid-display" + }], "text" : "$external:1:Anzeige 1$" }, - "location" : ["Coding.display"] + "location" : ["Coding.display"], + "expression" : ["Coding.display"] }] } }, diff --git a/tx/validation/simple-coding-bad-system-response-parameters.json b/tx/validation/simple-coding-bad-system-response-parameters.json index dfefafdc..680cabd4 100644 --- a/tx/validation/simple-coding-bad-system-response-parameters.json +++ b/tx/validation/simple-coding-bad-system-response-parameters.json @@ -9,20 +9,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "code-invalid", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-in-vs" + }], "text" : "The provided code 'http://hl7.org/fhir/test/CodeSystem/simplex#code1' was not found in the value set 'http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0'" }, - "location" : ["Coding.code"] + "location" : ["Coding.code"], + "expression" : ["Coding.code"] }, { + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "The code system http://hl7.org/fhir/test/CodeSystem/simplex could not be found" }, - "location" : ["Coding.system"] + "location" : ["Coding.system"], + "expression" : ["Coding.system"] }] } }, diff --git a/tx/validation/simple-coding-bad-version1-response-parameters.json b/tx/validation/simple-coding-bad-version1-response-parameters.json index aa8d2b3e..12dd0403 100644 --- a/tx/validation/simple-coding-bad-version1-response-parameters.json +++ b/tx/validation/simple-coding-bad-version1-response-parameters.json @@ -9,21 +9,34 @@ "resource" : { "resourceType" : "OperationOutcome", "issue" : [{ + "$optional-properties$" : ["expression" ], "severity" : "error", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "not-found" + }], "text" : "$external:1:http://hl7.org/fhir/test/CodeSystem/simple$" }, - "location" : ["Coding.system"] + "location" : ["Coding.system"], + "expression" : ["Coding.system"] }, { - "$optional$" : true, + "$optional-properties$" : ["expression" ], "severity" : "warning", "code" : "not-found", "details" : { + "$optional-properties$" : ["coding" ], + "coding" : [{ + "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", + "code" : "vs-invalid" + }], "text" : "Unable to check whether the code is in the value set http://hl7.org/fhir/test/ValueSet/simple-all|5.0.0" }, - "location" : ["Coding"] + "location" : ["Coding"], + "expression" : ["Coding"] }] } }, diff --git a/validator/manifest.json b/validator/manifest.json index 38a4acb9..062bb6e0 100644 --- a/validator/manifest.json +++ b/validator/manifest.json @@ -38885,6 +38885,52 @@ ] } }, + { + "name": "obs-temp-code2", + "file": "obs-temp-code2.json", + "version": "4.0", + "java": { + "outcome": { + "resourceType": "OperationOutcome", + "issue": [ + { + "severity": "information", + "code": "informational", + "details": { + "text": "Validate Observation against the Body temperature profile (http://hl7.org/fhir/StructureDefinition/bodytemp) which is required by the FHIR specification because the LOINC code 8310-5 was found" + }, + "diagnostics": "[1,2]", + "expression": [ + "Observation" + ] + }, + { + "severity": "warning", + "code": "code-invalid", + "details": { + "text": "The provided code 'http://snomed.info/sct#276885007' was not found in the value set 'http://hl7.org/fhir/ValueSet/observation-vitalsignresult|4.0.1'" + }, + "diagnostics": "[21,4]", + "expression": [ + "Observation.code" + ] + } + ] + } + }, + "firely-sdk-current": { + "errorCount": 1, + "warningCount": 0, + "output": [ + "[ERROR] Unable to resolve reference to profile 'https://fhir.cambio.se/StructureDefinition/ObservationBodyTemperaturePrehospital/v1' (at Observation)" + ] + }, + "firely-sdk-wip": { + "errorCount": 0, + "warningCount": 0, + "output": [] + } + }, { "name": "zzz", "file": "zzz.json", diff --git a/validator/obs-temp-code2.json b/validator/obs-temp-code2.json new file mode 100644 index 00000000..e3e07a38 --- /dev/null +++ b/validator/obs-temp-code2.json @@ -0,0 +1,41 @@ +{ + "resourceType": "Observation", + "id": "obs-temp-code2", + "status": "final", + "category": [ + { + "coding": [ + { + "system": "http://terminology.hl7.org/CodeSystem/observation-category", + "code": "vital-signs" + } + ] + } + ], + "code": { + "coding": [ + { + "system": "http://loinc.org", + "code": "8310-5" + }, + { + "system": "http://snomed.info/sct", + "code": "276885007x" + } + ] + }, + "subject": { + "identifier": { + "use": "official", + "value": "19930514-2383", + "system": "urn:oid:1.2.752.129.2.1.3.1" + } + }, + "effectiveDateTime": "2020-06-30T09:50:55.300Z", + "valueQuantity": { + "value": 36.0, + "unit": "Cel", + "system": "http://unitsofmeasure.org", + "code": "Cel" + } +} \ No newline at end of file