us_core_test_kit 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff99afacbf38abd7c8c459ab425b3e58c763a9ff721f9447562d62ff6e5dba66
-  data.tar.gz: b69ed849fd8588b2f8fe029cee922d78b46ba639de36ccd174efe94fe3da60eb
+  metadata.gz: 2b693ad77df0cc7296b9ae07942cf5ea4f3496fb47ca199d63f3066f906f142f
+  data.tar.gz: 34d31851aabbf208e7f0db087a2f72f355e42c1c8e61da20b3c5a62885db1b72
 SHA512:
-  metadata.gz: c64bede1519c6c76aa1e6fdb82f87036ccce90f88d238bb0af3fa35d7080246206a0cfedb0cbc57e0ad8aaf1769b1fa1297b5db50a1a5c0a35b6dc861664828a
-  data.tar.gz: 41a2be6bc4932c82fe6ef1ebe48027c556fec81ff8e3e7c72bcd77bb02de6ccb6161ea16772de78f7df2679facf6f7b798c1fbc9656a4fa2f20d96db6ee6d9fb
+  metadata.gz: 325e5643f37e0da1e02e5e4fe3d4808ed3dc4e62a24e7f290ebe146e275b86cc13db3d51f79a331f5207bca117c1d7b8fcd2707170158aa29d21f50ed38605de
+  data.tar.gz: 2b11e159d4e26f24571fd040155a6ac924c2b5ccda1e5474380b24caac4486d0d8ea83e7ed4b6005f57aee2df0f25cd1e1073e36057409226b17840469bb3a99

data/lib/us_core_test_kit/custom_groups/base_smart_granular_scopes_group.rb

@@ -3,7 +3,8 @@ require 'smart_app_launch_test_kit'
 require_relative './smart_ehr_launch_stu2'
 require_relative './smart_scopes_constants'
 require_relative './smart_standalone_launch_stu2_group'
-require_relative '../granular_scope_checker'
+require_relative '../granular_scope_search_test'
+require_relative '../granular_scope_read_test'
 require_relative '../us_core_options'
 require_relative './granted_granular_scopes_test'
 

data/lib/us_core_test_kit/custom_groups/screening_assessment_category_test.rb

@@ -0,0 +1,75 @@
+require_relative '../search_test'
+
+module USCoreTestKit
+  class ScreeningAssessmentCategoryTest < Inferno::Test
+    include SearchTest
+
+    id :us_core_screening_assessment_category
+    title 'Server demonstrates support for the required Condition and Observation categories.'
+
+    input :patient_ids,
+          title: 'Patient IDs',
+          description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements'
+
+    # Disable tagging requests since this test doesn't have properties defined.
+    # TODO: investigate whether we need to tag these for granular scope
+    # checking.
+    def tags(_params)
+      nil
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def category_found(resource_type:, patient_id:, category_search_values:, missing_categories:)
+      search_params = { patient: patient_id }
+
+      category_search_values.each do |category_search_value|
+        search_params[:category] = category_search_value
+        search_and_check_response(search_params, resource_type)
+
+        resources = fetch_all_bundled_resources(resource_type:)
+          .select { |resource| resource.resourceType == resource_type }
+
+        resources.each do |resource|
+          resource.category&.each do |category|
+            category.coding&.each do |coding|
+              missing_categories.delete(coding.code)
+            end
+          end
+
+          break if missing_categories.empty?
+        end
+
+        break if missing_categories.empty?
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    run do
+      missing_obs_categories = config.options[:observation_screening_assessment_categories].dup
+      missing_cond_categories = config.options[:condition_screening_assessment_categories].dup
+
+      patient_id_list.each do |patient_id|
+        unless missing_cond_categories.empty?
+          category_found(resource_type: 'Condition',
+                         patient_id:,
+                         category_search_values: ['health-concern', 'problem-list-item'],
+                         missing_categories: missing_cond_categories)
+        end
+
+        next if missing_obs_categories.empty?
+
+        category_found(resource_type: 'Observation',
+                       patient_id:,
+                       category_search_values: ['survey'],
+                       missing_categories: missing_obs_categories)
+      end
+
+      pass if missing_cond_categories.empty? && missing_obs_categories.empty?
+
+      messages = []
+      messages << "Observation categories: #{missing_obs_categories.join(', ')}" unless missing_obs_categories.empty?
+      messages << "Condition categories: #{missing_cond_categories.join(', ')}" unless missing_cond_categories.empty?
+      skip "Could not find these #{messages.join(' and ')}."
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/v6.1.0/screening_assessment_group.rb

@@ -0,0 +1,45 @@
+require_relative '../screening_assessment_category_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ScreeningAssessmentGroup < Inferno::TestGroup
+      id :us_core_v610_screening_assessment
+      title 'Screening Assessments Guidance'
+      short_description 'Verify Condition and Observation resources support the ' \
+                        'US Core Screening And Assessments Guidance.'
+      description %(
+        The #{title} Sequence tests Condition and Observation
+        resources associated with the provided patient. The resources returned
+        will be checked for consistency against the [US Core Screening And Assessments
+        Guidance](https://hl7.org/fhir/us/core/STU6.1/screening-and-assessments.html)
+        and FHIR JIRA ticket [FHIR-45319](https://jira.hl7.org/browse/FHIR-45319)
+
+        In this set of tests, Inferno serves as a FHIR client that attempts to
+        access the different types of Screening and Assessments specified in the guidance.
+        The provided patient needs to have the following four common Screening and Assessements
+        as Observation categories:
+
+        * SDOH Assessment (sdoh)
+        * Functional Status (functional-status)
+        * Disability Status (disability-status)
+        * Mental/Cognitive Status (cognitive-status)
+
+        The provided patient also needs to have the following common Screening and Assessment
+        as Condition category:
+
+        * SDOH Assessment (sdoh)
+      )
+      run_as_group
+
+      test from: :us_core_screening_assessment_category do
+        config(
+          options: {
+            condition_screening_assessment_categories: ['sdoh'].freeze,
+            observation_screening_assessment_categories: ['sdoh', 'functional-status', 'disability-status',
+                                                          'cognitive-status'].freeze
+          }
+        )
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/custom_groups/v7.0.0-ballot/screening_assessment_group.rb

@@ -0,0 +1,48 @@
+require_relative '../screening_assessment_category_test'
+
+module USCoreTestKit
+  module USCoreV700_BALLOT
+    class ScreeningAssessmentGroup < Inferno::TestGroup
+      id :us_core_v700_ballot_screening_assessment
+      title 'Screening Assessments Guidance'
+      short_description 'Verify Condition and Observation resources support the ' \
+                        'US Core Screening And Assessments Guidance.'
+      description %(
+        The #{title} Sequence tests Condition and Observation
+        resources associated with the provided patient. The resources returned
+        will be checked for consistency against the [US Core Screening And Assessments
+        Guidance](https://hl7.org/fhir/us/core/STU7/screening-and-assessments.html)
+        and FHIR JIRA ticket [FHIR-46052](https://jira.hl7.org/browse/FHIR-46052)
+
+        In this set of tests, Inferno serves as a FHIR client that attempts to
+        access the different types of Screening and Assessments specified in the guidance.
+        The provided patient needs to have the following four common Screening and Assessements
+        as Observation categories:
+
+        * SDOH Assessment (sdoh)
+        * Functional Status (functional-status)
+        * Disability Status (disability-status)
+        * Mental/Cognitive Status (cognitive-status)
+        * Physical Activity (activity)
+        * Alcohol Use (social-history)
+        * Substance Use (social-history)
+
+        The provided patient also needs to have the following common Screening and Assessment
+        as Condition category:
+
+        * SDOH Assessment (sdoh)
+      )
+      run_as_group
+
+      test from: :us_core_screening_assessment_category do
+        config(
+          options: {
+            condition_screening_assessment_categories: ['sdoh'].freeze,
+            observation_screening_assessment_categories: ['sdoh', 'functional-status', 'disability-status',
+                                                          'cognitive-status', 'activity', 'social-history'].freeze
+          }
+        )
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/fhir_resource_navigation.rb

@@ -1,3 +1,5 @@
+require_relative './primitive_type'
+
 module USCoreTestKit
   module FHIRResourceNavigation
     DAR_EXTENSION_URL = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason'.freeze
@@ -65,19 +67,22 @@ module USCoreTestKit
         slice = find_slice_via_discriminator(element, property)
         slice
       else
-        result = element.send(property)
-        result = find_primitive_extension(element, property) if result.nil?
-        result
+        value = element.send(property)
+        primitive_value = get_primitive_type_value(element, property, value)
+        primitive_value.present? ? primitive_value : value
       end
     rescue NoMethodError
       nil
     end
 
-    def find_primitive_extension(element, property)
-      type = element.class::METADATA[property.to_s]['type']
+    def get_primitive_type_value(element, property, value)
       source_value = element.source_hash["_#{property}"]
 
-      PRIMITIVE_DATA_TYPES.include?(type) && source_value.present? ? FHIR::Element.new(source_value) : nil
+      return nil unless source_value.present?
+
+      primitive_value = USCoreTestKit::PrimitiveType.new(source_value)
+      primitive_value.value = value
+      primitive_value
     end
 
     def find_slice_via_discriminator(element, property)

data/lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/metadata.yml

@@ -350,26 +350,28 @@
 - :id: us_core_v610_condition_encounter_diagnosis_reference_resolution_test
   :file_name: condition_encounter_diagnosis_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v610_Condition_patient_category_granular_scope_test
-  :file_name: condition_patient_category_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_granular_scope_test
-  :file_name: condition_patient_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_recorded_date_granular_scope_test
-  :file_name: condition_patient_recorded_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_asserted_date_granular_scope_test
-  :file_name: condition_patient_asserted_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_category_clinical_status_granular_scope_test
-  :file_name: condition_patient_category_clinical_status_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_onset_date_granular_scope_test
-  :file_name: condition_patient_onset_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_abatement_date_granular_scope_test
-  :file_name: condition_patient_abatement_date_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_clinical_status_granular_scope_test
-  :file_name: condition_patient_clinical_status_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_category_encounter_granular_scope_test
-  :file_name: condition_patient_category_encounter_granular_scope_test.rb
-- :id: us_core_v610_Condition_patient_code_granular_scope_test
-  :file_name: condition_patient_code_granular_scope_test.rb
+- :id: us_core_v610_Condition_patient_category_granular_scope_search_test
+  :file_name: condition_patient_category_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_granular_scope_search_test
+  :file_name: condition_patient_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_recorded_date_granular_scope_search_test
+  :file_name: condition_patient_recorded_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
+  :file_name: condition_patient_asserted_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_category_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_onset_date_granular_scope_search_test
+  :file_name: condition_patient_onset_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
+  :file_name: condition_patient_abatement_date_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
+  :file_name: condition_patient_category_encounter_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_patient_code_granular_scope_search_test
+  :file_name: condition_patient_code_granular_scope_search_test.rb
+- :id: us_core_v610_Condition_granular_scope_read_test
+  :file_name: condition_granular_scope_read_test.rb
 :id: us_core_v610_condition_encounter_diagnosis
 :file_name: condition_encounter_diagnosis_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope1_group.rb

@@ -1,13 +1,14 @@
-require_relative './granular_scope_tests/condition/condition_patient_category_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_onset_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_code_granular_scope_test'
+require_relative './granular_scope_tests/condition/condition_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_recorded_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_asserted_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_category_clinical_status_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_onset_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_abatement_date_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_clinical_status_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_category_encounter_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/condition/condition_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV610
@@ -29,16 +30,17 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v610_Condition_patient_category_granular_scope_test
-      test from: :us_core_v610_Condition_patient_granular_scope_test
-      test from: :us_core_v610_Condition_patient_recorded_date_granular_scope_test
-      test from: :us_core_v610_Condition_patient_asserted_date_granular_scope_test
-      test from: :us_core_v610_Condition_patient_category_clinical_status_granular_scope_test
-      test from: :us_core_v610_Condition_patient_onset_date_granular_scope_test
-      test from: :us_core_v610_Condition_patient_abatement_date_granular_scope_test
-      test from: :us_core_v610_Condition_patient_clinical_status_granular_scope_test
-      test from: :us_core_v610_Condition_patient_category_encounter_granular_scope_test
-      test from: :us_core_v610_Condition_patient_code_granular_scope_test
+      test from: :us_core_v610_Condition_patient_category_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_recorded_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_onset_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
+      test from: :us_core_v610_Condition_patient_code_granular_scope_search_test
+      test from: :us_core_v610_Condition_granular_scope_read_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/condition_granular_scope_read_test.rb

@@ -0,0 +1,32 @@
+require_relative '../../../../generator/group_metadata'
+require_relative '../../../../granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ConditionGranularScopeReadTest < Inferno::Test
+      include USCoreTestKit::GranularScopeReadTest
+
+      title 'Server filters results for Condition reads based on granular scopes'
+      description %(
+This test attempts Condition reads 
+and verifies that the results have been
+filtered based on the granted granular scopes.
+
+      )
+
+      id :us_core_v610_Condition_granular_scope_read_test
+
+      def resource_type
+        'Condition'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      run do
+        run_scope_read_test
+      end
+    end
+  end
+end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_abatement_date_granular_scope_test.rb → condition_patient_abatement_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientAbatementDateGranularScopeTest < Inferno::Test
+    class ConditionPatientAbatementDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + abatement-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_abatement_date_granular_scope_test
+      id :us_core_v610_Condition_patient_abatement_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_asserted_date_granular_scope_test.rb → condition_patient_asserted_date_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientAssertedDateGranularScopeTest < Inferno::Test
+    class ConditionPatientAssertedDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + asserted-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_asserted_date_granular_scope_test
+      id :us_core_v610_Condition_patient_asserted_date_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_clinical_status_granular_scope_test.rb → condition_patient_category_clinical_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryClinicalStatusGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryClinicalStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category + clinical-status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_clinical_status_granular_scope_test
+      id :us_core_v610_Condition_patient_category_clinical_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_encounter_granular_scope_test.rb → condition_patient_category_encounter_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryEncounterGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryEncounterGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category + encounter based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_encounter_granular_scope_test
+      id :us_core_v610_Condition_patient_category_encounter_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_category_granular_scope_test.rb → condition_patient_category_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCategoryGranularScopeTest < Inferno::Test
+    class ConditionPatientCategoryGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + category based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_category_granular_scope_test
+      id :us_core_v610_Condition_patient_category_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_clinical_status_granular_scope_test.rb → condition_patient_clinical_status_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientClinicalStatusGranularScopeTest < Inferno::Test
+    class ConditionPatientClinicalStatusGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + clinical-status based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_clinical_status_granular_scope_test
+      id :us_core_v610_Condition_patient_clinical_status_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_code_granular_scope_test.rb → condition_patient_code_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientCodeGranularScopeTest < Inferno::Test
+    class ConditionPatientCodeGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + code based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_code_granular_scope_test
+      id :us_core_v610_Condition_patient_code_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_granular_scope_test.rb → condition_patient_granular_scope_search_test.rb}

@@ -1,12 +1,12 @@
 require_relative '../../../../search_test'
 require_relative '../../../../generator/group_metadata'
-require_relative '../../../../granular_scope_checker'
+require_relative '../../../../granular_scope_search_test'
 
 module USCoreTestKit
   module USCoreV610
-    class ConditionPatientGranularScopeTest < Inferno::Test
+    class ConditionPatientGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_granular_scope_test
+      id :us_core_v610_Condition_patient_granular_scope_search_test
 
       input :patient_ids,
         title: 'Patient IDs',
@@ -34,7 +34,7 @@ filtered based on the granted granular scopes.
       end
 
       run do
-        run_scope_check_test
+        run_scope_search_test
       end
     end
   end