us_core_test_kit 0.6.3 → 0.6.5

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_3.rb

@@ -10,7 +10,7 @@ module USCoreTestKit
 
       def handle_special_cases
         add_must_support_choices
-        remove_patient_address_period
+        update_patient_previous_name_address
         remove_document_reference_custodian
       end
 
@@ -22,31 +22,77 @@ module USCoreTestKit
           choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] }
         when 'DocumentReference'
           choices << { paths: ['content.attachment.data', 'content.attachment.url'] }
-        when 'Patient'
-          # FHIR-40299 adds USCDI MustSupport choices for:
-          # * address.period.end and address.use,
-          # * name.period.end and name.use
-          choices << {
-            paths: ['address.period.end', 'address.use'],
-            uscdi_only: true
-          }
-
-          choices << {
-            paths: ['name.period.end', 'name.use'],
-            uscdi_only: true
-          }
         end
 
         must_supports[:choices] = choices if choices.present?
       end
 
-      # FHIR-40299 removes Patient.address.period from MustSupport,
-      def remove_patient_address_period
+      # FHIR-40299 adds USCDI MustSupport choices for:
+      # * address.period.end and address.use,
+      # * name.period.end and name.use
+      def update_patient_previous_name_address
         return unless profile.type == 'Patient'
 
-        must_supports[:elements].delete_if do |element|
-          element[:path] == 'address.period'
+        name_period_exists = false
+        name_use_exists = false
+        address_period_exists = false
+        address_use_exists = false
+
+        must_supports[:elements].each do |element|
+          case element[:path]
+          when 'name.period'
+            element[:path] = 'name.period.end'
+            element[:uscdi_only] = true
+            name_period_exists = true
+          when 'name.use'
+            element[:fixed_value] = 'old'
+            element[:uscdi_only] = true
+            name_use_exists = true
+          when 'address.period'
+            element[:path] = 'address.period.end'
+            element[:uscdi_only] = true
+            address_period_exists = true
+          when 'address.use'
+            element[:fixed_value] = 'old'
+            element[:uscdi_only] = true
+            address_use_exists = true
+          end
         end
+
+        must_supports[:elements] << {
+          path: 'name.period.end',
+          uscdi_only: true
+        } unless name_period_exists
+
+        must_supports[:elements] << {
+          path: 'name.use',
+          fixed_value: 'old',
+          uscdi_only: true
+        } unless name_use_exists
+
+        must_supports[:elements] << {
+          path: 'address.period.end',
+          uscdi_only: true
+        } unless address_period_exists
+
+        must_supports[:elements] << {
+          path: 'address.use',
+          fixed_value: 'old',
+          uscdi_only: true
+        } unless address_use_exists
+
+        must_supports[:choices] ||= []
+
+        must_supports[:choices] << {
+          paths: ['address.period.end', 'address.use'],
+          uscdi_only: true
+        }
+
+        must_supports[:choices] << {
+          paths: ['name.period.end', 'name.use'],
+          uscdi_only: true
+        }
+
       end
 
       # US Core clarified that server implmentation is not required to support DocumentReference.custodian (FHIR-28393)

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_4.rb

@@ -16,7 +16,6 @@ module USCoreTestKit
 
       def handle_special_cases
         add_must_support_choices
-        remove_patient_address_period
         add_device_distinct_identifier
         add_patient_uscdi_elements
       end
@@ -32,28 +31,11 @@ module USCoreTestKit
           choices << { paths: ['location.location', 'serviceProvider'] }
         when 'MedicationRequest'
           choices << { paths: ['reportedBoolean', 'reportedReference'] }
-        when 'Patient'
-          # FHIR-40299 adds USCDI MustSupport choices for:
-          # * address.period.end and address.use,
-          # * name.period.end and name.use
-          choices << {
-            paths: ['address.period.end', 'address.use'],
-            uscdi_only: true
-          }
-
-          choices << {
-            paths: ['name.period.end', 'name.use'],
-            uscdi_only: true
-          }
         end
 
         must_supports[:choices] = choices if choices.present?
       end
 
-      def remove_patient_address_period
-        us_core_3_extractor.remove_patient_address_period
-      end
-
       def add_device_distinct_identifier
         if profile.type == 'Device'
           # FHIR-36303 US Core 4.0.0 mistakenly removed MS from Device.distinctIdentifier
@@ -97,6 +79,7 @@ module USCoreTestKit
         }
 
         add_patient_telecom_communication_uscdi
+        us_core_3_extractor.update_patient_previous_name_address
       end
 
       def add_patient_telecom_communication_uscdi

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_5.rb

@@ -17,7 +17,6 @@ module USCoreTestKit
 
       def handle_special_cases
         add_must_support_choices
-        remove_patient_address_period
         add_patient_uscdi_elements
         remove_survey_questionnaire_response
       end
@@ -48,10 +47,6 @@ module USCoreTestKit
         end
       end
 
-      def remove_patient_address_period
-        us_core_4_extractor.remove_patient_address_period
-      end
-
       def add_patient_uscdi_elements
         return unless profile.type == 'Patient'
 
@@ -62,16 +57,6 @@ module USCoreTestKit
           url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity',
           uscdi_only: true
         }
-        must_supports[:elements] << {
-          path: 'address.use',
-          fixed_value: 'old',
-          uscdi_only: true
-        }
-        must_supports[:elements] << {
-          path: 'name.use',
-          fixed_value: 'old',
-          uscdi_only: true
-        }
       end
 
       def add_value_set_expansion

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_6.rb

@@ -12,6 +12,10 @@ module USCoreTestKit
         self.must_supports = must_supports
       end
 
+      def us_core_3_extractor
+        @us_core_3_extractor ||= MustSupportMetadataExtractorUsCore3.new(profile, must_supports)
+      end
+
       def us_core_4_extractor
         @us_core_4_extractor ||= MustSupportMetadataExtractorUsCore4.new(profile, must_supports)
       end
@@ -66,11 +70,10 @@ module USCoreTestKit
         return unless profile.type == 'Patient'
 
         us_core_4_extractor.add_patient_telecom_communication_uscdi
+        us_core_3_extractor.update_patient_previous_name_address
 
         must_supports[:elements].each do |element|
           case element[:path]
-          when 'address.use', 'name.use'
-            element[:fixed_value] = 'old'
           when 'deceased[x]'
             element[:original_path] = element[:path]
             element[:path] = 'deceasedDateTime'

data/lib/us_core_test_kit/generator/special_cases.rb

@@ -1,20 +1,29 @@
 module USCoreTestKit
   class Generator
     module SpecialCases
-      RESOURCES_TO_EXCLUDE = [
-        'Location',
-        'Medication',
-        'PractitionerRole'
-      ].freeze
+      RESOURCES_TO_EXCLUDE = {
+        'Location' => ['v311', 'v400', 'v501', 'v610'],
+        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
+        'PractitionerRole' => ['v311', 'v400']
+      }.freeze
 
       PROFILES_TO_EXCLUDE = [
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-survey',
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs'
       ].freeze
 
+      OPTIONAL_RESOURCES = [
+        'PractitionerRole',
+        'QuestionnaireResponse'
+      ].freeze
+
+      OPTIONAL_PROFILES = [
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation'
+      ].freeze
+
       NON_USCDI_RESOURCES = {
         'Encounter' => ['v311', 'v400'],
-        'Location' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
+        'Location' => ['v311', 'v400', 'v501', 'v610'],
         'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
         'Practitioner' => ['v311', 'v400'],
         'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
@@ -24,6 +33,7 @@ module USCoreTestKit
       }.freeze
 
       SEARCHABLE_DELAYED_RESOURCES = {
+        'Location' => ['v700_ballot'],
         'Practitioner' => ['v501', 'v610', 'v700_ballot']
       }.freeze
 
@@ -49,7 +59,7 @@ module USCoreTestKit
 
       class << self
         def exclude_group?(group)
-          RESOURCES_TO_EXCLUDE.include?(group.resource)
+          RESOURCES_TO_EXCLUDE.key?(group.resource) && RESOURCES_TO_EXCLUDE[group.resource].include?(group.reformatted_version)
         end
       end
     end

data/lib/us_core_test_kit/granular_scope_checker.rb

@@ -14,8 +14,8 @@ module USCoreTestKit
               "No #{resource_type} searches with search params #{search_param_names.join(' & ')} found"
 
       previous_request_resources.each do |previous_request, all_previous_resources|
-        params = previous_request.query_parameters
         search_method = previous_request.verb.to_sym
+        params = search_method == :get ? previous_request.query_parameters : Hash[URI.decode_www_form(previous_request.request_body)]
         fhir_search(resource_type, params:, search_method:)
 
         found_resources =

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.6.3'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -1200,6 +1200,14 @@ files:
 - lib/us_core_test_kit/generated/v5.0.1/practitioner/practitioner_read_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/practitioner/practitioner_validation_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/practitioner_group.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/metadata.yml
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_must_support_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_practitioner_search_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_read_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_reference_resolution_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_specialty_search_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role/practitioner_role_validation_test.rb
+- lib/us_core_test_kit/generated/v5.0.1/practitioner_role_group.rb
 - lib/us_core_test_kit/generated/v5.0.1/procedure/metadata.yml
 - lib/us_core_test_kit/generated/v5.0.1/procedure/procedure_must_support_test.rb
 - lib/us_core_test_kit/generated/v5.0.1/procedure/procedure_patient_code_date_search_test.rb
@@ -1396,16 +1404,6 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_encounter_diagnosis_read_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_encounter_diagnosis_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_encounter_diagnosis_validation_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_abatement_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_asserted_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_category_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_category_encounter_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_onset_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_recorded_date_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/condition_granular_scope1_group.rb
@@ -1445,8 +1443,6 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/device/device_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/device/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/device_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_granular_scope1_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_lab/diagnostic_report_lab_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_lab/diagnostic_report_lab_patient_category_date_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_lab/diagnostic_report_lab_patient_category_search_test.rb
@@ -1471,27 +1467,14 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_note_read_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_note_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_note_validation_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/diagnostic_report_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/diagnostic_report_note_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_id_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_id_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_must_support_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_category_date_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_category_date_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_category_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_category_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_status_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_type_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_type_period_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_type_period_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_patient_type_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_provenance_revinclude_search_test.rb
@@ -1499,8 +1482,6 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/document_reference_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference/metadata.yml
-- lib/us_core_test_kit/generated/v6.1.0/document_reference_granular_scope1_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/document_reference_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/document_reference_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/encounter/encounter_class_patient_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/encounter/encounter_date_patient_search_test.rb
@@ -1642,11 +1623,6 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_read_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_lab_validation_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_patient_category_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/observation_lab/observation_patient_code_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_lab_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/observation_occupation/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/observation_occupation/observation_occupation_must_support_test.rb
@@ -1761,6 +1737,14 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_read_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner_group.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/metadata.yml
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_must_support_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_practitioner_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_read_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_reference_resolution_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_specialty_search_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role/practitioner_role_validation_test.rb
+- lib/us_core_test_kit/generated/v6.1.0/practitioner_role_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/procedure/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/procedure/procedure_must_support_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/procedure/procedure_patient_code_date_search_test.rb
@@ -1826,27 +1810,18 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/respiratory_rate/respiratory_rate_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/respiratory_rate_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/metadata.yml
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_id_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_id_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_must_support_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_category_authored_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_category_authored_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_category_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_category_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_code_authored_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_code_authored_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_code_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_code_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_search_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_patient_status_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_provenance_revinclude_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_read_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request/service_request_validation_test.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request_granular_scope1_group.rb
-- lib/us_core_test_kit/generated/v6.1.0/service_request_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/service_request_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/simple_observation/metadata.yml
 - lib/us_core_test_kit/generated/v6.1.0/simple_observation/simple_observation_must_support_test.rb
@@ -2010,16 +1985,6 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_encounter_diagnosis_read_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_encounter_diagnosis_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_encounter_diagnosis_validation_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_abatement_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_asserted_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_category_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_category_encounter_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_clinical_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_onset_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/condition_patient_recorded_date_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/condition_granular_scope1_group.rb
@@ -2085,27 +2050,14 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_note_read_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_note_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_note_validation_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_code_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/diagnostic_report_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note_group.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_id_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_id_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_must_support_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_category_date_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_category_date_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_category_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_category_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_status_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_type_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_type_period_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_type_period_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_patient_type_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_provenance_revinclude_search_test.rb
@@ -2114,7 +2066,6 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/document_reference_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference_granular_scope1_group.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference_granular_scope2_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/document_reference_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/encounter/encounter_class_patient_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/encounter/encounter_date_patient_search_test.rb
@@ -2231,6 +2182,17 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/immunization/immunization_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/immunization/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/immunization_group.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_address_city_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_address_postalcode_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_address_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_address_state_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_must_support_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_name_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_reference_resolution_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/location_validation_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location/metadata.yml
+- lib/us_core_test_kit/generated/v7.0.0-ballot/location_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/medication_dispense/medication_dispense_must_support_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/medication_dispense/medication_dispense_patient_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/medication_dispense/medication_dispense_patient_status_search_test.rb
@@ -2279,11 +2241,6 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_lab_read_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_lab_reference_resolution_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_lab_validation_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_patient_category_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_patient_category_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_patient_category_status_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_patient_code_date_granular_scope_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab/observation_patient_code_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_lab_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_occupation/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/observation_occupation/observation_occupation_must_support_test.rb
@@ -2398,6 +2355,14 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner/practitioner_read_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner/practitioner_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_group.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/metadata.yml
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_must_support_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_practitioner_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_read_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_reference_resolution_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_specialty_search_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role/practitioner_role_validation_test.rb
+- lib/us_core_test_kit/generated/v7.0.0-ballot/practitioner_role_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/procedure/metadata.yml
 - lib/us_core_test_kit/generated/v7.0.0-ballot/procedure/procedure_must_support_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/procedure/procedure_patient_code_date_search_test.rb
@@ -2463,20 +2428,13 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/respiratory_rate/respiratory_rate_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/respiratory_rate_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_id_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_id_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_must_support_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_category_authored_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_category_authored_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_category_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_category_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_code_authored_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_code_authored_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_code_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_code_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_status_granular_scope_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_patient_status_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_provenance_revinclude_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/service_request/service_request_read_test.rb
@@ -2530,18 +2488,6 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0-ballot/treatment_intervention_preference/treatment_intervention_preference_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/treatment_intervention_preference_group.rb
 - lib/us_core_test_kit/generated/v7.0.0-ballot/us_core_test_suite.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/metadata.yml
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_must_support_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_patient_category_date_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_patient_category_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_patient_category_status_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_patient_code_date_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_patient_code_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_provenance_revinclude_search_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_read_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_reference_resolution_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs/vital_signs_validation_test.rb
-- lib/us_core_test_kit/generated/v7.0.0-ballot/vital_signs_group.rb
 - lib/us_core_test_kit/generator.rb
 - lib/us_core_test_kit/generator/granular_scope_group_generator.rb
 - lib/us_core_test_kit/generator/granular_scope_resource_type_group_generator.rb
@@ -2602,12 +2548,12 @@ files:
 - lib/us_core_test_kit/us_core_options.rb
 - lib/us_core_test_kit/validation_test.rb
 - lib/us_core_test_kit/version.rb
-homepage: https://github.com/inferno_framework/us-core-test-kit
+homepage: https://github.com/inferno-framework/us-core-test-kit
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://github.com/inferno_framework/us-core-test-kit
-  source_code_uri: https://github.com/inferno_framework/us-core-test-kit
+  homepage_uri: https://github.com/inferno-framework/us-core-test-kit
+  source_code_uri: https://github.com/inferno-framework/us-core-test-kit
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/us_core_test_kit/generated/v6.1.0/condition_encounter_diagnosis/condition_patient_abatement_date_granular_scope_test.rb

@@ -1,45 +0,0 @@
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../granular_scope_checker'
-
-module USCoreTestKit
-  module USCoreV610
-    class ConditionPatientAbatementDateGranularScopeTest < Inferno::Test
-      include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
-
-      title 'Server filters results for Condition search by patient + abatement-date based on granular scopes'
-      description %(
-This test repeats all Condition searches by
-patient + abatement-date and verifies that the results have been
-filtered based on the granted granular scopes.
-
-      )
-
-      id :us_core_v610_Condition_patient_abatement_date_granular_scope_test
-
-      input :patient_ids,
-        title: 'Patient IDs',
-        description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements'
-  
-      def self.properties
-        @properties ||= SearchTestProperties.new(
-          resource_type: 'Condition',
-        search_param_names: ['patient', 'abatement-date']
-        )
-      end
-
-      def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
-      end
-
-      def scratch_resources
-        scratch[:condition_encounter_diagnosis_resources] ||= {}
-      end
-
-      run do
-        run_scope_check_test
-      end
-    end
-  end
-end