us_core_test_kit 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff99afacbf38abd7c8c459ab425b3e58c763a9ff721f9447562d62ff6e5dba66
-  data.tar.gz: b69ed849fd8588b2f8fe029cee922d78b46ba639de36ccd174efe94fe3da60eb
+  metadata.gz: cc3ca68e2a7b8f7609f1eaf4f983afd2813252e706a65f096733412d3aa4e118
+  data.tar.gz: 3458eaaeb4d904b728b16f92524da58598d1d84d12b82458614d014d8959efcc
 SHA512:
-  metadata.gz: c64bede1519c6c76aa1e6fdb82f87036ccce90f88d238bb0af3fa35d7080246206a0cfedb0cbc57e0ad8aaf1769b1fa1297b5db50a1a5c0a35b6dc861664828a
-  data.tar.gz: 41a2be6bc4932c82fe6ef1ebe48027c556fec81ff8e3e7c72bcd77bb02de6ccb6161ea16772de78f7df2679facf6f7b798c1fbc9656a4fa2f20d96db6ee6d9fb
+  metadata.gz: 0b8df109a82023aa02b8eeadfd4a024cd41e1b00570c6d7e3aa55e68d910ac17031874e62bed5f8a09392f5b6b70cc594a6a60ec47b1c1c34620f71c526f2d2f
+  data.tar.gz: 87e2ed36f19a5a5815d13c64f74afa0b8c3824fa751fb52b5b013bf9f0449b3d2d47bf36e8d9bd26341e6cd25a8731a27d7f8a1b5fe38ce21c250a02187ab37b

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/capability_statement/instantiate_test.rb

@@ -12,8 +12,12 @@ module USCoreTestKit
       assert_resource_type(:capability_statement)
       capability_statement = resource
 
-      assert capability_statement.instantiates.include?('http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'),
-        "Server CapabilityStatement.instantiates does not include 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'"
+      include_us_core = capability_statement.instantiates&.any? do |url|
+        url.split('|').first == 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'
+      end
+
+      assert include_us_core,
+             "Server CapabilityStatement.instantiates does not include 'http://hl7.org/fhir/us/core/CapabilityStatement/us-core-server'"
     end
   end
 end

data/lib/us_core_test_kit/custom_groups/capability_statement/profile_support_test.rb

@@ -20,13 +20,15 @@ module USCoreTestKit
       assert_resource_type(:capability_statement)
       capability_statement = resource
 
-      supported_profiles =
-        capability_statement.rest
-          &.each_with_object([]) do |rest, profiles|
-            rest.resource.each { |resource| profiles.concat(resource.supportedProfile) }
-          end.uniq
+      supported_profiles = capability_statement.rest&.flat_map do |rest|
+        rest.resource.flat_map do |resource|
+          # Remove trailing version from canonical url
+          resource.supportedProfile&.map { |profile| profile.split('|').first }
+        end.compact
+      end&.uniq || []
 
-      assert supported_profiles.include?('http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'), 'US Core Patient profile not supported'
+      assert supported_profiles.include?('http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'),
+             'US Core Patient profile not supported'
 
       us_core_profiles = config.options[:us_core_profiles]
 
@@ -45,7 +47,8 @@ module USCoreTestKit
             .join(', ')
 
         assert missing_profiles.empty?,
-               "The CapabilityStatement did not list support for the following resources: #{missing_profiles_list}"
+               'The CapabilityStatement does not list support for the following' \
+               "US Core profiles: #{missing_profiles_list}"
       end
     end
   end

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/smart_scopes_constants.rb

@@ -6,12 +6,8 @@ module USCoreTestKit
       'v610' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis',
           'patient/Condition.rs?category=http://hl7.org/fhir/us/core/CodeSystem/condition-category|health-concern',
-          'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
           'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory',
           'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history',
-          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs',
-          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey',
-          'patient/Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh'
         ].map(&:freeze).freeze,
       'v700_ballot' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|encounter-diagnosis',
@@ -28,6 +24,12 @@ module USCoreTestKit
     }.freeze
 
     SMART_GRANULAR_SCOPES_GROUP2 = {
+      'v610' => [
+          'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
+          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs',
+          'patient/Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey',
+          'patient/Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh'
+      ].map(&:freeze).freeze,
       'v700_ballot' => [
           'patient/Condition.rs?category=http://terminology.hl7.org/CodeSystem/condition-category|problem-list-item',
           'patient/DiagnosticReport.rs?category=http://loinc.org|LP7839-6',

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/v6.1.0/smart_granular_scopes_group.rb

@@ -1,33 +1,12 @@
 require_relative '../base_smart_granular_scopes_group'
-require_relative '../smart_scopes_constants'
-require_relative '../granted_granular_scopes_test'
 require_relative '../../generated/v6.1.0/granular_scopes1_group'
+require_relative '../../generated/v6.1.0/granular_scopes2_group'
 
 module USCoreTestKit
   module USCoreV610
-    class SmartGranularScopesGroup < Inferno::TestGroup
-      include SmartScopesConstants
-      title 'US Core SMART Granular Scopes'
+    class SmartGranularScopesGroup < BaseSmartGranularScopesGroup
       id :us_core_v610_smart_granular_scopes
-
-      description <<~DESCRIPTION
-        These tests verify that servers honor [SMART App Launch granular
-        scopes](http://hl7.org/fhir/smart-app-launch/STU2/scopes-and-launch-context.html#finer-grained-resource-constraints-using-search-parameters).
-        Support for these scopes is [required in US Core
-        7](http://hl7.org/fhir/us/core/2024Jan/scopes.html#us-core-scopes).
-
-        Prior to running these tests, first run the US Core FHIR API tests using
-        resource-level scopes. This group includes a SMART App Launch followed by
-        FHIR API tests. The app launches require that a granular scopes be
-        granted. The FHIR API tests then repeat all of the queries from the
-        original FHIR API tests that were run using resource-level scopes, and
-        verify that only resources matching the granted granular scopes are
-        returned.
-      DESCRIPTION
-
-      def self.default_group_scopes(version)
-        [DEFAULT_SCOPES, *SMART_GRANULAR_SCOPES_GROUP1[version]].join(' ')
-      end
+      title 'US Core SMART Granular Scopes'
 
       def self.scopes_string(scopes)
         scopes
@@ -36,91 +15,65 @@ module USCoreTestKit
           .join("\n")
       end
 
-      config(
-        inputs: {
-          url: {
-            locked: true
+      groups
+        .first
+        .description %(
+These tests perform a SMART app launch to receive the following granular scopes:
+
+#{scopes_string(SMART_GRANULAR_SCOPES_GROUP1['v610'])}
+
+Then all of the searches which have been performed in the US Core FHIR API tests
+are repeated to verify that the results have been filtered according to the
+above scopes.
+        )
+
+      groups
+        .first
+        .config(
+          inputs: {
+            requested_scopes: {
+              name: :requested_scopes_group1,
+              default: groups.first.default_group_scopes('v610')
+            }
           },
-          requested_scopes: {
-            name: :requested_scopes_group1,
-            default: default_group_scopes('v610')
+          options: {
+            required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
           }
-        }
-      )
-
-      group do
-        title 'SMART App Launch w/Granular Scopes'
+        )
 
-        def self.scopes_string(scopes)
-          scopes
-            .map { |scope| scope.delete_prefix 'patient/' }
-            .map { |scope| "* `#{scope}`" }
-            .join("\n")
-        end
+      groups
+        .first
+        .group from: :us_core_v610_smart_granular_scopes_1
 
-        description %(
+      groups
+        .last
+        .description %(
 These tests perform a SMART app launch to receive the following granular scopes:
 
-#{scopes_string(SMART_GRANULAR_SCOPES_GROUP1['v610'])}
+#{scopes_string(SMART_GRANULAR_SCOPES_GROUP2['v610'])}
 
 Then all of the searches which have been performed in the US Core FHIR API tests
 are repeated to verify that the results have been filtered according to the
 above scopes.
         )
 
-        config(
-          outputs: {
-            smart_credentials: {
-              name: :granular_scopes_1_credentials
+      groups
+        .last
+        .config(
+          inputs: {
+            requested_scopes: {
+              name: :requested_scopes_group2,
+              default: groups.last.default_group_scopes('v610')
             }
+          },
+          options: {
+            required_scopes: SMART_GRANULAR_SCOPES_GROUP2['v610']
           }
         )
-        group from: :us_core_smart_standalone_launch_stu2,
-              optional: true,
-              config: {
-                inputs: {
-                  smart_credentials: {
-                    name: :granular_scopes_1_credentials
-                  }
-                }
-              } do
-          groups[1].test from: :us_core_granted_granular_scopes,
-                         config: {
-                           inputs: {
-                             received_scopes: {
-                               name: :standalone_received_scopes
-                             }
-                           },
-                           options: {
-                             required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
-                           }
-                         }
-        end
-        group from: :us_core_smart_ehr_launch_stu2,
-              optional: true,
-              config: {
-                inputs: {
-                  smart_credentials: {
-                    name: :granular_scopes_1_credentials
-                  }
-                }
-              } do
-          groups[1].test from: :us_core_granted_granular_scopes,
-                         config: {
-                           inputs: {
-                             received_scopes: {
-                               name: :ehr_received_scopes
-                             }
-                           },
-                           options: {
-                             required_scopes: SMART_GRANULAR_SCOPES_GROUP1['v610']
-                           }
-                         }
-        end
-      end
 
-      group from: :us_core_v610_smart_granular_scopes_1,
-            title: 'US Core FHIR API w/Granular Scopes'
+      groups
+        .last
+        .group from: :us_core_v610_smart_granular_scopes_2
     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
@@ -21,7 +22,6 @@ 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`
 
       )
 
@@ -29,16 +29,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_granular_scope2_group.rb

@@ -0,0 +1,44 @@
+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
+    class ConditionGranularScope2Group < Inferno::TestGroup
+      title 'Condition Granular Scope Tests Tests'
+      short_description 'Verify support for the server capabilities required by the US Core Condition Encounter Diagnosis Profile.'
+      description %(
+  The tests in this group repeat all of the searches from the US Core
+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|problem-list-item`
+
+      )
+
+      id :us_core_v610_condition_granular_scope_2_group
+      run_as_group
+
+    
+      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