diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a9c2a62..6ac2a94c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# 1.1.2 +# 1.1.4 + +* Adjust v5.0.1 validator message filters for v5.0.1 based on validator version v1.0.79. + +# 1.1.3 * ID-45/95: execution scripts and updated validator version by @karlnaden in https://github.com/inferno-framework/us-core-test-kit/pull/287 diff --git a/Gemfile.lock b/Gemfile.lock index a8b7ff13..619aacc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - us_core_test_kit (1.1.3) - inferno_core (~> 1.3, >= 1.3.1) + us_core_test_kit (1.1.4) + inferno_core (~> 1.4, >= 1.4.0) smart_app_launch_test_kit (~> 1.0, >= 1.0.2) tls_test_kit (~> 1.0, >= 1.0.2) @@ -38,7 +38,7 @@ GEM reline (>= 0.6.0) coderay (1.1.3) concurrent-ruby (1.3.4) - connection_pool (3.0.2) + connection_pool (2.5.5) crack (1.0.1) bigdecimal rexml @@ -155,7 +155,7 @@ GEM mutex_m i18n (1.14.8) concurrent-ruby (~> 1.0) - inferno_core (1.3.1) + inferno_core (1.4.0) activesupport (~> 7.2.3.1) base62-rb (= 0.3.1) blueprinter (= 0.25.2) @@ -176,15 +176,15 @@ GEM kramdown (~> 2.5.2) kramdown-parser-gfm (~> 1.1.0) mutex_m (~> 0.3.0) - oj (= 3.11.0) + oj (~> 3.17, >= 3.17.3) pastel (~> 0.8.0) pry pry-byebug - puma (~> 5.6.7) + puma (~> 8.0, >= 8.0.2) rake (~> 13.0) roo (~> 2.10.1) sequel (~> 5.42.0) - sidekiq (~> 7.2.4) + sidekiq (~> 7.3.10) sqlite3 (~> 1.4) thor (~> 1.4) tty-markdown (~> 0.7.1) @@ -248,7 +248,10 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0, >= 2.0.4) version_gem (~> 1.1, >= 1.1.9) - oj (3.11.0) + oj (3.17.3) + bigdecimal (>= 3.0) + ostruct (>= 0.2) + ostruct (0.6.3) pastel (0.8.0) tty-color (~> 0.5) pp (0.6.3) @@ -266,7 +269,7 @@ GEM date stringio public_suffix (7.0.5) - puma (5.6.9) + puma (8.0.2) nio4r (~> 2.0) racc (1.8.1) rack (2.2.23) @@ -314,11 +317,12 @@ GEM rubyzip (>= 1.2.2, < 4.0) websocket (~> 1.0) sequel (5.42.0) - sidekiq (7.2.4) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.19.0) + sidekiq (7.3.10) + base64 + connection_pool (>= 2.3.0, < 3) + logger + rack (>= 2.2.4, < 3.3) + redis-client (>= 0.23.0, < 1) smart_app_launch_test_kit (1.0.2) inferno_core (~> 1.2, >= 1.2.2) json-jwt (~> 1.15.3) @@ -401,7 +405,7 @@ CHECKSUMS byebug (13.0.0) sha256=d2263efe751941ca520fa29744b71972d39cbc41839496706f5d9b22e92ae05d coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b concurrent-ruby (1.3.4) sha256=d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32 - connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a + connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f database_cleaner (1.99.0) sha256=4854c518ed36fae7ea8961993ff3cfe7c0a0434c4762ab2f0026075adbd2d1b2 @@ -448,7 +452,7 @@ CHECKSUMS http-cookie (1.1.6) sha256=ba4b82be64de61dc281243dac70e3c382c45142f20268ed9276a3670c93feaa9 httpclient (2.9.0) sha256=4b645958e494b2f86c2f8a2f304c959baa273a310e77a2931ddb986d83e498c8 i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5 - inferno_core (1.3.1) sha256=32243f07d228965d22d661f0fbb0353a5aae6e13c663c51655e4f7d3cdad4260 + inferno_core (1.4.0) sha256=3e82f3e9a689102b72acc8c63c99e7ec28a63d6b6414a62634922f5ec4384c38 io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3 json-jwt (1.15.3.1) sha256=92b27378212b6aa72aba93a537eabd7f7ac7ad38e12b638863cd7727e0dcb08f @@ -476,7 +480,8 @@ CHECKSUMS nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976 nokogiri (1.19.3-x86_64-linux-musl) sha256=248c906d2166eca5efb56d52fdee5f9a1f51d69a72e2b64fdac647b4ce39ea3f oauth2 (2.0.20) sha256=790c6316346da12f9dcaf27a67530f802950af05d35c3874918da84f2deae674 - oj (3.11.0) sha256=470d6ac425efd19c526ecea1cabb0219dd8bbcbdeeec57bd45a803b5e082ab5b + oj (3.17.3) sha256=ebe3967b0bb7ac4f206561d0d9ac8875b9973f778600d7b61b5c355662a707ed + ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912 pastel (0.8.0) sha256=481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75 pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6 prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 @@ -485,7 +490,7 @@ CHECKSUMS pry-byebug (3.12.0) sha256=594e094ae8a8390a7ad4c7b36ae36e13304ed02664c67417d108dc5f7213d1b7 psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974 public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623 - puma (5.6.9) sha256=20701b2451080ec8d6d78d2e4b5a2913e6d0b865a51d704a4d60db8fd39a4228 + puma (8.0.2) sha256=c8ed871dfbbe66448ea9ffd46692342d9804d4071522b52b5331b7b6e7b686fb racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f rack (2.2.23) sha256=a8fe9d7e07064770b8ec123663fded8a59ef7e2b6db5cda7173d45a5718ab69c rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463 @@ -507,7 +512,7 @@ CHECKSUMS securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1 selenium-webdriver (4.41.0) sha256=cdc1173cd55cf186022cea83156cc2d0bec06d337e039b02ad25d94e41bedd22 sequel (5.42.0) sha256=d7309e3f792372ffad1d06a7ff826bdefa86623a055bc2f57b344eca5c77848b - sidekiq (7.2.4) sha256=810e02f486ce5e102dbe6b71a19b4bf839791e11b74942ec38f5e1a6d44a0778 + sidekiq (7.3.10) sha256=781eb4f65ef36042534ad73d72f211283afb7fee82eec786ada4ed1972ef8e3c smart_app_launch_test_kit (1.0.2) sha256=c2f9a8d387e848a5048a037cdfb822d9e16544cdb5d4551a95c0e1d536f6f721 snaky_hash (2.0.4) sha256=2b12758c57defa6796341a1620f84b1a23737421d8d7e2575d0550b53cc4fece sqlite3 (1.7.3-aarch64-linux) sha256=0ccb8c001cd2617f4801a2c816142d3c9bc299e3f3e0f49e03812f3610b0891c @@ -528,7 +533,7 @@ CHECKSUMS tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a unicode_utils (1.4.0) sha256=b922d0cf2313b6b7136ada6645ce7154ffc86418ca07d53b058efe9eb72f2a40 - us_core_test_kit (1.1.3) + us_core_test_kit (1.1.4) version_gem (1.1.9) sha256=0c1a0962ae543c84a00889bb018d9f14d8f8af6029d26b295d98774e3d2eb9a4 webmock (3.26.2) sha256=774556f2ea6371846cca68c01769b2eac0d134492d21f6d0ab5dd643965a4c90 websocket (1.2.11) sha256=b7e7a74e2410b5e85c25858b26b3322f29161e300935f70a0e0d3c35e0462737 diff --git a/docker-compose.background.yml b/docker-compose.background.yml index 3a167a62..3da7660a 100644 --- a/docker-compose.background.yml +++ b/docker-compose.background.yml @@ -1,7 +1,7 @@ version: '3' services: hl7_validator_service: - image: infernocommunity/inferno-resource-validator:1.0.78 + image: infernocommunity/inferno-resource-validator:1.0.79 environment: # Defines how long validator sessions last if unused, in minutes: # Negative values mean sessions never expire, 0 means sessions immediately expire diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_311.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_311.yaml index 0aa70f30..adb442c3 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_311.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_311.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 2 US Core FHIR API - state_description: Finished Group 2 US Core FHIR API diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_400.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_400.yaml index c28c8fad..307f3b25 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_400.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_400.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 2 US Core FHIR API - state_description: Finished Group 2 US Core FHIR API diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_501.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_501.yaml index 3c34ae9a..0cdb7a31 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_501.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_501.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 2 US Core FHIR API - state_description: Finished Group 2 US Core FHIR API diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_610.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_610.yaml index c5bace39..613af3f3 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_610.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_610.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 2 US Core FHIR API - state_description: Finished Group 2 US Core FHIR API diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_700.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_700.yaml index 50c77cd7..4ffb7980 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_700.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_700.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 4 US Core FHIR API - state_description: Finished Group 4 US Core FHIR API diff --git a/execution_scripts/reference_server/fhir_api_only/us_core_server_800.yaml b/execution_scripts/reference_server/fhir_api_only/us_core_server_800.yaml index 5cd8bd4e..7e1a0995 100644 --- a/execution_scripts/reference_server/fhir_api_only/us_core_server_800.yaml +++ b/execution_scripts/reference_server/fhir_api_only/us_core_server_800.yaml @@ -27,7 +27,7 @@ steps: inputs: smart_auth_info: access_token: SAMPLE_TOKEN - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 4 US Core FHIR API - state_description: Finished Group 4 US Core FHIR API diff --git a/execution_scripts/reference_server/us_core_server_610_smart_2_with_commands.yaml b/execution_scripts/reference_server/us_core_server_610_smart_2_with_commands.yaml index 66bb279f..fc0fccd0 100644 --- a/execution_scripts/reference_server/us_core_server_610_smart_2_with_commands.yaml +++ b/execution_scripts/reference_server/us_core_server_610_smart_2_with_commands.yaml @@ -60,7 +60,7 @@ steps: last_completed: 1.4 start_run: runnable: 2 - timeout: 1200 # API tests are very long-running + timeout: 1800 # API tests are very long-running action_description: Run Group 2 US Core FHIR API - state_description: Finished Group 2 US Core FHIR API diff --git a/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb b/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb index 72d63163..43dab03f 100644 --- a/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb +++ b/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb @@ -82,7 +82,15 @@ class USCoreTestSuite < Inferno::TestSuite %r{A definition for CodeSystem 'http://ihe.net/fhir/ValueSet/IHE.FormatCode.codesystem' could not be found, so the code cannot be validated} # only logged the first DocumentReference validation ].freeze - VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze + VERSION_SPECIFIC_MESSAGE_FILTERS = [ + %r{A definition for CodeSystem 'http://terminology\.hl7\.org/CodeSystem/v3-AdministrativeGender' version '2021-12-01' could not be found, so the code cannot be validated}, + %r{A definition for CodeSystem 'http://terminology\.hl7\.org/CodeSystem/v3-NullFlavor' version '2021-12-01' could not be found, so the code cannot be validated}, + %r{The value provided \('M'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('F'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('ASKU'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('OTH'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('UNK'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)} + ].freeze VALIDATION_MESSAGE_FILTERS = GENERAL_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS diff --git a/lib/us_core_test_kit/generator/suite_generator.rb b/lib/us_core_test_kit/generator/suite_generator.rb index b8a874da..326fc973 100644 --- a/lib/us_core_test_kit/generator/suite_generator.rb +++ b/lib/us_core_test_kit/generator/suite_generator.rb @@ -25,6 +25,16 @@ def version_specific_message_filters %r{Observation: Slice 'Observation\.effective\[x\]:effectiveDateTime':.*http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|6.1.0}, %r{Observation\.effective\.ofType\(Period\)\.(start|end): This element is not allowed by the profile http://hl7.org/fhir/StructureDefinition/dateTime} ] + when 'v501' + [ + %r{A definition for CodeSystem 'http://terminology\.hl7\.org/CodeSystem/v3-AdministrativeGender' version '2021-12-01' could not be found, so the code cannot be validated}, + %r{A definition for CodeSystem 'http://terminology\.hl7\.org/CodeSystem/v3-NullFlavor' version '2021-12-01' could not be found, so the code cannot be validated}, + %r{The value provided \('M'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('F'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('ASKU'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('OTH'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)}, + %r{The value provided \('UNK'\) was not found in the value set 'Birth Sex' (http://hl7\.org/fhir/us/core/ValueSet/birthsex\|5.0.1)} + ] else [] end diff --git a/lib/us_core_test_kit/version.rb b/lib/us_core_test_kit/version.rb index 7a88e0c3..24151700 100644 --- a/lib/us_core_test_kit/version.rb +++ b/lib/us_core_test_kit/version.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true module USCoreTestKit - VERSION = '1.1.3' - LAST_UPDATED = '2026-05-26' + VERSION = '1.1.4' + LAST_UPDATED = '2026-07-09' end diff --git a/us_core_test_kit.gemspec b/us_core_test_kit.gemspec index 7905842a..2ff3ca86 100644 --- a/us_core_test_kit.gemspec +++ b/us_core_test_kit.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |spec| spec.description = 'US Core Inferno tests' spec.homepage = 'https://github.com/inferno-framework/us-core-test-kit' spec.license = 'Apache-2.0' - spec.add_runtime_dependency 'inferno_core', '~> 1.3', '>= 1.3.1' + spec.add_runtime_dependency 'inferno_core', '~> 1.4', '>= 1.4.0' spec.add_runtime_dependency 'smart_app_launch_test_kit', '~> 1.0', '>= 1.0.2' spec.add_runtime_dependency 'tls_test_kit', '~> 1.0', '>= 1.0.2' spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8'