us_core_test_kit 0.11.4 → 0.11.6

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
@@ -89,14 +89,32 @@ module USCoreTestKit
           .select { |extension| extension[:uscdi_only].presence == uscdi_only.presence }
           .map { |extension| extension[:id] }
 
-        group_metadata.must_supports[:choices]&.each do |choice|
-          next unless choice[:uscdi_only].presence == uscdi_only.presence && choice.key?(:paths)
+        choice_names = []
+        group_metadata.must_supports[:choices]&.map do |choice|
+          next unless choice[:uscdi_only].presence == uscdi_only.presence
 
-          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
-          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
-        end
+          combined = []
+          if choice.key?(:paths)
+            choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+            combined << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+          end
+
+          if choice.key?(:extension_ids)
+            choice[:extension_ids].each { |extesnion_id| extension_names.delete(extesnion_id) }
+            combined << choice[:extension_ids].join(' or ')
+          end
+
+          if choice.key?(:elements)
+            choice[:elements].each { |element| element_names.delete("#{resource_type}.#{element[:path]}") }
+            combined << choice[:elements].map { |element|
+              "#{resource_type}.#{element[:path]}:#{element[:fixed_value]}"
+            }.join(' or ')
+          end
+
+          choice_names << combined.join(' or ') if combined.any?
+        end || []
 
-        (slice_names + element_names + extension_names)
+        (slice_names + element_names + extension_names + choice_names)
           .uniq
           .sort
           .map { |name| "#{' ' * 8}* #{name}" }
@@ -105,7 +123,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/naming.rb

@@ -33,12 +33,13 @@ module USCoreTestKit
         'v4.0.0' => 'http://hl7.org/fhir/us/core/STU4',
         'v5.0.1' => 'http://hl7.org/fhir/us/core/STU5.0.1',
         'v6.1.0' => 'http://hl7.org/fhir/us/core/STU6.1',
-        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7'
+        'v7.0.0' => 'http://hl7.org/fhir/us/core/STU7',
+        'v8.0.0' => 'http://hl7.org/fhir/us/core/STU8'
       }.freeze
 
       class << self
         def resources_with_multiple_profiles
-          ['Condition', 'DiagnosticReport', 'Observation']
+          ['Condition', 'DiagnosticReport', 'Observation', 'DocumentReference']
         end
 
         def resource_has_multiple_profiles?(resource)
@@ -56,6 +57,7 @@ module USCoreTestKit
           group_metadata.name
             .delete_prefix('us_core_')
             .gsub('diagnosticreport', 'diagnostic_report')
+            .gsub('documentreference', 'document_reference')
             .underscore
         end
 

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

@@ -1,12 +1,14 @@
 module USCoreTestKit
   class Generator
     module SpecialCases
+      # These resources are excluded from US Core Test Suite
       RESOURCES_TO_EXCLUDE = {
         'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700'],
+        'Medication' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
         'PractitionerRole' => ['v311', 'v400']
       }.freeze
 
+      # These profiles are excluded from US Core Test Suite
       PROFILES_TO_EXCLUDE = [
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-survey',
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs'
@@ -21,18 +23,20 @@ module USCoreTestKit
         'http://hl7.org/fhir/us/core/StructureDefinition/us-core-simple-observation' => ['v610', 'v700']
       }.freeze
 
+      # These resources relies on references from other resources and do not have search tests.
+      # Test groups for these resources are placed at the bottom of US Core test group.
       NON_USCDI_RESOURCES = {
         'Encounter' => ['v311', 'v400'],
-        'Location' => ['v311', 'v400', 'v501', 'v610'],
-        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700'],
-        'RelatedPerson' => ['v501', 'v610', 'v700']
+        'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700', 'v800'],
+        'RelatedPerson' => ['v501', 'v610', 'v700', 'v800']
       }.freeze
 
+      # These resources relies on references from other resources but they also have mandatory search tests.
       SEARCHABLE_DELAYED_RESOURCES = {
-        'Location' => ['v700']
+        'Location' => ['v700', 'v800']
       }.freeze
 
       ALL_VERSION_CATEGORY_FIRST_PROFILES = [
@@ -51,8 +55,10 @@ module USCoreTestKit
       ].freeze
 
       VERSION_SPECIFIC_CATEGORY_FIRST_PROFILES = {
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700'],
-        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610', 'v700']
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-encounter-diagnosis' => ['v610', 'v700',
+                                                                                                    'v800'],
+        'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition-problems-health-concerns' => ['v610',
+                                                                                                         'v700', 'v800']
       }.freeze
 
       class << self

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
@@ -112,17 +112,21 @@ module USCoreTestKit
 
       def clinical_notes_guidance_file_name
         if ig_metadata.ig_version == 'v3.1.1'
-          "../../custom_groups/#{ig_metadata.ig_version}/clinical_notes_guidance_group"
-        else
+          '../../custom_groups/v3.1.1/clinical_notes_guidance_group'
+        elsif ig_metadata.ig_version[1].to_i < 8
           '../../custom_groups/v4.0.0/clinical_notes_guidance_group'
+        else
+          '../../custom_groups/v8.0.0/clinical_notes_guidance_group'
         end
       end
 
       def clinical_notes_guidance_group_id
         if ig_metadata.reformatted_version == 'v311'
-          "us_core_#{ig_metadata.reformatted_version}_clinical_notes_guidance"
-        else
+          'us_core_v311_clinical_notes_guidance'
+        elsif ig_metadata.ig_version[1].to_i < 8
           'us_core_v400_clinical_notes_guidance'
+        else
+          'us_core_v800_clinical_notes_guidance'
         end
       end
 

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/interpreter_required_extension_test.rb.erb

@@ -0,0 +1,25 @@
+require_relative '../../../interpreter_required_extension_test'
+
+module USCoreTestKit
+  module <%= module_name %>
+    class <%= class_name %> < Inferno::Test
+      include USCoreTestKit::InterpreterRequiredExtensionTest
+
+      title 'Certifying server system supports the US Core Interpreter Needed Extension on either the US Core Patient or US Core Encounter Profiles'
+      description %(
+        Servers can use the US Core Interpreter Needed Extension on the US Core Patient
+        or US Core Encounter Profiles to communicate whether a patient needs an interpreter.
+        Although the extension is marked as an Additional USCDI Requirements on both US Core
+        Patient and US Core Encounter Profiles, the certifying Server system is not required
+        to support the extension on both profiles, but SHALL support the extension on at least
+        one.
+      )
+
+      id :<%= test_id %>
+
+      run do
+        verify_interpreter_required_extension_exists
+      end
+    end
+  end
+end

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
@@ -96,7 +96,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)
 
         test_metadata = {
           id: test_id,
@@ -112,26 +112,26 @@ module USCoreTestKit
 
       def description
         <<~DESCRIPTION
-        #{description_intro}
-        It verifies the presence of mandatory elements and that elements with
-        required bindings contain appropriate values. CodeableConcept element
-        bindings will fail if none of their codings have a code/system belonging
-        to the bound ValueSet. Quantity, Coding, and code element bindings will
-        fail if their code/system are not found in the valueset.
+          #{description_intro}
+          It verifies the presence of mandatory elements and that elements with
+          required bindings contain appropriate values. CodeableConcept element
+          bindings will fail if none of their codings have a code/system belonging
+          to the bound ValueSet. Quantity, Coding, and code element bindings will
+          fail if their code/system are not found in the valueset.
         DESCRIPTION
       end
 
       def description_intro
         if resource_type == 'Medication'
           <<~MEDICATION_INTRO
-          This test verifies resources returned from previous tests conform to
-          the [#{profile_name}](#{profile_url}).
+            This test verifies resources returned from previous tests conform to
+            the [#{profile_name}](#{profile_url}).
           MEDICATION_INTRO
         else
           <<~GENERIC_INTRO
-          This test verifies resources returned from the first search conform to
-          the [#{profile_name}](#{profile_url}).
-          Systems must demonstrate at least one valid example in order to pass this test.
+            This test verifies resources returned from the first search conform to
+            the [#{profile_name}](#{profile_url}).
+            Systems must demonstrate at least one valid example in order to pass this test.
           GENERIC_INTRO
         end
       end

data/lib/us_core_test_kit/generator.rb

@@ -16,6 +16,7 @@ require_relative 'generator/search_test_generator'
 require_relative 'generator/suite_generator'
 require_relative 'generator/validation_test_generator'
 require_relative 'generator/practitioner_address_test_generator'
+require_relative 'generator/interpreter_required_extension_test_generator'
 
 module USCoreTestKit
   class Generator
@@ -46,6 +47,7 @@ module USCoreTestKit
       generate_must_support_tests
       generate_reference_resolution_tests
       generate_practitioner_address_tests
+      generate_interpreter_required_extension_test_generator
 
       generate_granular_scope_tests
 
@@ -67,9 +69,7 @@ module USCoreTestKit
     end
 
     def write_metadata
-      File.open(File.join(base_output_dir, 'metadata.yml'), 'w') do |file|
-        file.write(YAML.dump(ig_metadata.to_hash))
-      end
+      File.write(File.join(base_output_dir, 'metadata.yml'), YAML.dump(ig_metadata.to_hash))
     end
 
     def base_output_dir
@@ -126,6 +126,10 @@ module USCoreTestKit
       PractitionerAddressTestGenerator.generate(ig_metadata, base_output_dir)
     end
 
+    def generate_interpreter_required_extension_test_generator
+      InterpreterRequiredExtensionTestGenerator.generate(ig_metadata, base_output_dir)
+    end
+
     def generate_suites
       SuiteGenerator.generate(ig_metadata, base_output_dir)
     end