us_core_test_kit 0.6.4 → 0.7.0

data/lib/us_core_test_kit/generated/v5.0.1/us_core_test_suite.rb

@@ -76,7 +76,9 @@ module USCoreTestKit
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule 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
+        %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/,
+        %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
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -87,8 +89,10 @@ module USCoreTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V501_VALIDATOR_URL', 'http://validator_service:4567')
+      id :us_core_v501
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#5.0.1'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -101,8 +105,6 @@ module USCoreTestKit
         end
       end
 
-      id :us_core_v501
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'

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

@@ -242,6 +242,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

@@ -20,6 +20,8 @@ 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|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`
 
       )
 

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

@@ -245,6 +245,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

@@ -242,6 +242,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core
@@ -369,6 +370,6 @@
   :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_granular_scope_2_group
-:file_name: condition_granular_scope2_group.rb
+:id: us_core_v610_condition_granular_scope_1_group
+:file_name: condition_granular_scope1_group.rb
 :delayed_references: []

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

@@ -273,8 +273,8 @@
   :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_granular_scope_2_group
-:file_name: observation_granular_scope2_group.rb
+:id: us_core_v610_observation_granular_scope_1_group
+:file_name: observation_granular_scope1_group.rb
 :delayed_references:
 - :path: specimen
   :resources:

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

@@ -13,9 +13,13 @@ 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|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|procedure`
+* `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/metadata.yml

@@ -856,6 +856,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -1231,6 +1232,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -10369,18 +10371,23 @@
   :must_supports:
     :extensions:
     - :id: Patient.extension:race
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
       :uscdi_only: true
     - :id: Patient.extension:ethnicity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
       :uscdi_only: true
     - :id: Patient.extension:tribalAffiliation
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-tribal-affiliation
       :uscdi_only: true
     - :id: Patient.extension:sex
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-sex
       :uscdi_only: true
     - :id: Patient.extension:genderIdentity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
       :uscdi_only: true
     :slices: []
@@ -11432,8 +11439,10 @@
   :must_supports:
     :extensions:
     - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/StructureDefinition/display
     - :id: QuestionnaireResponse.questionnaire.extension:url
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
     :slices: []
     :elements:
@@ -12115,15 +12124,9 @@
   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

@@ -16,7 +16,9 @@ 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|procedure`
+* `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/patient/metadata.yml

@@ -173,18 +173,23 @@
 :must_supports:
   :extensions:
   - :id: Patient.extension:race
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
     :uscdi_only: true
   - :id: Patient.extension:ethnicity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
     :uscdi_only: true
   - :id: Patient.extension:tribalAffiliation
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-tribal-affiliation
     :uscdi_only: true
   - :id: Patient.extension:sex
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-sex
     :uscdi_only: true
   - :id: Patient.extension:genderIdentity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
     :uscdi_only: true
   :slices: []

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

@@ -132,8 +132,10 @@
 :must_supports:
   :extensions:
   - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/StructureDefinition/display
   - :id: QuestionnaireResponse.questionnaire.extension:url
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
   :slices: []
   :elements:

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

@@ -61,7 +61,7 @@ module USCoreTestKit
       title 'US Core v6.1.0'
       description %(
         The US Core Test Kit tests systems for their conformance to the [US Core
-        Implementation Guide]().
+        Implementation Guide](http://hl7.org/fhir/us/core/STU6).
 
         HL7® FHIR® resources are validated with the Java validator using
         `tx.fhir.org` as the terminology server. Users should note that the
@@ -82,7 +82,9 @@ module USCoreTestKit
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule 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
+        %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/,
+        %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
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -93,8 +95,10 @@ module USCoreTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V610_VALIDATOR_URL', 'http://validator_service:4567')
+      id :us_core_v610
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#6.1.0'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -107,8 +111,6 @@ module USCoreTestKit
         end
       end
 
-      id :us_core_v610
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'
@@ -200,7 +202,7 @@ module USCoreTestKit
         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

@@ -242,6 +242,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

@@ -245,6 +245,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

@@ -242,6 +242,7 @@
 :must_supports:
   :extensions:
   - :id: Condition.extension:assertedDate
+    :path: extension
     :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
   :slices:
   - :slice_id: Condition.category:us-core

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

@@ -144,6 +144,7 @@
 :must_supports:
   :extensions:
   - :id: MedicationRequest.extension:medicationAdherence
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication-adherence
     :uscdi_only: true
   :slices:

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

@@ -858,6 +858,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -1234,6 +1235,7 @@
   :must_supports:
     :extensions:
     - :id: Condition.extension:assertedDate
+      :path: extension
       :url: http://hl7.org/fhir/StructureDefinition/condition-assertedDate
     :slices:
     - :slice_id: Condition.category:us-core
@@ -3978,6 +3980,7 @@
   :must_supports:
     :extensions:
     - :id: MedicationRequest.extension:medicationAdherence
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication-adherence
       :uscdi_only: true
     :slices:
@@ -11389,18 +11392,23 @@
   :must_supports:
     :extensions:
     - :id: Patient.extension:race
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
       :uscdi_only: true
     - :id: Patient.extension:ethnicity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
       :uscdi_only: true
     - :id: Patient.extension:tribalAffiliation
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-tribal-affiliation
       :uscdi_only: true
     - :id: Patient.extension:sex
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-sex
       :uscdi_only: true
     - :id: Patient.extension:genderIdentity
+      :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
       :uscdi_only: true
     :slices: []
@@ -12474,8 +12482,10 @@
   :must_supports:
     :extensions:
     - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/StructureDefinition/display
     - :id: QuestionnaireResponse.questionnaire.extension:url
+      :path: questionnaire.extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
     :slices: []
     :elements:

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

@@ -173,18 +173,23 @@
 :must_supports:
   :extensions:
   - :id: Patient.extension:race
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race
     :uscdi_only: true
   - :id: Patient.extension:ethnicity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity
     :uscdi_only: true
   - :id: Patient.extension:tribalAffiliation
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-tribal-affiliation
     :uscdi_only: true
   - :id: Patient.extension:sex
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-sex
     :uscdi_only: true
   - :id: Patient.extension:genderIdentity
+    :path: extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity
     :uscdi_only: true
   :slices: []

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

@@ -132,8 +132,10 @@
 :must_supports:
   :extensions:
   - :id: QuestionnaireResponse.questionnaire.extension:questionnaireDisplay
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/StructureDefinition/display
   - :id: QuestionnaireResponse.questionnaire.extension:url
+    :path: questionnaire.extension
     :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-extension-questionnaire-uri
   :slices: []
   :elements:

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

@@ -86,7 +86,9 @@ module USCoreTestKit
         /Observation\.effective\.ofType\(Period\): .*us-core-1:/, # Invalid invariant in US Core v3.1.1
         /Provenance.agent\[\d*\]: Rule 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
+        %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/,
+        %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
       ].freeze
 
       VERSION_SPECIFIC_MESSAGE_FILTERS = [].freeze
@@ -97,8 +99,10 @@ module USCoreTestKit
           end
       end
 
-      validator do
-        url ENV.fetch('V700_BALLOT_VALIDATOR_URL', 'http://validator_service:4567')
+      id :us_core_v700_ballot
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#7.0.0-ballot'
         message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
 
         exclude_message do |message|
@@ -111,8 +115,6 @@ module USCoreTestKit
         end
       end
 
-      id :us_core_v700_ballot
-
       input :url,
         title: 'FHIR Endpoint',
         description: 'URL of the FHIR endpoint'
@@ -208,7 +210,7 @@ module USCoreTestKit
         group from: :us_core_311_data_absent_reason
       end
 
-      group from: :us_core_v700_ballot_smart_granular_scopes,
+      group from: :'us_core_v700_ballot_smart_granular_scopes',
             required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
       
     end

data/lib/us_core_test_kit/generator/granular_scope_group_generator.rb

@@ -4,11 +4,18 @@ require_relative '../custom_groups/smart_scopes_constants'
 module USCoreTestKit
   class Generator
     class GranularScopeGroupGenerator
+      include SmartScopesConstants
+
       class << self
         def generate(ig_metadata, base_output_dir)
           return unless ['6', '7'].include? ig_metadata.ig_version[1]
 
           [1, 2].each do |group_number|
+            scopes =
+              SmartScopesConstants
+                .const_get("SMART_GRANULAR_SCOPES_GROUP#{group_number}")[ig_metadata.reformatted_version]
+            next if scopes.blank?
+
             new(ig_metadata, base_output_dir, group_number).generate
           end
         end

data/lib/us_core_test_kit/generator/granular_scope_resource_type_group_generator.rb

@@ -16,7 +16,7 @@ module USCoreTestKit
                 .const_get("SMART_GRANULAR_SCOPES_GROUP#{group_number}")[ig_metadata.reformatted_version]
 
             groups.each do |group_metadata|
-              next if scopes.none? { |scope| scope.start_with? "patient/#{group_metadata.resource}" }
+              next if scopes.blank? || scopes.none? { |scope| scope.start_with? "patient/#{group_metadata.resource}" }
 
               new(GroupMetadata.new(group_metadata.to_hash), ig_metadata, base_output_dir, group_number).generate
             end

data/lib/us_core_test_kit/generator/granular_scope_test_generator.rb

@@ -11,12 +11,12 @@ module USCoreTestKit
 
           scopes =
             SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP1[ig_metadata.reformatted_version] +
-            SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP2[ig_metadata.reformatted_version]
+            (SmartScopesConstants::SMART_GRANULAR_SCOPES_GROUP2[ig_metadata.reformatted_version] || [])
 
           SmartScopesConstants::SMART_GRANULAR_SCOPE_RESOURCES.each do |resource_type|
             group = ig_metadata.groups.find { |group| group.resource == resource_type }
 
-            next if scopes.none? { |scope| scope.start_with? "patient/#{group.resource}" }
+            next if scopes.blank? || scopes.none? { |scope| scope.start_with? "patient/#{group.resource}" }
 
             group.searches
               .each { |search| new(group, search, base_output_dir).generate }

data/lib/us_core_test_kit/generator/group_metadata.rb

@@ -56,7 +56,7 @@ module USCoreTestKit
       end
 
       def no_patient_searches?
-        searches.none? { |search| search[:names].include? 'patient' }
+        searches.none? { |search| search[:names].include?('patient') && search[:expectation] == 'SHALL' }
       end
 
       def non_uscdi_resource?

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -48,6 +48,7 @@ module USCoreTestKit
         must_support_extension_elements.map do |element|
           {
             id: element.id,
+            path: element.path.gsub("#{resource}.", ''),
             url: element.type.first.profile.first
           }.tap do |metadata|
             if is_uscdi_requirement_element?(element)

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_4.rb

@@ -52,16 +52,19 @@ module USCoreTestKit
         #US Core 4.0.0 Section 10.112.1.1 Additional USCDI v1 Requirement:
         must_supports[:extensions] << {
           id: 'Patient.extension:race',
+          path: 'extension',
           url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race',
           uscdi_only: true
         }
         must_supports[:extensions] << {
           id: 'Patient.extension:ethnicity',
+          path: 'extension',
           url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity',
           uscdi_only: true
         }
         must_supports[:extensions] << {
           id: 'Patient.extension:birthsex',
+          path: 'extension',
           url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex',
           uscdi_only: true
         }

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_5.rb

@@ -54,6 +54,7 @@ module USCoreTestKit
 
         must_supports[:extensions] << {
           id: 'Patient.extension:genderIdentity',
+          path: 'extension',
           url: 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-genderIdentity',
           uscdi_only: true
         }

data/lib/us_core_test_kit/generator/special_cases.rb

@@ -25,16 +25,14 @@ module USCoreTestKit
         'Encounter' => ['v311', 'v400'],
         'Location' => ['v311', 'v400', 'v501', 'v610'],
         'Organization' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'Practitioner' => ['v311', 'v400'],
+        'Practitioner' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
         'PractitionerRole' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
         'Provenance' => ['v311', 'v400', 'v501', 'v610', 'v700_ballot'],
-        'RelatedPerson' => ['v501', 'v610', 'v700_ballot'],
-        'Specimen' => ['v610', 'v700_ballot']
+        'RelatedPerson' => ['v501', 'v610', 'v700_ballot']
       }.freeze
 
       SEARCHABLE_DELAYED_RESOURCES = {
-        'Location' => ['v700_ballot'],
-        'Practitioner' => ['v501', 'v610', 'v700_ballot']
+        'Location' => ['v700_ballot']
       }.freeze
 
       ALL_VERSION_CATEGORY_FIRST_PROFILES = [

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -57,12 +57,15 @@ module USCoreTestKit
         "US Core #{ig_metadata.ig_version}"
       end
 
-      def validator_env_name
-        "#{ig_metadata.reformatted_version.upcase}_VALIDATOR_URL"
+      def ig_identifier
+        version = ig_metadata.ig_version[1..] # Remove leading 'v'
+        "hl7.fhir.us.core##{version}"
       end
 
       def ig_link
         case ig_metadata.ig_version
+        when 'v6.1.0'
+          'http://hl7.org/fhir/us/core/STU6'
         when 'v5.0.1'
           'http://hl7.org/fhir/us/core/STU5.0.1'
         when 'v4.0.0'

data/lib/us_core_test_kit/must_support_test.rb

@@ -83,7 +83,17 @@ module USCoreTestKit
       @missing_extensions ||=
         must_support_extensions.select do |extension_definition|
           resources.none? do |resource|
-            resource.extension.any? { |extension| extension.url == extension_definition[:url] }
+            path = extension_definition[:path]
+
+            if path == 'extension'
+              resource.extension.any? { |extension| extension.url == extension_definition[:url] }
+            else
+              extension = find_a_value_at(resource, path) do |el|
+                el.url == extension_definition[:url]
+              end
+
+              extension.present?
+            end
           end
         end
     end
@@ -100,14 +110,23 @@ module USCoreTestKit
       @missing_elements ||=
         must_support_elements.select do |element_definition|
           resources.none? do |resource|
-            path = element_definition[:path] #.delete_suffix('[x]')
+            path = element_definition[:path]
+            ms_extension_urls = must_support_extensions.select { |ex| ex[:path] == "#{path}.extension" }
+              .map { |ex| ex[:url] }
+
             value_found = find_a_value_at(resource, path) do |value|
-              value_without_extensions =
-                value.respond_to?(:to_hash) ? value.to_hash.reject { |key, _| key == 'extension' } : value
+              if value.respond_to?(:extension) && ms_extension_urls.present?
+                urls = value.extension.map(&:url)
+                has_ms_extension = (urls & ms_extension_urls).present?
+              end
 
-              (value_without_extensions.present? || value_without_extensions == false) &&
-                (element_definition[:fixed_value].blank? || value == element_definition[:fixed_value])
+              unless has_ms_extension
+                value_without_extensions =
+                  value.respond_to?(:to_hash) ? value.to_hash.reject { |key, _| key == 'extension' } : value
+              end
 
+              (has_ms_extension || value_without_extensions.present? || value_without_extensions == false) &&
+                (element_definition[:fixed_value].blank? || value == element_definition[:fixed_value])
             end
             # Note that false.present? => false, which is why we need to add this extra check
             value_found.present? || value_found == false

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -165,7 +165,8 @@ module USCoreTestKit
 
       target_profile_with_version =  target_profile.include?('|') ? target_profile : "#{target_profile}|#{metadata.profile_version}"
 
-      outcome = FHIR::OperationOutcome.new(JSON.parse(validator.validate(resource, target_profile_with_version)))
+      validator_response = validator.validate(resource, target_profile_with_version)
+      outcome = validator.operation_outcome_from_hl7_wrapped_response(validator_response)
 
       message_hashes = outcome.issue&.map { |issue| validator.message_hash_from_issue(issue, resource) } || []