us_core_test_kit 0.6.5 → 0.7.1

data/lib/us_core_test_kit/generated/v4.0.0/patient/metadata.yml

@@ -148,12 +148,15 @@
 :must_supports:
   :extensions:
   - :id: Patient.extension:race
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
     :uscdi_only: true
   - :id: Patient.extension:ethnicity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
     :uscdi_only: true
   - :id: Patient.extension:birthsex
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
     :uscdi_only: true
   :slices: []

data/lib/us_core_test_kit/generated/v4.0.0/us_core_test_suite.rb

@@ -67,6 +67,7 @@ module USCoreTestKit
         /Provenance.agent\[\d*\]: Rule provenance-1/, #Invalid invariant in US Core v5.0.1
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
+        /\A\S+: \S+: URL value '.*' does not resolve/,
         %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'} # Known issue with the Pulse Oximetry Profile
       ].freeze
 
@@ -78,8 +79,10 @@ module USCoreTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V400_VALIDATOR_URL', 'http://validator_service:4567')
+      id :us_core_v400
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#4.0.0'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -92,8 +95,6 @@ module USCoreTestKit
         end
       end
 
-      id :us_core_v400
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'

data/lib/us_core_test_kit/generated/v5.0.1/condition_encounter_diagnosis/metadata.yml

@@ -235,6 +235,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

data/lib/us_core_test_kit/generated/v5.0.1/condition_problems_health_concerns/metadata.yml

@@ -238,6 +238,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

data/lib/us_core_test_kit/generated/v5.0.1/metadata.yml

@@ -851,6 +851,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -1196,6 +1197,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -9694,15 +9696,19 @@
   :must_supports:
     :extensions:
     - :id: Patient.extension:race
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
       :uscdi_only: true
     - :id: Patient.extension:ethnicity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
       :uscdi_only: true
     - :id: Patient.extension:birthsex
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
       :uscdi_only: true
     - :id: Patient.extension:genderIdentity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
       :uscdi_only: true
     :slices: []
@@ -10756,8 +10762,10 @@
   :must_supports:
     :extensions:
     - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/StructureDefinition/display
     - :id: QuestionnaireResponse.questionnaire.extension:url
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
     :slices:
     - :slice_id: QuestionnaireResponse.meta.tag:sdoh

data/lib/us_core_test_kit/generated/v5.0.1/patient/metadata.yml

@@ -148,15 +148,19 @@
 :must_supports:
   :extensions:
   - :id: Patient.extension:race
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
     :uscdi_only: true
   - :id: Patient.extension:ethnicity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
     :uscdi_only: true
   - :id: Patient.extension:birthsex
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex
     :uscdi_only: true
   - :id: Patient.extension:genderIdentity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
     :uscdi_only: true
   :slices: []

data/lib/us_core_test_kit/generated/v5.0.1/questionnaire_response/metadata.yml

@@ -156,8 +156,10 @@
 :must_supports:
   :extensions:
   - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/StructureDefinition/display
   - :id: QuestionnaireResponse.questionnaire.extension:url
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
   :slices:
   - :slice_id: QuestionnaireResponse.meta.tag:sdoh

data/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb

@@ -77,6 +77,7 @@ module USCoreTestKit
         /Provenance.agent\[\d*\]: Rule provenance-1/, #Invalid invariant in US Core v5.0.1
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
+        /\A\S+: \S+: URL value '.*' does not resolve/,
         %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'} # Known issue with the Pulse Oximetry Profile
       ].freeze
 
@@ -88,8 +89,10 @@ module USCoreTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V501_VALIDATOR_URL', 'http://validator_service:4567')
+      id :us_core_v501
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#5.0.1'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -102,8 +105,6 @@ module USCoreTestKit
         end
       end
 
-      id :us_core_v501
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'

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

@@ -242,6 +242,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core
@@ -349,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
@@ -20,6 +21,8 @@ FHIR API tests, and verify that the resources returned are filtered
 based on the following granular scopes:
 
 * `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis`
+* `Condition.rs?category=http://hl7.org/fhir/us/core/CodeSystem/condition-category|health-concern`
+* `Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item`
 
       )
 
@@ -27,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/condition_problems_health_concerns/metadata.yml

@@ -245,6 +245,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/condition/{condition_patient_onset_date_granular_scope_test.rb → condition_patient_onset_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 ConditionPatientOnsetDateGranularScopeTest < Inferno::Test
+    class ConditionPatientOnsetDateGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Condition search by patient + onset-date based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Condition_patient_onset_date_granular_scope_test
+      id :us_core_v610_Condition_patient_onset_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