onc_certification_g10_test_kit 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ec685fbb0844163dcd6dc51e13e6d9e0fc479314e5bbe42d63a2ac532fc8d5
-  data.tar.gz: c05c24e084ee322c5c0cd3b7027850392176d3c3aa660a8ed197e51f82c37ee5
+  metadata.gz: 9d020577f35711d3fd77f83f65687e592325aece0cf714a2cc16e199b233c417
+  data.tar.gz: 873a37519d331ef62b7ac1d9720b1b77f5538a3beb2c9be548ea1cd4cf6ecfdb
 SHA512:
-  metadata.gz: 9c66f39b856ec474a72841e0671d28f7648ce08bfffd79cf20dd3b7ad5c6b4f175395443a9f855b3c1eef78c12d9fd060c7fbe5b9be5c65b93c4a1c54c9355e7
-  data.tar.gz: b8835d04b51e3e93bf405261dda80aea3cda0dce67f681bdf539019be6a713bacb6382b6dfbc15dc5ba647ba469a2677bd3acaf09928a35ad33f9a956ccaeef9
+  metadata.gz: e766fbe14972448a02ef08c3e8a6eeae64f0b7a8812e5b5372f62642e49a1990c48fbbf28ef73e049ec5ed151df3c3128e9a6334c406859b5bfbf31ddcb1d2d5
+  data.tar.gz: 1703bdbab3f6c90cf4947076710eefa3510aa2a9f9d70953e9fd7cd85ca9c8e4a423cd2b961ea52d22eca993a00bbc23af5a392c081e1a245d154ead2e00f80b

data/lib/onc_certification_g10_test_kit/bulk_data_authorization.rb

@@ -205,8 +205,6 @@ module ONCCertificationG10TestKit
       output :bearer_token
 
       run do
-        skip_if authentication_response.blank?, 'No authentication response received.'
-
         assert_valid_json(authentication_response)
         response_body = JSON.parse(authentication_response)
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_cancel_stu1.rb

@@ -10,7 +10,8 @@ module ONCCertificationG10TestKit
       correct behavior.
     )
 
-    input :bearer_token
+    input :bearer_token,
+          optional: true
     input :bulk_server_url,
           title: 'Bulk Data FHIR URL',
           description: 'The URL of the Bulk FHIR server.'

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -137,8 +137,6 @@ module ONCCertificationG10TestKit
       include ExportKickOffPerformer
 
       run do
-        skip_if bearer_token.blank?, 'Could not verify this functionality when bearer token is not set'
-
         perform_export_kick_off_request(use_token: false)
         assert_response_status([400, 401])
       end
@@ -188,8 +186,6 @@ module ONCCertificationG10TestKit
       output :status_response, :requires_access_token
 
       run do
-        skip 'Server response did not have Content-Location in header' unless polling_url.present?
-
         timeout = bulk_timeout.to_i
 
         if !timeout.positive?
@@ -262,8 +258,6 @@ module ONCCertificationG10TestKit
       output :status_output, :bulk_download_url
 
       run do
-        assert status_response.present?, 'Bulk Data Server status response not found'
-
         assert_valid_json(status_response)
         status_output = JSON.parse(status_response)['output']
         assert status_output, 'Bulk Data Server status response does not contain output'

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_validation.rb

@@ -62,15 +62,11 @@ module ONCCertificationG10TestKit
       DESCRIPTION
       # link 'http://hl7.org/fhir/uv/bulkdata/STU1.0.1/export/index.html#file-request'
 
-      input :bulk_download_url
+      input :bulk_download_url, :requires_access_token, :requires_access_token, :bearer_token
 
       run do
-        skip_if bulk_download_url.blank?, 'Could not verify this functionality when no download link was provided'
-        skip_if requires_access_token.blank?,
-                'Could not verify this functionality when requiresAccessToken is not provided'
         omit_if requires_access_token == 'false',
                 'Could not verify this functionality when requiresAccessToken is false'
-        skip_if bearer_token.blank?, 'Could not verify this functionality when Bearer Token is not provided'
 
         get(bulk_download_url, headers: { accept: 'application/fhir+ndjson' })
         assert_response_status([400, 401])
@@ -207,7 +203,7 @@ module ONCCertificationG10TestKit
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition
 
 
-        For US Core v5.0.1, evidence of support for the following two profiles must be demonstrated:
+        For US Core v6.1.0, evidence of support for the following two profiles must be demonstrated:
 
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns
@@ -392,28 +388,6 @@ module ONCCertificationG10TestKit
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
 
-        For US Core v5.0.1, this test expects evidence of the following US Core profiles
-
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-clinical-test
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-imaging
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sexual-orientation
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-social-history
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-sdoh-assessment
-        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age
-        * http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus
-        * http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-blood-pressure
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-bmi
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-head-circumference
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-height
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-weight
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-body-temperature
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-heart-rate
-        * http://hl7.org/fhir/us/core/StructureDefinition/us-core-respiratory-rate
-
         For US Core v6.1.0, this test expects evidence of the following US Core profiles
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab
         * http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-occupation

data/lib/onc_certification_g10_test_kit/configuration_checker.rb

@@ -3,6 +3,7 @@ require_relative '../inferno/terminology/tasks/check_built_terminology'
 module ONCCertificationG10TestKit
   class ConfigurationChecker
     EXPECTED_VALIDATOR_VERSION = '2.3.2'.freeze
+    EXPECTED_HL7_VALIDATOR_VERSION = '"6.3.0"'.freeze
 
     def configuration_messages
       validator_version_message + terminology_messages + version_message
@@ -21,8 +22,15 @@ module ONCCertificationG10TestKit
     end
 
     def validator_version_message
-      response = Faraday.get "#{validator_url}/version"
+      if Feature.use_hl7_resource_validator?
+        expected_validator_version = EXPECTED_HL7_VALIDATOR_VERSION
+        validator_version_url = "#{validator_url}/validator/version"
+      else
+        expected_validator_version = EXPECTED_VALIDATOR_VERSION
+        validator_version_url = "#{validator_url}/version"
+      end
 
+      response = Faraday.get validator_version_url
       if response.body.starts_with? '{'
         version_json = JSON.parse(response.body)
         version = version_json['inferno-framework/fhir-validator-wrapper']
@@ -30,15 +38,15 @@ module ONCCertificationG10TestKit
         version = response.body
       end
 
-      if version == EXPECTED_VALIDATOR_VERSION
+      if version == expected_validator_version
         [{
           type: 'info',
-          message: "FHIR validator is the expected version `#{EXPECTED_VALIDATOR_VERSION}`"
+          message: "FHIR validator is the expected version `#{expected_validator_version}`"
         }]
       else
         [{
           type: 'error',
-          message: "Expected FHIR validator version `#{EXPECTED_VALIDATOR_VERSION}`, but found `#{version}`"
+          message: "Expected FHIR validator version `#{expected_validator_version}`, but found `#{version}`"
         }]
       end
     rescue JSON::ParserError => e

data/lib/onc_certification_g10_test_kit/feature.rb

@@ -1,10 +1,9 @@
 module ONCCertificationG10TestKit
   module Feature
-    class << self # rubocop:disable Lint/EmptyClass
-      # This is how you can define feature flags to be used in the g10 test kit
-      # def us_core_v4?
-      #   ENV.fetch('US_CORE_4_ENABLED', 'false')&.casecmp?('true')
-      # end
+    class << self
+      def use_hl7_resource_validator?
+        ENV.fetch('USE_HL7_RESOURCE_VALIDATOR', 'false')&.casecmp?('true')
+      end
     end
   end
 end

data/lib/onc_certification_g10_test_kit/g10_options.rb

@@ -5,6 +5,13 @@ module ONCCertificationG10TestKit
     US_CORE_5 = 'us_core_5'.freeze
     US_CORE_6 = 'us_core_6'.freeze
 
+    US_CORE_VERSION_NUMBERS = {
+      US_CORE_3 => '3.1.1',
+      US_CORE_4 => '4.0.0',
+      US_CORE_5 => '5.0.1',
+      US_CORE_6 => '6.1.0'
+    }.freeze
+
     BULK_DATA_1 = 'multi_patient_api_stu1'.freeze
     BULK_DATA_2 = 'multi_patient_api_stu2'.freeze
 

data/lib/onc_certification_g10_test_kit/onc_program_procedure.yml

@@ -259,7 +259,7 @@ procedure:
             not include support for “plain”
 
           Additionally, the following “capabilities” must be supported if using
-          US Core 5.0.1 or 6.1.0:
+          US Core 6.1.0:
           * "context-ehr-encounter"
         TLV: |
           [Both] The tester verifies the ability of the
@@ -282,7 +282,7 @@ procedure:
             not include support for “plain”
 
           Additionally, the following “capabilities” must be supported if using
-          US Core 5.0.1 or 6.1.0:
+          US Core 6.1.0:
           * "context-ehr-encounter"
         inferno_supported: 'yes'
         inferno_tests:
@@ -515,7 +515,7 @@ procedure:
           adopted in § 170.213 and implementation specification adopted in
           § 170.215(a)(2).
 
-          If using US Core 3.1.1, 4.0.0, 5.0.1, or 6.1.0 these resources include:
+          If using US Core 3.1.1, 4.0.0, or 6.1.0 these resources include:
 
           * “AllergyIntolerance”;
           * “CarePlan”;
@@ -533,11 +533,6 @@ procedure:
           * “Procedure”; and
           * “Provenance”.
 
-          The following resources must also be supported if using US Core 5.0.1:
-          * “Encounter”;
-          * “RelatedPerson”; and
-          * “ServiceRequest”
-
           The following resources must also be supported if using US Core 6.1.0:
           * "Encounter"
           * "Coverage"
@@ -554,7 +549,7 @@ procedure:
           associated with the profiles specified in the standard adopted in
           § 170.213 and implementation specification adopted in § 170.215(a)(2).
 
-          If using US Core 3.1.1, 4.0.0, 5.0.1, or 6.1.0 these resources include:
+          If using US Core 3.1.1, 4.0.0, or 6.1.0 these resources include:
 
           * “AllergyIntolerance”;
           * “CarePlan”;
@@ -572,11 +567,6 @@ procedure:
           * “Procedure”; and
           * “Provenance”.
 
-          The following resources must also be supported if using US Core 5.0.1:
-          * “Encounter”;
-          * “RelatedPerson”; and
-          * “ServiceRequest”
-
           The following resources must also be supported if using US Core 6.1.0:
           * "Encounter"
           * "Coverage"
@@ -815,8 +805,7 @@ procedure:
           * “smart_style_url” (to support “context-style” “SMART on FHIR® Core
             Capability” for EHR-Launch mode only).
 
-          Additionally, the following must be supported if using US Core 5.0.1
-          or 6.1.0:
+          Additionally, the following must be supported if using US Core 6.1.0:
           * “encounter” (to support "context-ehr-encounter" “SMART on FHIR®
             Capability”)
         TLV: |
@@ -841,8 +830,7 @@ procedure:
           * “smart_style_url” (to support “context-style” “SMART on FHIR® Core
             Capability” for EHR-Launch mode only).
 
-          Additionally, the following must be supported if using US Core 5.0.1
-          or 6.1.0:
+          Additionally, the following must be supported if using US Core 6.1.0:
           * “encounter” (to support"context-ehr-encounter" “SMART on FHIR®
             Capability”)
         inferno_supported: 'yes'
@@ -924,14 +912,14 @@ procedure:
           - 9.9.10
       - id: AUT-PAT-32
         SUT: |
-          [EHR-Launch] The following must be supported if using US Core 5.0.1 or
-          6.1.0: The health IT developer demonstrates the ability of the Health
+          [EHR-Launch] The following must be supported if using US Core 6.1.0:
+          The health IT developer demonstrates the ability of the Health
           IT Module to return an “Encounter” FHIR® resource that matches the
           encounter context provided in step AUT-PAT-9 of this section according
           to the implementation specification adopted in § 170.215(a)(2).
         TLV: |
-          [EHR-Launch] The following must be supported if using US Core 5.0.1 or
-          6.1.0: The tester verifies the ability of the Health IT Module to
+          [EHR-Launch] The following must be supported if using US Core 6.1.0:
+          The tester verifies the ability of the Health IT Module to
           return an “Encounter” FHIR® resource that matches the encounter
           context provided in step AUT-PAT-9 of this section according to the
           implementation specification adopted in § 170.215(a)(2).
@@ -1931,7 +1919,7 @@ procedure:
           * For coded data elements, including support for the
             “DataAbsentReason” Code System.
         inferno_supported: 'yes'
-        inferno_tests: 
+        inferno_tests:
           - 4.32.01 - 4.32.02
           - 5.34.01 - 5.34.02
           - 10.46.01 - 10.46.02

data/lib/onc_certification_g10_test_kit/smart_invalid_token_refresh_test.rb

@@ -12,8 +12,6 @@ module ONCCertificationG10TestKit
     input :client_secret, optional: true
 
     run do
-      skip_if refresh_token.blank?, 'No refresh token was received'
-
       oauth2_params = {
         'grant_type' => 'refresh_token',
         'refresh_token' => SecureRandom.uuid

data/lib/onc_certification_g10_test_kit/version.rb

@@ -1,3 +1,3 @@
 module ONCCertificationG10TestKit
-  VERSION = '5.2.0'.freeze
+  VERSION = '5.3.0'.freeze
 end

data/lib/onc_certification_g10_test_kit.rb

@@ -63,23 +63,39 @@ module ONCCertificationG10TestKit
     ].freeze
 
     ERROR_FILTERS = [
-      /\A\S+: \S+: Unknown Code/,
+      /\A\S+: \S+: Unknown [Cc]ode/,
       /\A\S+: \S+: None of the codings provided are in the value set/,
       /\A\S+: \S+: The code provided \(\S*\) is not in the value set/,
       /\A\S+: \S+: The Coding provided \(\S*\) is not in the value set/,
       /\A\S+: \S+: The Coding provided \(\S*\) was not found in the value set/,
-      /\A\S+: \S+: A definition for CodeSystem '.*' could not be found, so the code cannot be validated/
+      /\A\S+: \S+: A definition for CodeSystem '.*' could not be found, so the code cannot be validated/,
+      /\A\S+: \S+: URL value '.*' does not resolve/,
+      /\A\S+: \S+: .*\[No server available\]/  # Catch-all for certain errors when TX server is disabled
     ].freeze
 
-    [
-      G10Options::US_CORE_3_REQUIREMENT,
-      G10Options::US_CORE_4_REQUIREMENT,
-      G10Options::US_CORE_5_REQUIREMENT,
-      G10Options::US_CORE_6_REQUIREMENT
+    def self.setup_validator(us_core_version_requirement) # rubocop:disable Metrics/CyclomaticComplexity
+      validator_method = if Feature.use_hl7_resource_validator?
+                           method(:fhir_resource_validator)
+                         else
+                           method(:validator)
+                         end
+
+      validator_method.call :default, required_suite_options: us_core_version_requirement do
+        if Feature.use_hl7_resource_validator?
+          url ENV.fetch('G10_FHIR_RESOURCE_VALIDATOR_URL', 'http://hl7_validator_service:3500')
+
+          cli_context do
+            txServer nil
+            displayWarnings true
+            disableDefaultResourceFetcher true
+          end
 
-    ].each do |us_core_version_requirement|
-      validator :default, required_suite_options: us_core_version_requirement do
-        url ENV.fetch('G10_VALIDATOR_URL', 'http://validator_service:4567')
+          us_core_version_num = G10Options::US_CORE_VERSION_NUMBERS[us_core_version_requirement[:us_core_version]]
+
+          igs("hl7.fhir.us.core##{us_core_version_num}")
+        else
+          url ENV.fetch('G10_VALIDATOR_URL', 'http://validator_service:4567')
+        end
 
         us_core_message_filters =
           case (us_core_version_requirement[:us_core_version])
@@ -148,6 +164,16 @@ module ONCCertificationG10TestKit
       end
     end
 
+    [
+      G10Options::US_CORE_3_REQUIREMENT,
+      G10Options::US_CORE_4_REQUIREMENT,
+      G10Options::US_CORE_5_REQUIREMENT,
+      G10Options::US_CORE_6_REQUIREMENT
+
+    ].each do |us_core_version_requirement|
+      setup_validator(us_core_version_requirement)
+    end
+
     def self.jwks_json
       bulk_data_jwks = JSON.parse(File.read(
                                     ENV.fetch('G10_BULK_DATA_JWKS',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onc_certification_g10_test_kit
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bloomer
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.20
+        version: 0.4.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.20
+        version: 0.4.34
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: database_cleaner-sequel
   requirement: !ruby/object:Gem::Requirement