us_core_test_kit 0.7.0 → 0.7.2

data/lib/us_core_test_kit/generated/v6.1.0/granular_scope_tests/observation/{observation_patient_code_granular_scope_test.rb → observation_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 ObservationPatientCodeGranularScopeTest < Inferno::Test
+    class ObservationPatientCodeGranularScopeSearchTest < Inferno::Test
       include USCoreTestKit::SearchTest
-      include USCoreTestKit::GranularScopeChecker
+      include USCoreTestKit::GranularScopeSearchTest
 
       title 'Server filters results for Observation search by patient + code based on granular scopes'
       description %(
@@ -16,7 +16,7 @@ filtered based on the granted granular scopes.
 
       )
 
-      id :us_core_v610_Observation_patient_code_granular_scope_test
+      id :us_core_v610_Observation_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_scopes1_group.rb

@@ -14,12 +14,8 @@ 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`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
-* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
 
       )
 

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

@@ -0,0 +1,51 @@
+require_relative './condition_granular_scope2_group'
+require_relative './observation_granular_scope2_group'
+
+module USCoreTestKit
+  module USCoreV610
+    class SmartGranularScopes2Group < Inferno::TestGroup
+      id :us_core_v610_smart_granular_scopes_2
+      title 'US Core FHIR API w/Granular Scopes 2'
+
+      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`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
+* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
+
+      )
+
+      input :granular_scopes_2_credentials,
+            title: 'SMART Credentials for Granular Scopes 2',
+            type: :oauth_credentials,
+            locked: true
+
+      config(
+        inputs: {
+          patient_ids: {
+            locked: true
+          },
+          received_scopes: {
+            title: 'Received Scopes',
+            locked: true
+          },
+          url: {
+            locked: true
+          }
+        }
+      )
+
+      fhir_client do
+        oauth_credentials :granular_scopes_2_credentials
+        url :url
+      end
+
+      group from: :us_core_v610_condition_granular_scope_2_group
+      group from: :us_core_v610_observation_granular_scope_2_group
+    end
+  end
+end

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

@@ -964,26 +964,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: []
@@ -4311,16 +4313,18 @@
   - :id: us_core_v610_observation_lab_reference_resolution_test
     :file_name: observation_lab_reference_resolution_test.rb
   :granular_scope_tests:
-  - :id: us_core_v610_Observation_patient_category_granular_scope_test
-    :file_name: observation_patient_category_granular_scope_test.rb
-  - :id: us_core_v610_Observation_patient_code_date_granular_scope_test
-    :file_name: observation_patient_code_date_granular_scope_test.rb
-  - :id: us_core_v610_Observation_patient_category_status_granular_scope_test
-    :file_name: observation_patient_category_status_granular_scope_test.rb
-  - :id: us_core_v610_Observation_patient_category_date_granular_scope_test
-    :file_name: observation_patient_category_date_granular_scope_test.rb
-  - :id: us_core_v610_Observation_patient_code_granular_scope_test
-    :file_name: observation_patient_code_granular_scope_test.rb
+  - :id: us_core_v610_Observation_patient_category_granular_scope_search_test
+    :file_name: observation_patient_category_granular_scope_search_test.rb
+  - :id: us_core_v610_Observation_patient_code_date_granular_scope_search_test
+    :file_name: observation_patient_code_date_granular_scope_search_test.rb
+  - :id: us_core_v610_Observation_patient_category_status_granular_scope_search_test
+    :file_name: observation_patient_category_status_granular_scope_search_test.rb
+  - :id: us_core_v610_Observation_patient_category_date_granular_scope_search_test
+    :file_name: observation_patient_category_date_granular_scope_search_test.rb
+  - :id: us_core_v610_Observation_patient_code_granular_scope_search_test
+    :file_name: observation_patient_code_granular_scope_search_test.rb
+  - :id: us_core_v610_Observation_granular_scope_read_test
+    :file_name: observation_granular_scope_read_test.rb
   :id: us_core_v610_observation_lab
   :file_name: observation_lab_group.rb
   :delayed_references:
@@ -12124,9 +12128,15 @@
   Condition:
   - :id: us_core_v610_condition_granular_scope_1_group
     :file_name: condition_granular_scope1_group.rb
+  - :id: us_core_v610_condition_granular_scope_2_group
+    :file_name: condition_granular_scope2_group.rb
   Observation:
   - :id: us_core_v610_observation_granular_scope_1_group
     :file_name: observation_granular_scope1_group.rb
+  - :id: us_core_v610_observation_granular_scope_2_group
+    :file_name: observation_granular_scope2_group.rb
 :granular_scope_groups:
 - :id: us_core_v610_smart_granular_scopes_1
   :file_name: granular_scopes1_group.rb
+- :id: us_core_v610_smart_granular_scopes_2
+  :file_name: granular_scopes2_group.rb

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

@@ -1,8 +1,9 @@
-require_relative './granular_scope_tests/observation/observation_patient_category_granular_scope_test'
-require_relative './granular_scope_tests/observation/observation_patient_code_date_granular_scope_test'
-require_relative './granular_scope_tests/observation/observation_patient_category_status_granular_scope_test'
-require_relative './granular_scope_tests/observation/observation_patient_category_date_granular_scope_test'
-require_relative './granular_scope_tests/observation/observation_patient_code_granular_scope_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_status_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV610
@@ -16,9 +17,6 @@ based on the following granular scopes:
 
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|laboratory`
 * `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|social-history`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
-* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
-* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
 
       )
 
@@ -26,11 +24,12 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v610_Observation_patient_category_granular_scope_test
-      test from: :us_core_v610_Observation_patient_code_date_granular_scope_test
-      test from: :us_core_v610_Observation_patient_category_status_granular_scope_test
-      test from: :us_core_v610_Observation_patient_category_date_granular_scope_test
-      test from: :us_core_v610_Observation_patient_code_granular_scope_test
+      test from: :us_core_v610_Observation_patient_category_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_status_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_granular_scope_search_test
+      test from: :us_core_v610_Observation_granular_scope_read_test
     end
   end
 end

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

@@ -0,0 +1,36 @@
+require_relative './granular_scope_tests/observation/observation_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_status_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_category_date_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/observation/observation_granular_scope_read_test'
+
+module USCoreTestKit
+  module USCoreV610
+    class ObservationGranularScope2Group < Inferno::TestGroup
+      title 'Observation Granular Scope Tests Tests'
+      short_description 'Verify support for the server capabilities required by the US Core Laboratory Result Observation 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:
+
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|vital-signs`
+* `Observation.rs?category=http://terminology.hl7.org/CodeSystem/observation-category|survey`
+* `Observation.rs?category=http://hl7.org/fhir/us/core/CodeSystem/us-core-category|sdoh`
+
+      )
+
+      id :us_core_v610_observation_granular_scope_2_group
+      run_as_group
+
+    
+      test from: :us_core_v610_Observation_patient_category_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_status_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_category_date_granular_scope_search_test
+      test from: :us_core_v610_Observation_patient_code_granular_scope_search_test
+      test from: :us_core_v610_Observation_granular_scope_read_test
+    end
+  end
+end

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

@@ -263,16 +263,18 @@
 - :id: us_core_v610_observation_lab_reference_resolution_test
   :file_name: observation_lab_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v610_Observation_patient_category_granular_scope_test
-  :file_name: observation_patient_category_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_code_date_granular_scope_test
-  :file_name: observation_patient_code_date_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_category_status_granular_scope_test
-  :file_name: observation_patient_category_status_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_category_date_granular_scope_test
-  :file_name: observation_patient_category_date_granular_scope_test.rb
-- :id: us_core_v610_Observation_patient_code_granular_scope_test
-  :file_name: observation_patient_code_granular_scope_test.rb
+- :id: us_core_v610_Observation_patient_category_granular_scope_search_test
+  :file_name: observation_patient_category_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_code_date_granular_scope_search_test
+  :file_name: observation_patient_code_date_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_category_status_granular_scope_search_test
+  :file_name: observation_patient_category_status_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_category_date_granular_scope_search_test
+  :file_name: observation_patient_category_date_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_patient_code_granular_scope_search_test
+  :file_name: observation_patient_code_granular_scope_search_test.rb
+- :id: us_core_v610_Observation_granular_scope_read_test
+  :file_name: observation_granular_scope_read_test.rb
 :id: us_core_v610_observation_lab
 :file_name: observation_lab_group.rb
 :delayed_references:

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

@@ -5,6 +5,7 @@ require_relative '../../custom_groups/v4.0.0/clinical_notes_guidance_group'
 require_relative '../../custom_groups/data_absent_reason_group'
 require_relative '../../custom_groups/smart_app_launch_group'
 require_relative '../../custom_groups/v6.1.0/smart_granular_scopes_group'
+require_relative '../../custom_groups/v6.1.0/screening_assessment_group'
 require_relative '../../provenance_validator'
 require_relative '../../us_core_options'
 
@@ -199,10 +200,11 @@ module USCoreTestKit
         group from: :us_core_v610_related_person
         group from: :us_core_v610_specimen
         group from: :us_core_v400_clinical_notes_guidance
+        group from: :us_core_v610_screening_assessment
         group from: :us_core_311_data_absent_reason
       end
 
-      group from: :'us_core_v610_smart_granular_scopes',
+      group from: :us_core_v610_smart_granular_scopes,
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
       
     end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/condition_encounter_diagnosis/metadata.yml

@@ -351,26 +351,28 @@
 - :id: us_core_v700_ballot_condition_encounter_diagnosis_reference_resolution_test
   :file_name: condition_encounter_diagnosis_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v700_ballot_Condition_patient_category_granular_scope_test
-  :file_name: condition_patient_category_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_granular_scope_test
-  :file_name: condition_patient_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_test
-  :file_name: condition_patient_asserted_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_onset_date_granular_scope_test
-  :file_name: condition_patient_onset_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_code_granular_scope_test
-  :file_name: condition_patient_code_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_test
-  :file_name: condition_patient_recorded_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_test
-  :file_name: condition_patient_abatement_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_test
-  :file_name: condition_patient_category_clinical_status_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_test
-  :file_name: condition_patient_category_encounter_granular_scope_test.rb
-- :id: us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_test
-  :file_name: condition_patient_clinical_status_granular_scope_test.rb
+- :id: us_core_v700_ballot_Condition_patient_category_granular_scope_search_test
+  :file_name: condition_patient_category_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_granular_scope_search_test
+  :file_name: condition_patient_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_search_test
+  :file_name: condition_patient_asserted_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_onset_date_granular_scope_search_test
+  :file_name: condition_patient_onset_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_code_granular_scope_search_test
+  :file_name: condition_patient_code_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_search_test
+  :file_name: condition_patient_recorded_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_search_test
+  :file_name: condition_patient_abatement_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_category_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_search_test
+  :file_name: condition_patient_category_encounter_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_search_test
+  :file_name: condition_patient_clinical_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_Condition_granular_scope_read_test
+  :file_name: condition_granular_scope_read_test.rb
 :id: us_core_v700_ballot_condition_encounter_diagnosis
 :file_name: condition_encounter_diagnosis_group.rb
 :delayed_references: []

data/lib/us_core_test_kit/generated/v7.0.0-ballot/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_asserted_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_onset_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_code_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_recorded_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_category_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_clinical_status_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_asserted_date_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_code_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_abatement_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_category_encounter_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_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
@@ -28,16 +29,17 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v700_ballot_Condition_patient_category_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_onset_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_code_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_test
+      test from: :us_core_v700_ballot_Condition_patient_category_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_onset_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_code_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_granular_scope_read_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/condition_granular_scope2_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_asserted_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_onset_date_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_code_granular_scope_test'
-require_relative './granular_scope_tests/condition/condition_patient_recorded_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_category_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_clinical_status_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_asserted_date_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_code_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_abatement_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_category_encounter_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_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
@@ -27,16 +28,17 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v700_ballot_Condition_patient_category_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_onset_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_code_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_test
-      test from: :us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_test
+      test from: :us_core_v700_ballot_Condition_patient_category_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_asserted_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_onset_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_code_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_recorded_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_abatement_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_category_clinical_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_category_encounter_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_patient_clinical_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_Condition_granular_scope_read_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_granular_scope1_group.rb

@@ -1,9 +1,10 @@
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
@@ -24,12 +25,13 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_granular_scope_read_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_granular_scope2_group.rb

@@ -1,9 +1,10 @@
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_test'
-require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_category_date_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_status_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_patient_code_date_granular_scope_search_test'
+require_relative './granular_scope_tests/diagnostic_report/diagnostic_report_granular_scope_read_test'
 
 module USCoreTestKit
   module USCoreV700_BALLOT
@@ -24,12 +25,13 @@ based on the following granular scopes:
       run_as_group
 
     
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_test
-      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_search_test
+      test from: :us_core_v700_ballot_DiagnosticReport_granular_scope_read_test
     end
   end
 end

data/lib/us_core_test_kit/generated/v7.0.0-ballot/diagnostic_report_note/metadata.yml

@@ -272,18 +272,20 @@
 - :id: us_core_v700_ballot_diagnostic_report_note_reference_resolution_test
   :file_name: diagnostic_report_note_reference_resolution_test.rb
 :granular_scope_tests:
-- :id: us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_test
-  :file_name: diagnostic_report_patient_category_granular_scope_test.rb
-- :id: us_core_v700_ballot_DiagnosticReport_patient_granular_scope_test
-  :file_name: diagnostic_report_patient_granular_scope_test.rb
-- :id: us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_test
-  :file_name: diagnostic_report_patient_category_date_granular_scope_test.rb
-- :id: us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_test
-  :file_name: diagnostic_report_patient_code_granular_scope_test.rb
-- :id: us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_test
-  :file_name: diagnostic_report_patient_status_granular_scope_test.rb
-- :id: us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_test
-  :file_name: diagnostic_report_patient_code_date_granular_scope_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_category_granular_scope_search_test
+  :file_name: diagnostic_report_patient_category_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_granular_scope_search_test
+  :file_name: diagnostic_report_patient_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_category_date_granular_scope_search_test
+  :file_name: diagnostic_report_patient_category_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_code_granular_scope_search_test
+  :file_name: diagnostic_report_patient_code_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_status_granular_scope_search_test
+  :file_name: diagnostic_report_patient_status_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_patient_code_date_granular_scope_search_test
+  :file_name: diagnostic_report_patient_code_date_granular_scope_search_test.rb
+- :id: us_core_v700_ballot_DiagnosticReport_granular_scope_read_test
+  :file_name: diagnostic_report_granular_scope_read_test.rb
 :id: us_core_v700_ballot_diagnostic_report_note
 :file_name: diagnostic_report_note_group.rb
 :delayed_references: