onc_certification_g10_test_kit 3.1.0 → 3.3.0

data/lib/inferno/terminology/fhir_package_manager.rb

@@ -11,28 +11,30 @@ module Inferno
       class << self
         REGISTRY_SERVER_URL = 'https://packages.fhir.org'.freeze
         REQUIRED_VSAC_VALUE_SET_URLS = [
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.8',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.30',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.6',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.4',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.11.20.9.38',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.1066',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.1.11.10267',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.27',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.5',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.32',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.836',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.1.11.14914',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.837',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.877',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.1',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.102',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.103',
-          'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.2',
           'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.2074.1.1.3'
+          # The ValueSets below are needed when building all of the terminology
+          # rather than only the terminology for required bindings.
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.8',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.30',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.6',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.4',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.11.20.9.38',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.1066',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.1.11.10267',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1099.27',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.5',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1021.32',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.1',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113883.3.88.12.80.17',
+          # 'http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1186.2'
         ].freeze
 
         # Get the FHIR Package from the registry.

data/lib/inferno/terminology/loader.rb

@@ -57,7 +57,6 @@ module Inferno
             code_systems << 'urn:oid:2.16.840.1.113883.6.13'
           end
           code_systems << 'urn:oid:2.16.840.1.113883.6.101' if code_systems.include? 'http://nucc.org/provider-taxonomy'
-          code_systems << 'urn:oid:2.16.840.1.113883.6.101' if code_systems.include? 'http://hl7.org/fhir/questionnaire-answers-status'
           code_systems.uniq!
         end
 
@@ -108,7 +107,7 @@ module Inferno
                 file: name_by_type(File.basename(filename), type),
                 count: new_count,
                 type: type.to_s,
-                code_systems: code_systems
+                code_systems:
               }
             rescue UnknownCodeSystemException,
                    FilterOperationException,
@@ -184,11 +183,34 @@ module Inferno
           File.write(metadata_path, metadata.to_yaml)
         end
 
+        def value_sets_to_load
+          @value_sets_to_load ||=
+            YAML.load_file(File.join('resources', 'value_sets.yml'))
+        end
+
+        # Run this method in an inferno console to update the list of value set
+        # bindings. This is not done automatically during the build because
+        # Inferno isn't loaded during the build process.
+        def save_new_value_set_list
+          all_metadata =
+            USCoreTestKit::USCoreV311::USCoreTestSuite.metadata +
+            USCoreTestKit::USCoreV400::USCoreTestSuite.metadata +
+            USCoreTestKit::USCoreV501::USCoreTestSuite.metadata
+
+          all_metadata =
+            all_metadata
+              .flat_map { |metadata| metadata.bindings.map { |bind| bind.merge(profile_url: metadata.profile_url) } }
+              .select { |metadata| metadata[:strength] == 'required' }
+              .uniq
+
+          File.write(File.join('resources', 'value_sets.yml'), all_metadata.to_yaml)
+        end
+
         # NOTE: resources/value_sets.yml controls which value sets get loaded.
         # It is currently manually generated from the US Core metadata.
         def get_value_sets(strengths)
           expected_vs_urls =
-            YAML.load_file(File.join('resources', 'value_sets.yml'))
+            value_sets_to_load
               .select { |vs| strengths.include? vs[:strength] }
               .map! { |vs| vs[:system] }
               .compact

data/lib/inferno/terminology/tasks/create_value_set_validators.rb

@@ -19,9 +19,9 @@ module Inferno
           Loader.register_umls_db db_for_version
           Loader.load_value_sets_from_directory(PACKAGE_DIR, true)
           Loader.create_validators(
-            type: type,
-            minimum_binding_strength: minimum_binding_strength,
-            delete_existing: delete_existing
+            type:,
+            minimum_binding_strength:,
+            delete_existing:
           )
         end
 

data/lib/inferno/terminology/tasks/download_umls.rb

@@ -11,7 +11,8 @@ module Inferno
         UMLS_FILE_URLS = {
           '2019' => 'https://download.nlm.nih.gov/umls/kss/2019AB/umls-2019AB-full.zip',
           '2020' => 'https://download.nlm.nih.gov/umls/kss/2020AB/umls-2020AB-full.zip',
-          '2021' => 'https://download.nlm.nih.gov/umls/kss/2021AA/umls-2021AA-full.zip'
+          '2021' => 'https://download.nlm.nih.gov/umls/kss/2021AA/umls-2021AA-full.zip',
+          '2022' => 'https://download.nlm.nih.gov/umls/kss/2022AA/umls-2022AA-full.zip'
         }.freeze
         TICKET_GRANTING_TICKET_URL = 'https://utslogin.nlm.nih.gov/cas/v1/api-key'.freeze
 
@@ -98,7 +99,7 @@ module Inferno
             RestClient::Request.execute(
               method: :get,
               url: "#{location}?ticket=#{ticket}",
-              headers: { cookie: cookie },
+              headers: { cookie: },
               block_response: block
             )
           end

data/lib/inferno/terminology/tasks/expand_value_set_to_file.rb

@@ -16,7 +16,7 @@ module Inferno
           # Before writing the JSON to a file at the end
           end_vs = nil if type == 'json'
 
-          %w[2019 2020 2021].each do |version|
+          %w[2022].each do |version|
             Loader.register_umls_db File.join(TEMP_DIR, version, 'umls.db')
             Loader.load_value_sets_from_directory(PACKAGE_DIR, true)
             vs = Repositories::ValueSets.new.find(value_set_url)

data/lib/inferno/terminology/tasks/run_umls_jar.rb

@@ -11,7 +11,8 @@ module Inferno
         VERSIONED_PROPS = {
           '2019' => 'inferno_2019.prop',
           '2020' => 'inferno_2020.prop',
-          '2021' => 'inferno_2021.prop'
+          '2021' => 'inferno_2021.prop',
+          '2022' => 'inferno_2022.prop'
         }.freeze
 
         attr_reader :version

data/lib/inferno/terminology/tasks/validate_code.rb

@@ -19,7 +19,7 @@ module Inferno
         def run
           Inferno::Terminology::Loader.load_validators
           code_display = self.system ? "#{self.system}|#{code}" : code.to_s
-          if validate_code(code: code, system: self.system, value_set_url: value_set_url)
+          if validate_code(code:, system: self.system, value_set_url:)
             in_system = 'is in'
             symbol = "\u2713".encode('utf-8').to_s.green
           else

data/lib/inferno/terminology/terminology_validation.rb

@@ -35,7 +35,7 @@ module Inferno
             validators_repo.find(system) || raise(UnknownCodeSystemException, system)
           end
 
-        validator.validate(code: code, system: system)
+        validator.validate(code:, system:)
       end
     end
   end

data/lib/inferno/terminology/validator.rb

@@ -5,20 +5,20 @@ module Inferno
     class Validator
       attr_reader :url, :concept_count, :type, :code_systems, :file_name, :bloom_filter
 
-      def initialize(**params)
-        @url = params[:url]
-        @concept_count = params[:count]
-        @type = params[:type]
-        @code_systems = params[:code_systems]
-        @file_name = params[:file]
-        @bloom_filter = params[:bloom_filter]
+      def initialize(metadata)
+        @url = metadata[:url]
+        @concept_count = metadata[:count]
+        @type = metadata[:type]
+        @code_systems = metadata[:code_systems]
+        @file_name = metadata[:file]
+        @bloom_filter = metadata[:bloom_filter]
       end
 
       def validate(code:, system: nil)
         if system
           raise ProhibitedSystemException, system if TerminologyConfiguration.system_prohibited?(system)
 
-          coding_in_filter?(code: code, system: system)
+          coding_in_filter?(code:, system:)
         elsif contains_prohibited_systems?
           raise ProhibitedSystemException, prohibited_systems.join(', ') unless code_in_allowed_system?(code)
 
@@ -52,7 +52,7 @@ module Inferno
 
       def code_in_systems?(code, possible_systems)
         possible_systems.any? do |possible_system|
-          coding_in_filter?(code: code, system: possible_system)
+          coding_in_filter?(code:, system: possible_system)
         end
       end
 

data/lib/inferno/terminology/value_set.rb

@@ -32,9 +32,9 @@ module Inferno
 
       # UMLS Vocabulary: https://www.nlm.nih.gov/research/umls/sourcereleasedocs/index.html
       SAB = {
-        'http://www.nlm.nih.gov/research/umls/rxnorm' => {
-          abbreviation: 'RXNORM',
-          name: 'RxNorm Vocabulary'
+        'http://unitsofmeasure.org' => {
+          abbreviation: 'NCI_UCUM',
+          name: 'Unified Code for Units of Measure (UCUM)'
         }.freeze,
         'http://loinc.org' => {
           abbreviation: 'LNC',
@@ -43,59 +43,61 @@ module Inferno
         'http://snomed.info/sct' => {
           abbreviation: 'SNOMEDCT_US',
           name: 'Systematized Nomenclature of Medicine-Clinical Terms (SNOMED CT), US Edition'
-        }.freeze,
-        'http://www.cms.gov/Medicare/Coding/ICD10' => {
-          abbreviation: 'ICD10PCS',
-          name: 'ICD-10 Procedure Coding System (ICD-10-PCS)'
-        }.freeze,
-        'http://hl7.org/fhir/sid/cvx' => {
-          abbreviation: 'CVX',
-          name: 'Vaccines Administered (CVX)'
-        }.freeze,
-        'http://hl7.org/fhir/sid/icd-10-cm' => {
-          abbreviation: 'ICD10CM',
-          name: 'International Classification of Diseases, Tenth Revision, Clinical Modification (ICD-10-CM)'
-        }.freeze,
-        'http://hl7.org/fhir/sid/icd-9-cm' => {
-          abbreviation: 'ICD9CM',
-          name: 'International Classification of Diseases, Ninth Revision, Clinical Modification (ICD-9-CM)'
-        }.freeze,
-        'http://unitsofmeasure.org' => {
-          abbreviation: 'NCI_UCUM',
-          name: 'Unified Code for Units of Measure (UCUM)'
-        }.freeze,
-        'urn:oid:2.16.840.1.113883.6.101' => {
-          abbreviation: 'NUCCHCPT',
-          name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
-        },
-        'http://nucc.org/provider-taxonomy' => {
-          abbreviation: 'NUCCHCPT',
-          name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
-        }.freeze,
-        'http://www.ama-assn.org/go/cpt' => {
-          abbreviation: 'CPT',
-          name: 'Current Procedural Terminology (CPT)'
-        }.freeze,
-        'http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets' => {
-          abbreviation: 'HCPCS',
-          name: 'Healthcare Common Procedure Coding System (HCPCS)'
-        }.freeze,
-        'urn:oid:2.16.840.1.113883.6.285' => {
-          abbreviation: 'HCPCS',
-          name: 'Healthcare Common Procedure Coding System (HCPCS)'
-        }.freeze,
-        'urn:oid:2.16.840.1.113883.6.13' => {
-          abbreviation: 'CDT',
-          name: 'Code on Dental Procedures and Nomenclature (CDT)'
-        }.freeze,
-        'http://ada.org/cdt' => {
-          abbreviation: 'CDT',
-          name: 'Code on Dental Procedures and Nomenclature (CDT)'
-        },
-        'http://www.ada.org/cdt' => {
-          abbreviation: 'CDT',
-          name: 'Code on Dental Procedures and Nomenclature (CDT)'
-        }
+        }.freeze
+        # The systems below are needed if building all terminology rather than
+        # only the required bindings.
+        # 'http://www.nlm.nih.gov/research/umls/rxnorm' => {
+        #   abbreviation: 'RXNORM',
+        #   name: 'RxNorm Vocabulary'
+        # }.freeze,
+        # 'http://www.cms.gov/Medicare/Coding/ICD10' => {
+        #   abbreviation: 'ICD10PCS',
+        #   name: 'ICD-10 Procedure Coding System (ICD-10-PCS)'
+        # }.freeze,
+        # 'http://hl7.org/fhir/sid/cvx' => {
+        #   abbreviation: 'CVX',
+        #   name: 'Vaccines Administered (CVX)'
+        # }.freeze,
+        # 'http://hl7.org/fhir/sid/icd-10-cm' => {
+        #   abbreviation: 'ICD10CM',
+        #   name: 'International Classification of Diseases, Tenth Revision, Clinical Modification (ICD-10-CM)'
+        # }.freeze,
+        # 'http://hl7.org/fhir/sid/icd-9-cm' => {
+        #   abbreviation: 'ICD9CM',
+        #   name: 'International Classification of Diseases, Ninth Revision, Clinical Modification (ICD-9-CM)'
+        # }.freeze,
+        # 'urn:oid:2.16.840.1.113883.6.101' => {
+        #   abbreviation: 'NUCCHCPT',
+        #   name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
+        # },
+        # 'http://nucc.org/provider-taxonomy' => {
+        #   abbreviation: 'NUCCHCPT',
+        #   name: 'National Uniform Claim Committee - Health Care Provider Taxonomy (NUCCHCPT)'
+        # }.freeze,
+        # 'http://www.ama-assn.org/go/cpt' => {
+        #   abbreviation: 'CPT',
+        #   name: 'Current Procedural Terminology (CPT)'
+        # }.freeze,
+        # 'http://www.cms.gov/Medicare/Coding/HCPCSReleaseCodeSets' => {
+        #   abbreviation: 'HCPCS',
+        #   name: 'Healthcare Common Procedure Coding System (HCPCS)'
+        # }.freeze,
+        # 'urn:oid:2.16.840.1.113883.6.285' => {
+        #   abbreviation: 'HCPCS',
+        #   name: 'Healthcare Common Procedure Coding System (HCPCS)'
+        # }.freeze,
+        # 'urn:oid:2.16.840.1.113883.6.13' => {
+        #   abbreviation: 'CDT',
+        #   name: 'Code on Dental Procedures and Nomenclature (CDT)'
+        # }.freeze,
+        # 'http://ada.org/cdt' => {
+        #   abbreviation: 'CDT',
+        #   name: 'Code on Dental Procedures and Nomenclature (CDT)'
+        # },
+        # 'http://www.ada.org/cdt' => {
+        #   abbreviation: 'CDT',
+        #   name: 'Code on Dental Procedures and Nomenclature (CDT)'
+        # }
       }.freeze
 
       CODE_SYS = {
@@ -114,7 +116,7 @@ module Inferno
               'WA', 'WV', 'WI', 'WY', 'AE', 'AP', 'AA'
             ]
             codes.each_with_object(Set.new) do |code, set|
-              set.add(system: 'https://www.usps.com/', code: code)
+              set.add(system: 'https://www.usps.com/', code:)
             end
           end
       }.freeze
@@ -421,11 +423,11 @@ module Inferno
           @db.execute(
             "SELECT code FROM mrconso WHERE SAB = '#{umls_abbreviation(system)}' AND TTY IN('PT', 'OP')"
           ) do |row|
-            filtered_set.add(system: system, code: row[0])
+            filtered_set.add(system:, code: row[0])
           end
         elsif filter.nil?
           @db.execute("SELECT code FROM mrconso WHERE SAB = '#{umls_abbreviation(system)}'") do |row|
-            filtered_set.add(system: system, code: row[0])
+            filtered_set.add(system:, code: row[0])
           end
         elsif ['=', 'in', nil].include? filter&.op
           if FILTER_PROP[filter.property]
@@ -433,13 +435,13 @@ module Inferno
               "SELECT code FROM mrsat WHERE SAB = '#{umls_abbreviation(system)}' " \
               "AND ATN = '#{fp_self(filter.property)}' AND ATV = '#{fp_self(filter.value)}'"
             ) do |row|
-              filtered_set.add(system: system, code: row[0])
+              filtered_set.add(system:, code: row[0])
             end
           else
             @db.execute(
               "SELECT code FROM mrconso WHERE SAB = '#{umls_abbreviation(system)}' AND #{filter_clause.call(filter)}"
             ) do |row|
-              filtered_set.add(system: system, code: row[0])
+              filtered_set.add(system:, code: row[0])
             end
           end
         elsif filter&.op == 'is-a'
@@ -484,9 +486,9 @@ module Inferno
         desired_children = Set.new
         subsume = lambda do |parent|
           # Only execute if we haven't processed this parent yet
-          par = { system: system, code: parent }
+          par = { system:, code: parent }
           unless desired_children.include? par
-            desired_children.add(system: system, code: parent)
+            desired_children.add(system:, code: parent)
             children[parent]&.each do |child|
               subsume.call(child)
             end

data/lib/onc_certification_g10_test_kit/authorization_request_builder.rb

@@ -46,7 +46,7 @@ module ONCCertificationG10TestKit
     end
 
     def jwt_token
-      @jwt_token ||= JSON::JWT.new(iss: iss, sub: sub, aud: aud, exp: exp, jti: jti).compact
+      @jwt_token ||= JSON::JWT.new(iss:, sub:, aud:, exp:, jti:).compact
     end
 
     def jwk
@@ -55,7 +55,7 @@ module ONCCertificationG10TestKit
 
     def authorization_request_headers
       {
-        content_type: content_type,
+        content_type:,
         accept: 'application/json'
       }.compact
     end

data/lib/onc_certification_g10_test_kit/bulk_data_authorization.rb

@@ -87,7 +87,7 @@ module ONCCertificationG10TestKit
                                                                  aud: bulk_token_endpoint,
                                                                  grant_type: 'not_a_grant_type')
 
-        post({ client: :token_endpoint }.merge(post_request_content))
+        post(**{ client: :token_endpoint }.merge(post_request_content))
 
         assert_response_status(400)
       end
@@ -118,7 +118,7 @@ module ONCCertificationG10TestKit
                                                                  aud: bulk_token_endpoint,
                                                                  client_assertion_type: 'not_an_assertion_type')
 
-        post({ client: :token_endpoint }.merge(post_request_content))
+        post(**{ client: :token_endpoint }.merge(post_request_content))
 
         assert_response_status(400)
       end
@@ -157,7 +157,7 @@ module ONCCertificationG10TestKit
                                                                  sub: bulk_client_id,
                                                                  aud: bulk_token_endpoint)
 
-        post({ client: :token_endpoint }.merge(post_request_content))
+        post(**{ client: :token_endpoint }.merge(post_request_content))
 
         assert_response_status([400, 401])
       end
@@ -179,7 +179,7 @@ module ONCCertificationG10TestKit
                                                                  sub: bulk_client_id,
                                                                  aud: bulk_token_endpoint)
 
-        authentication_response = post({ client: :token_endpoint }.merge(post_request_content))
+        authentication_response = post(**{ client: :token_endpoint }.merge(post_request_content))
 
         assert_response_status([200, 201])
 

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -165,7 +165,7 @@ module ONCCertificationG10TestKit
         polling_url = request.response_header('content-location')&.value
         assert polling_url.present?, 'Export response headers did not include "Content-Location"'
 
-        output polling_url: polling_url
+        output polling_url:
       end
     end
 
@@ -221,6 +221,7 @@ module ONCCertificationG10TestKit
         assert request.response_header('content-type')&.value&.include?('application/json'),
                'Content-Type not application/json'
 
+        assert_valid_json(response[:body])
         response_body = JSON.parse(response[:body])
 
         ['transactionTime', 'request', 'requiresAccessToken', 'output', 'error'].each do |key|
@@ -255,6 +256,7 @@ module ONCCertificationG10TestKit
       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

@@ -578,7 +578,7 @@ module ONCCertificationG10TestKit
         for missing data elements and value set verification.
       DESCRIPTION
 
-      required_suite_options us_core_version: 'us_core_5'
+      required_suite_options G10Options::US_CORE_5_REQUIREMENT
 
       include BulkExportValidationTester
 
@@ -598,7 +598,8 @@ module ONCCertificationG10TestKit
         conform to the US Core RelatedPerson profile. This includes checking
         for missing data elements and value set verification.
       DESCRIPTION
-      required_suite_options us_core_version: 'us_core_5'
+
+      required_suite_options G10Options::US_CORE_5_REQUIREMENT
 
       include BulkExportValidationTester
 
@@ -620,7 +621,8 @@ module ONCCertificationG10TestKit
         data elements and value set verification. This test is omitted if bulk
         data export does not return any QuestionnaireResponse resources.
       DESCRIPTION
-      required_suite_options us_core_version: 'us_core_5'
+
+      required_suite_options G10Options::US_CORE_5_REQUIREMENT
 
       include BulkExportValidationTester
 
@@ -642,7 +644,8 @@ module ONCCertificationG10TestKit
         data elements and value set verification. This test is omitted if bulk
         data export does not return any  resources.
       DESCRIPTION
-      required_suite_options us_core_version: 'us_core_5'
+
+      required_suite_options G10Options::US_CORE_5_REQUIREMENT
 
       include BulkExportValidationTester
 

data/lib/onc_certification_g10_test_kit/bulk_export_validation_tester.rb

@@ -4,6 +4,7 @@ module ONCCertificationG10TestKit
   module BulkExportValidationTester
     include USCoreTestKit::MustSupportTest
     include ProfileSelector
+    include G10Options
 
     attr_reader :metadata
 
@@ -11,17 +12,6 @@ module ONCCertificationG10TestKit
     MIN_RESOURCE_COUNT = 2
     OMIT_KLASS = ['Medication', 'Location', 'QuestionnaireResponse', 'PractitionerRole'].freeze
 
-    def versioned_us_core_module
-      case suite_options[:us_core_version]
-      when 'us_core_5'
-        USCoreTestKit::USCoreV501
-      when 'us_core_4'
-        USCoreTestKit::USCoreV400
-      else
-        USCoreTestKit::USCoreV311
-      end
-    end
-
     def metadata_list
       @metadata_list ||=
         versioned_us_core_module::USCoreTestSuite
@@ -61,7 +51,7 @@ module ONCCertificationG10TestKit
         end
       }
 
-      stream(process_body, endpoint, headers: headers)
+      stream(process_body, endpoint, headers:)
 
       max_redirect = 5
 
@@ -76,7 +66,7 @@ module ONCCertificationG10TestKit
         # handle relative redirects
         redirect_url = URI.parse(endpoint).merge(redirect_url).to_s unless redirect_url.start_with?('http')
 
-        redirect_headers = headers.reject { |key, _value| key == :authorization }
+        redirect_headers = headers.except(:authorization)
 
         stream(process_body, redirect_url, headers: redirect_headers)
       end
@@ -154,7 +144,7 @@ module ONCCertificationG10TestKit
         scratch[:patient_ids_seen] = patient_ids_seen | [resource.id] if resource_type == 'Patient'
 
         profile_with_version = versioned_profile_url(profile_url)
-        unless resource_is_valid?(resource: resource, profile_url: profile_with_version)
+        unless resource_is_valid?(resource:, profile_url: profile_with_version)
           if first_error.key?(:line_number)
             @invalid_resource_count += 1
           else
@@ -197,6 +187,7 @@ module ONCCertificationG10TestKit
       skip_if (requires_access_token == 'true' && bearer_token.blank?),
               'Could not verify this functionality when Bearer Token is required and not provided'
 
+      assert_valid_json(status_output)
       file_list = JSON.parse(status_output).select { |file| file['type'] == resource_type }
       if file_list.empty?
         message = "No #{resource_type} resource file item returned by server."

data/lib/onc_certification_g10_test_kit/configuration_checker.rb

@@ -2,7 +2,7 @@ require_relative '../inferno/terminology/tasks/check_built_terminology'
 
 module ONCCertificationG10TestKit
   class ConfigurationChecker
-    EXPECTED_VALIDATOR_VERSION = '2.1.0'.freeze
+    EXPECTED_VALIDATOR_VERSION = '2.2.0'.freeze
 
     def configuration_messages
       validator_version_message + terminology_messages + version_message
@@ -42,6 +42,19 @@ module ONCCertificationG10TestKit
       }]
     end
 
+    def code_system_version_messages
+      path = File.join('resources', 'terminology', 'validators', 'bloom', 'metadata.yml')
+      return '' unless File.exist? path
+
+      cs_metadata = YAML.load_file(path)
+      message = "Terminology was generated based on the following code system versions:\n"
+      cs_metadata.each do |_url, metadata|
+        message += "* #{metadata[:name]}: version #{metadata[:versions].join(', ')}\n"
+      end
+
+      message
+    end
+
     def terminology_messages # rubocop:disable Metrics/CyclomaticComplexity
       success_messages = []
       warning_messages = []
@@ -64,6 +77,15 @@ module ONCCertificationG10TestKit
         end
       end
 
+      code_system_messages = code_system_version_messages
+
+      if code_system_version_messages.present?
+        messages << {
+          type: 'info',
+          message: code_system_messages
+        }
+      end
+
       if success_messages.present?
         messages << {
           type: 'info',

data/lib/onc_certification_g10_test_kit/export_kick_off_performer.rb

@@ -9,7 +9,7 @@ module ONCCertificationG10TestKit
       url = "Group/#{group_id}/$export"
       param_str = params.map { |k, v| URI.encode_www_form(k => v) }.join('&')
       url.concat("?#{param_str}") unless param_str.empty?
-      get(url, client: :bulk_server, name: :export, headers: headers)
+      get(url, client: :bulk_server, name: :export, headers:)
     end
 
     def delete_export_kick_off_request
@@ -18,7 +18,7 @@ module ONCCertificationG10TestKit
 
       headers = { accept: 'application/json', authorization: "Bearer #{bearer_token}" }
 
-      delete(polling_url, headers: headers)
+      delete(polling_url, headers:)
       assert_response_status(202)
     end
   end