us_core_test_kit 0.11.4 → 0.11.5

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_must_support_test.rb

@@ -21,6 +21,11 @@ module USCoreTestKit
         * Observation.valueCodeableConcept
         * Observation.valueString
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@1', 'hl7.fhir.us.core_7.0.0@13',
+                            'hl7.fhir.us.core_7.0.0@75', 'hl7.fhir.us.core_7.0.0@87',
+                            'hl7.fhir.us.core_7.0.0@88', 'hl7.fhir.us.core_7.0.0@90',
+                            'hl7.fhir.us.core_7.0.0@91', 'hl7.fhir.us.core_7.0.0@111',
+                            'hl7.fhir.us.core_7.0.0@115'
 
       id :us_core_v700_treatment_intervention_preference_must_support_test
 

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_patient_category_date_search_test.rb

@@ -16,6 +16,8 @@ none are returned, the test is skipped.
 [US Core Server CapabilityStatement](http://hl7.org/fhir/us/core/STU7/CapabilityStatement-us-core-server.html)
 
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
+                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58'
 
       id :us_core_v700_treatment_intervention_preference_patient_category_date_search_test
       input :patient_ids,

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_patient_category_search_test.rb

@@ -16,6 +16,8 @@ none are returned, the test is skipped.
 [US Core Server CapabilityStatement](http://hl7.org/fhir/us/core/STU7/CapabilityStatement-us-core-server.html)
 
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
+                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58'
 
       id :us_core_v700_treatment_intervention_preference_patient_category_search_test
       input :patient_ids,

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_patient_code_search_test.rb

@@ -29,6 +29,8 @@ requirement of US Core v7.0.0.
 [US Core Server CapabilityStatement](http://hl7.org/fhir/us/core/STU7/CapabilityStatement-us-core-server.html)
 
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
+                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58'
 
       id :us_core_v700_treatment_intervention_preference_patient_code_search_test
       input :patient_ids,

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_reference_resolution_test.rb

@@ -17,6 +17,7 @@ module USCoreTestKit
 
         * Observation.subject
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@105', 'hl7.fhir.us.core_7.0.0@109'
 
       id :us_core_v700_treatment_intervention_preference_reference_resolution_test
 

data/lib/us_core_test_kit/generated/v7.0.0/treatment_intervention_preference/treatment_intervention_preference_validation_test.rb

@@ -19,6 +19,10 @@ to the bound ValueSet. Quantity, Coding, and code element bindings will
 fail if their code/system are not found in the valueset.
 
       )
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@18', 'hl7.fhir.us.core_7.0.0@19',
+                            'hl7.fhir.us.core_7.0.0@20', 'hl7.fhir.us.core_7.0.0@21',
+                            'hl7.fhir.us.core_7.0.0@23', 'hl7.fhir.us.core_7.0.0@27',
+                            'hl7.fhir.us.core_7.0.0@40', 'hl7.fhir.us.core_7.0.0@74'
       output :dar_code_found, :dar_extension_found
 
       def resource_type

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

@@ -88,8 +88,8 @@ module USCoreTestKit
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Constraint failed: provenance-1/, #Invalid invariant in US Core v5.0.1
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
-        %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         /\A\S+: \S+: URL value '.*' does not resolve/,
+        /\A\S+: \S+: No definition could be found for URL value '.*'/,
         %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'}, # Known issue with the Pulse Oximetry Profile
         %r{Slice 'Observation\.value\[x\]:valueQuantity': a matching slice is required, but not found \(from (http://hl7\.org/fhir/StructureDefinition/bmi\|4\.0\.1|http://hl7\.org/fhir/StructureDefinition/bmi\%7C4\.0\.1)\)}
       ].freeze
@@ -106,6 +106,16 @@ module USCoreTestKit
 
       id :us_core_v700
 
+      requirement_sets(
+        {
+          identifier: 'hl7.fhir.us.core_7.0.0',
+          title: 'US Core Implementation Guide',
+          actor: 'Server'
+        }
+      )
+
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@535'
+
       fhir_resource_validator do
         igs 'hl7.fhir.us.core#7.0.0'
         message_filters = VALIDATION_MESSAGE_FILTERS
@@ -222,9 +232,11 @@ module USCoreTestKit
         group from: :us_core_v700_provenance
         group from: :us_core_v700_related_person
         group from: :us_core_v700_specimen
-        group from: :us_core_v400_clinical_notes_guidance
+        group from: :us_core_v400_clinical_notes_guidance,
+              verifies_requirements: ['hl7.fhir.us.core_7.0.0@206', 'hl7.fhir.us.core_7.0.0@207', 'hl7.fhir.us.core_7.0.0@208', 'hl7.fhir.us.core_7.0.0@209', 'hl7.fhir.us.core_7.0.0@210', 'hl7.fhir.us.core_7.0.0@211', 'hl7.fhir.us.core_7.0.0@212', 'hl7.fhir.us.core_7.0.0@213', 'hl7.fhir.us.core_7.0.0@214', 'hl7.fhir.us.core_7.0.0@215', 'hl7.fhir.us.core_7.0.0@216', 'hl7.fhir.us.core_7.0.0@220', 'hl7.fhir.us.core_7.0.0@221', 'hl7.fhir.us.core_7.0.0@223', 'hl7.fhir.us.core_7.0.0@224', 'hl7.fhir.us.core_7.0.0@231']
         group from: :us_core_v700_screening_assessment
-        group from: :us_core_311_data_absent_reason
+        group from: :us_core_311_data_absent_reason,
+              verifies_requirements: ['hl7.fhir.us.core_7.0.0@41', 'hl7.fhir.us.core_7.0.0@45']
       end
 
       group from: :us_core_v700_smart_granular_scopes,

data/lib/us_core_test_kit/generator/group_generator.rb

@@ -24,7 +24,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -24,7 +24,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/provenance_revinclude_search_test_generator.rb

@@ -26,7 +26,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/read_test_generator.rb

@@ -70,7 +70,7 @@ module USCoreTestKit
 
       def resource_collection_string
         if group_metadata.delayed? && resource_type != 'Provenance'
-          "scratch.dig(:references, '#{resource_type}')"
+          "scratch.dig(:references, '#{resource_type}'), delayed_reference: true"
         else
           'all_scratch_resources'
         end
@@ -82,7 +82,7 @@ module USCoreTestKit
 
       def generate
         FileUtils.mkdir_p(output_file_directory)
-        File.open(output_file_name, 'w') { |f| f.write(output) }
+        File.write(output_file_name, output)
 
         group_metadata.add_test(
           id: test_id,

data/lib/us_core_test_kit/generator/reference_resolution_test_generator.rb

@@ -24,7 +24,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/search_test_generator.rb

@@ -28,7 +28,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -35,7 +35,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/generator/templates/group.rb.erb

@@ -13,6 +13,16 @@ module USCoreTestKit
       run_as_group<% if optional? %>
       optional
       <% end %>
+      <%-
+        requirement_map = {
+              'QuestionnaireResponseGroup' => '511'
+        }
+        if module_name == 'USCoreV610' && requirement_map[class_name]
+      -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@<%= requirement_map[class_name] -%>'
+      <%- elsif module_name == 'USCoreV700' && requirement_map[class_name] -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@<%= requirement_map[class_name] %>'
+      <%- end -%>
 
       def self.metadata
         @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, '<%= profile_identifier %>', 'metadata.yml'), aliases: true))

data/lib/us_core_test_kit/generator/templates/must_support.rb.erb

@@ -18,6 +18,39 @@ module USCoreTestKit
 
 <%= uscdi_list_string %><% end %>
       )
+      <%-
+  requirement_map = {
+        'AllergyIntoleranceMustSupportTest' => ['304'],
+        'ConditionEncounterDiagnosisMustSupportTest' => ['325', '326'],
+        'CareTeamMustSupportTest' => ['313'],
+        'DiagnosticReportNoteMustSupportTest' => ['360'],
+        'DocumentReferenceMustSupportTest' => ['368'],
+        'EncounterMustSupportTest' => ['375', '379'],
+        'GoalMustSupportTest' => ['387'],
+        'MedicationRequestMustSupportTest' => ['408'],
+        'ObservationScreeningAssessmentMustSupportTest' => ['439'],
+        'OrganizationMustSupportTest' => ['455']
+  }-%>
+      <%- if module_name == 'USCoreV610' -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@1', 'hl7.fhir.us.core_6.1.0@13',
+                            'hl7.fhir.us.core_6.1.0@75', 'hl7.fhir.us.core_6.1.0@87',
+                            'hl7.fhir.us.core_6.1.0@88', 'hl7.fhir.us.core_6.1.0@90',
+                            'hl7.fhir.us.core_6.1.0@91', 'hl7.fhir.us.core_6.1.0@111',
+                            'hl7.fhir.us.core_6.1.0@115'<% if requirement_map[class_name] %>,
+                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_6.1.0@#{id}'" }.join(', ') %>
+        <%- end -%>
+
+      <%- end -%>
+      <%- if module_name == 'USCoreV700' -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@1', 'hl7.fhir.us.core_7.0.0@13',
+                            'hl7.fhir.us.core_7.0.0@75', 'hl7.fhir.us.core_7.0.0@87',
+                            'hl7.fhir.us.core_7.0.0@88', 'hl7.fhir.us.core_7.0.0@90',
+                            'hl7.fhir.us.core_7.0.0@91', 'hl7.fhir.us.core_7.0.0@111',
+                            'hl7.fhir.us.core_7.0.0@115'<% if requirement_map[class_name] %>,
+                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_7.0.0@#{id}'" }.join(', ') %>
+        <%- end -%>
+
+      <%- end -%>
 
       id :<%= test_id %>
 

data/lib/us_core_test_kit/generator/templates/provenance_revinclude_search.rb.erb

@@ -15,11 +15,50 @@ module USCoreTestKit
       %)
 
       id :<%= test_id %>
-  <% if needs_patient_id? %>
+  
+      <%-
+        requirement_map = {
+              'AllergyIntoleranceProvenanceRevincludeSearchTest' => '489',
+              'CarePlanProvenanceRevincludeSearchTest' => '490',
+              'CareTeamProvenanceRevincludeSearchTest' => '491',
+              'ConditionEncounterDiagnosisProvenanceRevincludeSearchTest' => '492',
+              'ConditionProblemsHealthConcernsProvenanceRevincludeSearchTest' => '492',
+              'CoverageProvenanceRevincludeSearchTest' => '493',
+              'DeviceProvenanceRevincludeSearchTest' => '494',
+              'DiagnosticReportLabProvenanceRevincludeSearchTest' => '495',
+              'DiagnosticReportNoteProvenanceRevincludeSearchTest' => '495',
+              'DocumentReferenceProvenanceRevincludeSearchTest' => '496',
+              'EncounterProvenanceRevincludeSearchTest' => '497',
+              'GoalProvenanceRevincludeSearchTest' => '498',
+              'ImmunizationProvenanceRevincludeSearchTest' => '499',
+              'MedicationDispenseProvenanceRevincludeSearchTest' => '500',
+              'MedicationRequestProvenanceRevincludeSearchTest' => '501',
+              'ObservationLabProvenanceRevincludeSearchTest' => '502',
+              'ObservationOccupationProvenanceRevincludeSearchTest' => '502',
+              'ObservationPregnancyintentProvenanceRevincludeSearchTest' => '502',
+              'ObservationPregnancystatusProvenanceRevincludeSearchTest' => '502',
+              'ObservationScreeningAssessmentProvenanceRevincludeSearchTest' => '502',
+              'ObservationSexualOrientationProvenanceRevincludeSearchTest' => '502',
+              'PatientProvenanceRevincludeSearchTest' => '503',
+              'ProcedureProvenanceRevincludeSearchTest' => '504',
+              'QuestionnaireResponseProvenanceRevincludeSearchTest' => '505',
+              'RelatedPersonProvenanceRevincludeSearchTest' => '506',
+              'ServiceRequestProvenanceRevincludeSearchTest' => '507'
+        }
+        if module_name == 'USCoreV610' && requirement_map[class_name]
+      -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@<%= requirement_map[class_name] %>'
+
+      <%- elsif module_name == 'USCoreV700' && requirement_map[class_name] -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@<%= requirement_map[class_name] %>'
+
+      <%- end -%>
+      <%- if needs_patient_id? -%>
       input :patient_ids,
         title: 'Patient IDs',
         description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements'
-  <% end %>
+  
+      <%- end -%>
       def properties
         @properties ||= SearchTestProperties.new(
   <%= search_test_properties_string %>

data/lib/us_core_test_kit/generator/templates/reference_resolution.rb.erb

@@ -17,6 +17,11 @@ module USCoreTestKit
 
 <%= must_support_reference_list_string %>
       )
+      <%- if module_name == "USCoreV610" -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@105', 'hl7.fhir.us.core_6.1.0@109'
+      <%- elsif module_name == "USCoreV700" -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@105', 'hl7.fhir.us.core_7.0.0@109'
+      <%- end -%>
 
       id :<%= test_id %>
 

data/lib/us_core_test_kit/generator/templates/search.rb.erb

@@ -10,6 +10,21 @@ module USCoreTestKit
       description %(
 <%= description %>
       )
+      <%- if module_name == "USCoreV610" && !optional? && test_medication_inclusion? -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@51', 'hl7.fhir.us.core_6.1.0@52',
+                            'hl7.fhir.us.core_6.1.0@55', 'hl7.fhir.us.core_6.1.0@58',
+                            'hl7.fhir.us.core_6.1.0@250'
+      <%- elsif module_name == "USCoreV700" && !optional? && test_medication_inclusion? -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
+                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58',
+                            'hl7.fhir.us.core_7.0.0@250'
+      <%- elsif module_name == "USCoreV610" && !optional? -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@51', 'hl7.fhir.us.core_6.1.0@52',
+                            'hl7.fhir.us.core_6.1.0@55', 'hl7.fhir.us.core_6.1.0@58'
+      <%- elsif module_name == "USCoreV700" && !optional? -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@51', 'hl7.fhir.us.core_7.0.0@52',
+                            'hl7.fhir.us.core_7.0.0@55', 'hl7.fhir.us.core_7.0.0@58'
+      <%- end -%>
 
       id :<%= test_id %><% if optional? %>
       optional

data/lib/us_core_test_kit/generator/templates/suite.rb.erb

@@ -39,8 +39,8 @@ module USCoreTestKit
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Constraint failed: provenance-1/, #Invalid invariant in US Core v5.0.1
         %r{Unknown Code System 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags'}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
-        %r{URL value 'http://hl7.org/fhir/us/core/CodeSystem/us-core-tags' does not resolve}, # Validator has an issue with this US Core 5 code system in US Core 6 resource
         /\A\S+: \S+: URL value '.*' does not resolve/,
+        /\A\S+: \S+: No definition could be found for URL value '.*'/,
         %r{Observation.component\[\d+\].value.ofType\(Quantity\): The code provided \(http://unitsofmeasure.org#L/min\) was not found in the value set 'Vital Signs Units'}, # Known issue with the Pulse Oximetry Profile
         %r{Slice 'Observation\.value\[x\]:valueQuantity': a matching slice is required, but not found \(from (http://hl7\.org/fhir/StructureDefinition/bmi\|4\.0\.1|http://hl7\.org/fhir/StructureDefinition/bmi\%7C4\.0\.1)\)}
       ].freeze
@@ -60,6 +60,32 @@ module USCoreTestKit
       end
 
       id :<%= suite_id %>
+      <%- if module_name == 'USCoreV610'-%>
+
+      requirement_sets(
+        {
+          identifier: 'hl7.fhir.us.core_6.1.0',
+          title: 'US Core Implementation Guide',
+          actor: 'Server'
+        }
+      )
+      <%- elsif module_name == 'USCoreV700'-%>
+
+      requirement_sets(
+        {
+          identifier: 'hl7.fhir.us.core_7.0.0',
+          title: 'US Core Implementation Guide',
+          actor: 'Server'
+        }
+      )
+      <%- end -%>
+      <%- if module_name == 'USCoreV610'-%>
+
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@535'
+      <%- elsif module_name == 'USCoreV700'-%>
+
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@535'
+      <%- end -%>
 
       fhir_resource_validator do
         igs '<%= ig_identifier %>'
@@ -128,9 +154,27 @@ module USCoreTestKit
         group from: :<%= capability_statement_group_id %>
       <% group_id_list.each do |id| %>
         group from: :<%= id %><% end %>
-        group from: :<%= clinical_notes_guidance_group_id %><%if us_core_6_and_above? %>
-        group from: :<%= screening_assessment_id %><% end %>
+        <%- if module_name == 'USCoreV610'-%>
+        group from: :<%= clinical_notes_guidance_group_id %>,
+              verifies_requirements: ['hl7.fhir.us.core_6.1.0@206', 'hl7.fhir.us.core_6.1.0@207', 'hl7.fhir.us.core_6.1.0@208', 'hl7.fhir.us.core_6.1.0@209', 'hl7.fhir.us.core_6.1.0@210', 'hl7.fhir.us.core_6.1.0@211', 'hl7.fhir.us.core_6.1.0@212', 'hl7.fhir.us.core_6.1.0@213', 'hl7.fhir.us.core_6.1.0@214', 'hl7.fhir.us.core_6.1.0@215', 'hl7.fhir.us.core_6.1.0@216', 'hl7.fhir.us.core_6.1.0@220', 'hl7.fhir.us.core_6.1.0@221', 'hl7.fhir.us.core_6.1.0@223', 'hl7.fhir.us.core_6.1.0@224', 'hl7.fhir.us.core_6.1.0@231']
+        <%- elsif module_name == 'USCoreV700'-%>
+        group from: :<%= clinical_notes_guidance_group_id %>,
+              verifies_requirements: ['hl7.fhir.us.core_7.0.0@206', 'hl7.fhir.us.core_7.0.0@207', 'hl7.fhir.us.core_7.0.0@208', 'hl7.fhir.us.core_7.0.0@209', 'hl7.fhir.us.core_7.0.0@210', 'hl7.fhir.us.core_7.0.0@211', 'hl7.fhir.us.core_7.0.0@212', 'hl7.fhir.us.core_7.0.0@213', 'hl7.fhir.us.core_7.0.0@214', 'hl7.fhir.us.core_7.0.0@215', 'hl7.fhir.us.core_7.0.0@216', 'hl7.fhir.us.core_7.0.0@220', 'hl7.fhir.us.core_7.0.0@221', 'hl7.fhir.us.core_7.0.0@223', 'hl7.fhir.us.core_7.0.0@224', 'hl7.fhir.us.core_7.0.0@231']
+        <%- else -%>
+        group from: :<%= clinical_notes_guidance_group_id %>
+        <%- end -%>
+        <%- if us_core_6_and_above? -%>
+        group from: :<%= screening_assessment_id %>
+        <%- end -%>
+        <%- if module_name == 'USCoreV610'-%>
+        group from: :us_core_311_data_absent_reason,
+              verifies_requirements: ['hl7.fhir.us.core_6.1.0@41', 'hl7.fhir.us.core_6.1.0@45']
+        <%- elsif module_name == 'USCoreV700'-%>
+        group from: :us_core_311_data_absent_reason,
+              verifies_requirements: ['hl7.fhir.us.core_7.0.0@41', 'hl7.fhir.us.core_7.0.0@45']
+        <%- else -%>
         group from: :us_core_311_data_absent_reason
+        <%- end -%>
       end<% if us_core_6_and_above? %>
 
       group from: :<%= granular_scopes_id %>,

data/lib/us_core_test_kit/generator/templates/validation.rb.erb

@@ -10,6 +10,29 @@ module USCoreTestKit
       description %(
 <%= description %>
       )
+      <%-
+  requirement_map = {
+        'DiagnosticReportLabValidationTest' => ['356', '357'],
+        'ObservationClinicalResultValidationTest' => ['427'],
+        'AverageBloodPressureValidationTest' => ['421']
+  }-%>
+      <%-if module_name == 'USCoreV610' -%>
+      verifies_requirements 'hl7.fhir.us.core_6.1.0@18', 'hl7.fhir.us.core_6.1.0@19',
+                            'hl7.fhir.us.core_6.1.0@20', 'hl7.fhir.us.core_6.1.0@21',
+                            'hl7.fhir.us.core_6.1.0@23', 'hl7.fhir.us.core_6.1.0@27',
+                            'hl7.fhir.us.core_6.1.0@40', 'hl7.fhir.us.core_6.1.0@74'<% if requirement_map[class_name] %>,
+                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_6.1.0@#{id}'" }.join(', ') %>
+        <%- end -%>
+
+      <%- elsif module_name == 'USCoreV700' -%>
+      verifies_requirements 'hl7.fhir.us.core_7.0.0@18', 'hl7.fhir.us.core_7.0.0@19',
+                            'hl7.fhir.us.core_7.0.0@20', 'hl7.fhir.us.core_7.0.0@21',
+                            'hl7.fhir.us.core_7.0.0@23', 'hl7.fhir.us.core_7.0.0@27',
+                            'hl7.fhir.us.core_7.0.0@40', 'hl7.fhir.us.core_7.0.0@74'<% if requirement_map[class_name] %>,
+                            <%= requirement_map[class_name].map { |id| "'hl7.fhir.us.core_7.0.0@#{id}'" }.join(', ') %>
+        <%- end -%>
+
+      <%- end -%>
       output :dar_code_found, :dar_extension_found
 
       def resource_type

data/lib/us_core_test_kit/generator/validation_test_generator.rb

@@ -33,7 +33,7 @@ module USCoreTestKit
       end
 
       def output
-        @output ||= ERB.new(template).result(binding)
+        @output ||= ERB.new(template, trim_mode: '-').result(binding)
       end
 
       def base_output_file_name

data/lib/us_core_test_kit/practitioner_address_test.rb

@@ -30,7 +30,8 @@ module USCoreTestKit
       @missing_elements = MUST_SUPPORT_ELEMENTS
       practitioners = []
 
-      references.each do |reference|
+      references.each do |reference_info|
+        reference = reference_info[:reference]
         resolved_resource = resolve_reference(reference)
 
         if resolved_resource.nil? ||
@@ -58,7 +59,7 @@ module USCoreTestKit
           search_and_check_response(search_params, resource_type)
 
           practitioner_roles = fetch_all_bundled_resources(resource_type:)
-                               .select { |resource| resource.resourceType == resource_type }
+            .select { |resource| resource.resourceType == resource_type }
 
           next false if practitioner_roles.empty?
           next true if config.options[:skip_practitioner_role_validation]
@@ -70,10 +71,10 @@ module USCoreTestKit
         end
       end
 
-      missing_must_support_message = "Could not find US Core PractitionerRole Profile resources and " \
+      missing_must_support_message = 'Could not find US Core PractitionerRole Profile resources and ' \
                                      "these MustSupport elements #{missing_elements_string.join(', ')} " \
-                                     "in US Core Practitioner Profile resources. " \
-                                     "Please use patients with more information."
+                                     'in US Core Practitioner Profile resources. ' \
+                                     'Please use patients with more information.'
 
       assert (support_practitioner_role || @missing_elements.blank?), missing_must_support_message
     end

data/lib/us_core_test_kit/read_test.rb

@@ -4,22 +4,62 @@ module USCoreTestKit
       scratch_resources[:all] ||= []
     end
 
-    def perform_read_test(resources, reply_handler = nil)
+    def perform_read_test(resources, reply_handler = nil, delayed_reference: false)
       skip_if resources.blank?, no_resources_skip_message
 
-      resources_to_read = readable_resources(resources)
+      resources_to_read = if delayed_reference
+                            readable_references(resources)
+                          else
+                            readable_resources(resources)
+                          end
 
       assert resources_to_read.present?, "No #{resource_type} id found."
 
       if config.options[:read_all_resources]
+        if delayed_reference
+          all_referencing_resources = referencing_resources(resources_to_read)
+          info %(
+            The #{resource_type} references used for this test were pulled from the following resources:
+            #{all_referencing_resources}
+          )
+          resources_to_read.map!(&:reference)
+        end
+
         resources_to_read.each do |resource|
           read_and_validate(resource)
         end
       else
-        read_and_validate(resources_to_read.first)
+        first_resource = resources_to_read.first
+        if delayed_reference.present?
+          info %(
+            The #{resource_type} reference used for this test was pulled from resource
+            #{first_resource[:referencing_resource]}
+          )
+          first_resource = first_resource[:reference]
+        end
+        read_and_validate(first_resource)
       end
     end
 
+    def referencing_resources(readable_resources)
+      readable_resources
+        .map { |resource| resource[:referencing_resource] }
+        .join(', ')
+    end
+
+    def readable_references(resources)
+      resources
+        .filter_map do |resource|
+          next unless resource[:reference].present? && resource[:reference].is_a?(FHIR::Reference)
+
+          reference_id = resource[:reference].reference&.split('/')&.last
+          next unless reference_id&.present?
+
+          resource
+        end
+        .uniq { |resource| resource[:reference].reference.split('/').last }
+    end
+
     def readable_resources(resources)
       resources
         .select { |resource| resource.is_a?(resource_class) || resource.is_a?(FHIR::Reference) }
@@ -37,9 +77,9 @@ module USCoreTestKit
       assert_resource_type(resource_type)
       assert resource.id.present? && resource.id == id, bad_resource_id_message(id)
 
-      if resource_to_read.is_a? FHIR::Reference
-        all_scratch_resources << resource
-      end
+      return unless resource_to_read.is_a? FHIR::Reference
+
+      all_scratch_resources << resource
     end
 
     def resource_id(resource)
@@ -48,7 +88,7 @@ module USCoreTestKit
 
     def no_resources_skip_message
       "No #{resource_type} resources appear to be available. " \
-      'Please use patients with more information.'
+        'Please use patients with more information.'
     end
 
     def bad_resource_id_message(expected_id)

data/lib/us_core_test_kit/requirements/generated/us_core_client_v311_requirements_coverage.csv

@@ -0,0 +1 @@
+Req Set,ID,URL,Requirement,Conformance,Actors,Conditionality,Not Tested Reason,Not Tested Details,US Core Client v3.1.1 Short ID(s),US Core Client v3.1.1 Full ID(s)

data/lib/us_core_test_kit/requirements/generated/us_core_client_v400_requirements_coverage.csv

@@ -0,0 +1 @@
+Req Set,ID,URL,Requirement,Conformance,Actors,Conditionality,Not Tested Reason,Not Tested Details,US Core Client v4.0.0 Short ID(s),US Core Client v4.0.0 Full ID(s)

data/lib/us_core_test_kit/requirements/generated/us_core_client_v501_requirements_coverage.csv

@@ -0,0 +1 @@
+Req Set,ID,URL,Requirement,Conformance,Actors,Conditionality,Not Tested Reason,Not Tested Details,US Core Client v5.0.1 Short ID(s),US Core Client v5.0.1 Full ID(s)