onc_certification_g10_test_kit 3.0.1 → 3.2.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
 
@@ -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/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
 

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/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 = {

data/lib/onc_certification_g10_test_kit/base_token_refresh_group.rb

@@ -1,3 +1,5 @@
+require_relative 'smart_invalid_token_refresh_test'
+
 module ONCCertificationG10TestKit
   class BaseTokenRefreshGroup < Inferno::TestGroup
     title 'Token Refresh'

data/lib/onc_certification_g10_test_kit/bulk_data_group_export_stu1.rb

@@ -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_stu2.rb

@@ -32,7 +32,7 @@ module ONCCertificationG10TestKit
 
       run do
         ['application/fhir+ndjson', 'application/ndjson', 'ndjson'].each do |format|
-          perform_export_kick_off_request(params: "_outputFormat=#{format}")
+          perform_export_kick_off_request(params: { _outputFormat: format })
           assert_response_status(202)
 
           delete_export_kick_off_request

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
@@ -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

@@ -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

@@ -1,13 +1,14 @@
 module ONCCertificationG10TestKit
   module ExportKickOffPerformer
-    def perform_export_kick_off_request(use_token: true, params: '')
+    def perform_export_kick_off_request(use_token: true, params: {})
       skip_if use_token && bearer_token.blank?, 'Could not verify this functionality when bearer token is not set'
 
       headers = { accept: 'application/fhir+json', prefer: 'respond-async' }
       headers.merge!({ authorization: "Bearer #{bearer_token}" }) if use_token
 
       url = "Group/#{group_id}/$export"
-      url.concat("?#{params}") unless params.empty?
+      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)
     end
 

data/lib/onc_certification_g10_test_kit/g10_options.rb

@@ -0,0 +1,46 @@
+module ONCCertificationG10TestKit
+  module G10Options
+    US_CORE_3 = 'us_core_3'.freeze
+    US_CORE_4 = 'us_core_4'.freeze
+    US_CORE_5 = 'us_core_5'.freeze
+
+    BULK_DATA_1 = 'multi_patient_api_stu1'.freeze
+    BULK_DATA_2 = 'multi_patient_api_stu2'.freeze
+
+    SMART_1 = 'smart_app_launch_1'.freeze
+    SMART_2 = 'smart_app_launch_2'.freeze
+
+    US_CORE_3_REQUIREMENT = { us_core_version: US_CORE_3 }.freeze
+    US_CORE_4_REQUIREMENT = { us_core_version: US_CORE_4 }.freeze
+    US_CORE_5_REQUIREMENT = { us_core_version: US_CORE_5 }.freeze
+
+    BULK_DATA_1_REQUIREMENT = { multi_patient_version: BULK_DATA_1 }.freeze
+    BULK_DATA_2_REQUIREMENT = { multi_patient_version: BULK_DATA_2 }.freeze
+
+    SMART_1_REQUIREMENT = { smart_app_launch_version: SMART_1 }.freeze
+    SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze
+
+    def us_core_version
+      suite_options[:us_core_version]
+    end
+
+    def using_us_core_3?
+      us_core_version == US_CORE_3
+    end
+
+    def using_us_core_5?
+      us_core_version == US_CORE_5
+    end
+
+    def versioned_us_core_module
+      case us_core_version
+      when US_CORE_5
+        USCoreTestKit::USCoreV501
+      when US_CORE_4
+        USCoreTestKit::USCoreV400
+      else
+        USCoreTestKit::USCoreV311
+      end
+    end
+  end
+end

data/lib/onc_certification_g10_test_kit/incorrectly_permitted_tls_versions_messages_setup_test.rb

@@ -0,0 +1,34 @@
+module ONCCertificationG10TestKit
+  class IncorrectlyPermittedTLSVersionsMessagesSetupTest < Inferno::Test
+    id :g10_incorrectly_permitted_tls_versions_messages_setup
+    title 'Handle TLS Warning Messages'
+
+    input :incorrectly_permitted_tls_versions_messages
+    output :unique_incorrectly_permitted_tls_versions_messages,
+           :tls_documentation_required
+
+    run do
+      pass_if incorrectly_permitted_tls_versions_messages.blank?
+
+      warning do
+        new_warning_messages = incorrectly_permitted_tls_versions_messages&.split("\n")
+
+        pass_if new_warning_messages.blank?
+
+        raw_previous_warning_messages =
+          Inferno::Repositories::SessionData.new.load(
+            test_session_id: test_session_id,
+            name: 'unique_incorrectly_permitted_tls_versions_messages'
+          )
+
+        previous_warning_messages =
+          raw_previous_warning_messages.blank? ? [] : raw_previous_warning_messages.split("\n")
+
+        warning_messages = (previous_warning_messages + new_warning_messages).uniq
+
+        output unique_incorrectly_permitted_tls_versions_messages: warning_messages.join("\n"),
+               tls_documentation_required: 'true'
+      end
+    end
+  end
+end

data/lib/onc_certification_g10_test_kit/limited_scope_grant_test.rb

@@ -1,5 +1,7 @@
 module ONCCertificationG10TestKit
   class LimitedScopeGrantTest < Inferno::Test
+    include G10Options
+
     title 'OAuth token exchange response grants scope that is limited to those selected by user'
     description %(
       The ONC certification criteria requires that patients are capable of
@@ -33,7 +35,7 @@ module ONCCertificationG10TestKit
       (POSSIBLE_RESOURCES + ['Encounter', 'ServiceRequest']).freeze
 
     def possible_resources
-      return V5_POSSIBLE_RESOURCES if suite_options[:us_core_version] == 'us_core_5'
+      return V5_POSSIBLE_RESOURCES if using_us_core_5?
 
       POSSIBLE_RESOURCES
     end

data/lib/onc_certification_g10_test_kit/multi_patient_api_stu1.rb

@@ -1,6 +1,7 @@
 require_relative 'bulk_data_authorization'
 require_relative 'bulk_data_group_export_stu1'
 require_relative 'bulk_data_group_export_validation'
+require_relative 'incorrectly_permitted_tls_versions_messages_setup_test'
 
 module ONCCertificationG10TestKit
   class MultiPatientAPIGroupSTU1 < Inferno::TestGroup
@@ -62,7 +63,17 @@ module ONCCertificationG10TestKit
             This test returns an access token.
           DESCRIPTION
 
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_auth_tls_messages_setup
+
     group from: :bulk_data_group_export
+
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_group_export_tls_messages_setup
+
     group from: :bulk_data_group_export_validation
+
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_group_export_validation_messages_setup
   end
 end

data/lib/onc_certification_g10_test_kit/multi_patient_api_stu2.rb

@@ -62,7 +62,17 @@ module ONCCertificationG10TestKit
             This test returns an access token.
           DESCRIPTION
 
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_auth_tls_messages_setup
+
     group from: :bulk_data_group_export_stu2
+
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_group_export_tls_messages_setup
+
     group from: :bulk_data_group_export_validation
+
+    test from: :g10_incorrectly_permitted_tls_versions_messages_setup,
+         id: :g10_bulk_group_export_validation_messages_setup
   end
 end