us_core_test_kit 0.7.2 → 0.8.1

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

@@ -0,0 +1,26 @@
+require_relative '../../../read_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class TreatmentInterventionPreferenceReadTest < Inferno::Test
+      include USCoreTestKit::ReadTest
+
+      title 'Server returns correct Observation resource from Observation read interaction'
+      description 'A server SHALL support the Observation read interaction.'
+
+      id :us_core_v700_treatment_intervention_preference_read_test
+
+      def resource_type
+        'Observation'
+      end
+
+      def scratch_resources
+        scratch[:treatment_intervention_preference_resources] ||= {}
+      end
+
+      run do
+        perform_read_test(all_scratch_resources)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require_relative '../../../reference_resolution_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class TreatmentInterventionPreferenceReferenceResolutionTest < Inferno::Test
+      include USCoreTestKit::ReferenceResolutionTest
+
+      title 'MustSupport references within Observation resources are valid'
+      description %(
+        This test will attempt to read external references provided within elements
+        marked as 'MustSupport', if any are available.
+
+        It verifies that at least one external reference for each MustSupport Reference element
+        can be accessed by the test client, and conforms to corresponding US Core profile.
+
+        Elements which may provide external references include:
+
+        * Observation.subject
+      )
+
+      id :us_core_v700_treatment_intervention_preference_reference_resolution_test
+
+      def resource_type
+        'Observation'
+      end
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+      end
+
+      def scratch_resources
+        scratch[:treatment_intervention_preference_resources] ||= {}
+      end
+
+      run do
+        perform_reference_resolution_test(scratch_resources[:all])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require_relative '../../../validation_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class TreatmentInterventionPreferenceValidationTest < Inferno::Test
+      include USCoreTestKit::ValidationTest
+
+      id :us_core_v700_treatment_intervention_preference_validation_test
+      title 'Observation resources returned during previous tests conform to the US Core Treatment Intervention Preference Profile'
+      description %(
+This test verifies resources returned from the first search conform to
+the [US Core Treatment Intervention Preference Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-treatment-intervention-preference).
+Systems must demonstrate at least one valid example in order to pass this test.
+
+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.
+
+      )
+      output :dar_code_found, :dar_extension_found
+
+      def resource_type
+        'Observation'
+      end
+
+      def scratch_resources
+        scratch[:treatment_intervention_preference_resources] ||= {}
+      end
+
+      run do
+        perform_validation_test(scratch_resources[:all] || [],
+                                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-treatment-intervention-preference',
+                                '7.0.0',
+                                skip_if_empty: true)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,98 @@
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_code_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_category_date_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_code_date_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_category_status_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_category_lastupdated_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_patient_category_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_read_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_provenance_revinclude_search_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_validation_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_must_support_test'
+require_relative 'treatment_intervention_preference/treatment_intervention_preference_reference_resolution_test'
+
+module USCoreTestKit
+  module USCoreV700
+    class TreatmentInterventionPreferenceGroup < Inferno::TestGroup
+      title 'Observation Treatment Intervention Preference Tests'
+      short_description 'Verify support for the server capabilities required by the US Core Treatment Intervention Preference Profile.'
+      description %(
+  # Background
+
+The US Core Observation Treatment Intervention Preference sequence verifies that the system under test is
+able to provide correct responses for Observation queries. These queries
+must contain resources conforming to the US Core Treatment Intervention Preference Profile as
+specified in the US Core v7.0.0 Implementation Guide.
+
+# Testing Methodology
+## Searching
+This test sequence will first perform each required search associated
+with this resource. This sequence will perform searches with the
+following parameters:
+
+* patient + code
+* patient + category + date
+* patient + category
+
+### Search Parameters
+The first search uses the selected patient(s) from the prior launch
+sequence. Any subsequent searches will look for its parameter values
+from the results of the first search. For example, the `identifier`
+search in the patient sequence is performed by looking for an existing
+`Patient.identifier` from any of the resources returned in the `_id`
+search. If a value cannot be found this way, the search is skipped.
+
+### Search Validation
+Inferno will retrieve up to the first 20 bundle pages of the reply for
+Observation resources and save them for subsequent tests. Each of
+these resources is then checked to see if it matches the searched
+parameters in accordance with [FHIR search
+guidelines](https://www.hl7.org/fhir/search.html). The test will fail,
+for example, if a Patient search for `gender=male` returns a `female`
+patient.
+
+
+## Must Support
+Each profile contains elements marked as "must support". This test
+sequence expects to see each of these elements at least once. If at
+least one cannot be found, the test will fail. The test will look
+through the Observation resources found in the first test for these
+elements.
+
+## Profile Validation
+Each resource returned from the first search is expected to conform to
+the [US Core Treatment Intervention Preference Profile](http://hl7.org/fhir/us/core/StructureDefinition/us-core-treatment-intervention-preference). Each element is checked against
+teminology binding and cardinality requirements.
+
+Elements with a required binding are validated against their bound
+ValueSet. If the code/system in the element is not part of the ValueSet,
+then the test will fail.
+
+## Reference Validation
+At least one instance of each external reference in elements marked as
+"must support" within the resources provided by the system must resolve.
+The test will attempt to read each reference found and will fail if no
+read succeeds.
+
+      )
+
+      id :us_core_v700_treatment_intervention_preference
+      run_as_group
+
+      def self.metadata
+        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'treatment_intervention_preference', 'metadata.yml'), aliases: true))
+      end
+  
+      test from: :us_core_v700_treatment_intervention_preference_patient_code_search_test
+      test from: :us_core_v700_treatment_intervention_preference_patient_category_date_search_test
+      test from: :us_core_v700_treatment_intervention_preference_patient_code_date_search_test
+      test from: :us_core_v700_treatment_intervention_preference_patient_category_status_search_test
+      test from: :us_core_v700_treatment_intervention_preference_patient_category__lastUpdated_search_test
+      test from: :us_core_v700_treatment_intervention_preference_patient_category_search_test
+      test from: :us_core_v700_treatment_intervention_preference_read_test
+      test from: :us_core_v700_treatment_intervention_preference_provenance_revinclude_search_test
+      test from: :us_core_v700_treatment_intervention_preference_validation_test
+      test from: :us_core_v700_treatment_intervention_preference_must_support_test
+      test from: :us_core_v700_treatment_intervention_preference_reference_resolution_test
+    end
+  end
+end

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

@@ -0,0 +1,221 @@
+require 'inferno/dsl/oauth_credentials'
+require_relative '../../version'
+require_relative '../../custom_groups/v7.0.0/capability_statement_group'
+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/v7.0.0/smart_granular_scopes_group'
+require_relative '../../custom_groups/v7.0.0/screening_assessment_group'
+require_relative '../../provenance_validator'
+require_relative '../../us_core_options'
+require_relative '../../custom_groups/v7.0.0/smart_app_launch_group'
+
+require_relative 'patient_group'
+require_relative 'allergy_intolerance_group'
+require_relative 'care_plan_group'
+require_relative 'care_team_group'
+require_relative 'condition_encounter_diagnosis_group'
+require_relative 'condition_problems_health_concerns_group'
+require_relative 'coverage_group'
+require_relative 'device_group'
+require_relative 'diagnostic_report_note_group'
+require_relative 'diagnostic_report_lab_group'
+require_relative 'document_reference_group'
+require_relative 'encounter_group'
+require_relative 'goal_group'
+require_relative 'immunization_group'
+require_relative 'medication_dispense_group'
+require_relative 'medication_request_group'
+require_relative 'observation_lab_group'
+require_relative 'observation_pregnancystatus_group'
+require_relative 'observation_pregnancyintent_group'
+require_relative 'observation_occupation_group'
+require_relative 'respiratory_rate_group'
+require_relative 'simple_observation_group'
+require_relative 'treatment_intervention_preference_group'
+require_relative 'care_experience_preference_group'
+require_relative 'heart_rate_group'
+require_relative 'body_temperature_group'
+require_relative 'pediatric_weight_for_height_group'
+require_relative 'pulse_oximetry_group'
+require_relative 'smokingstatus_group'
+require_relative 'observation_sexual_orientation_group'
+require_relative 'head_circumference_group'
+require_relative 'body_height_group'
+require_relative 'bmi_group'
+require_relative 'observation_screening_assessment_group'
+require_relative 'average_blood_pressure_group'
+require_relative 'blood_pressure_group'
+require_relative 'observation_clinical_result_group'
+require_relative 'pediatric_bmi_for_age_group'
+require_relative 'head_circumference_percentile_group'
+require_relative 'body_weight_group'
+require_relative 'procedure_group'
+require_relative 'questionnaire_response_group'
+require_relative 'service_request_group'
+require_relative 'location_group'
+require_relative 'organization_group'
+require_relative 'practitioner_group'
+require_relative 'practitioner_role_group'
+require_relative 'provenance_group'
+require_relative 'related_person_group'
+require_relative 'specimen_group'
+
+module USCoreTestKit
+  module USCoreV700
+    class USCoreTestSuite < Inferno::TestSuite
+      title 'US Core v7.0.0'
+      description %(
+        The US Core Test Kit tests systems for their conformance to the [US Core
+        Implementation Guide](http://hl7.org/fhir/us/core/STU7).
+
+        HL7® FHIR® resources are validated with the Java validator using
+        `tx.fhir.org` as the terminology server. Users should note that the
+        although the ONC Certification (g)(10) Standardized API Test Suite
+        includes tests from this suite, [it uses a different method to perform
+        terminology
+        validation](https://github.com/onc-healthit/onc-certification-g10-test-kit/wiki/FAQ#q-why-do-some-resources-fail-in-us-core-test-kit-with-terminology-validation-errors).
+        As a result, resource validation results may not be consistent between
+        the US Core Test Suite and the ONC Certification (g)(10) Standardized
+        API Test Suite.
+      )
+      version VERSION
+
+      VALIDATION_MESSAGE_FILTERS = [
+        %r{Sub-extension url 'introspect' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        %r{Sub-extension url 'revoke' is not defined by the Extension http://fhir-registry\.smarthealthit\.org/StructureDefinition/oauth-uris},
+        /Observation\.effective\.ofType\(Period\): .*vs-1:/, # Invalid invariant in FHIR v4.0.1
+        /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/,
+        %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
+
+      def self.metadata
+        @metadata ||= YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true)[:groups].map do |raw_metadata|
+            Generator::GroupMetadata.new(raw_metadata)
+          end
+      end
+
+      id :us_core_v700
+
+      fhir_resource_validator do
+        igs 'hl7.fhir.us.core#7.0.0'
+        message_filters = VALIDATION_MESSAGE_FILTERS + VERSION_SPECIFIC_MESSAGE_FILTERS
+
+        exclude_message do |message|
+
+          message_filters.any? { |filter| filter.match? message.message }
+        end
+
+        perform_additional_validation do |resource, profile_url|
+          ProvenanceValidator.validate(resource) if resource.instance_of?(FHIR::Provenance)
+        end
+      end
+
+      input :url,
+        title: 'FHIR Endpoint',
+        description: 'URL of the FHIR endpoint'
+
+      suite_option :smart_app_launch_version,
+        title: 'SMART App Launch Version',
+        list_options: [
+          {
+            label: 'SMART App Launch 1.0.0',
+            value: USCoreOptions::SMART_1
+          },
+          {
+            label: 'SMART App Launch 2.0.0',
+            value: USCoreOptions::SMART_2
+          }
+        ]
+
+      group from: :us_core_v700_smart_app_launch
+
+      group do
+        input :smart_credentials,
+          title: 'OAuth Credentials',
+          type: :oauth_credentials,
+          optional: true
+
+        fhir_client do
+          url :url
+          oauth_credentials :smart_credentials
+        end
+
+        title 'US Core FHIR API'
+        id :us_core_v700_fhir_api
+
+        config(
+          options: {
+            tag_requests: true
+          }
+        )
+
+        group from: :us_core_v700_capability_statement
+      
+        group from: :us_core_v700_patient
+        group from: :us_core_v700_allergy_intolerance
+        group from: :us_core_v700_care_plan
+        group from: :us_core_v700_care_team
+        group from: :us_core_v700_condition_encounter_diagnosis
+        group from: :us_core_v700_condition_problems_health_concerns
+        group from: :us_core_v700_coverage
+        group from: :us_core_v700_device
+        group from: :us_core_v700_diagnostic_report_note
+        group from: :us_core_v700_diagnostic_report_lab
+        group from: :us_core_v700_document_reference
+        group from: :us_core_v700_encounter
+        group from: :us_core_v700_goal
+        group from: :us_core_v700_immunization
+        group from: :us_core_v700_medication_dispense
+        group from: :us_core_v700_medication_request
+        group from: :us_core_v700_observation_lab
+        group from: :us_core_v700_observation_pregnancystatus
+        group from: :us_core_v700_observation_pregnancyintent
+        group from: :us_core_v700_observation_occupation
+        group from: :us_core_v700_respiratory_rate
+        group from: :us_core_v700_simple_observation
+        group from: :us_core_v700_treatment_intervention_preference
+        group from: :us_core_v700_care_experience_preference
+        group from: :us_core_v700_heart_rate
+        group from: :us_core_v700_body_temperature
+        group from: :us_core_v700_pediatric_weight_for_height
+        group from: :us_core_v700_pulse_oximetry
+        group from: :us_core_v700_smokingstatus
+        group from: :us_core_v700_observation_sexual_orientation
+        group from: :us_core_v700_head_circumference
+        group from: :us_core_v700_body_height
+        group from: :us_core_v700_bmi
+        group from: :us_core_v700_observation_screening_assessment
+        group from: :us_core_v700_average_blood_pressure
+        group from: :us_core_v700_blood_pressure
+        group from: :us_core_v700_observation_clinical_result
+        group from: :us_core_v700_pediatric_bmi_for_age
+        group from: :us_core_v700_head_circumference_percentile
+        group from: :us_core_v700_body_weight
+        group from: :us_core_v700_procedure
+        group from: :us_core_v700_questionnaire_response
+        group from: :us_core_v700_service_request
+        group from: :us_core_v700_location
+        group from: :us_core_v700_organization
+        group from: :us_core_v700_practitioner
+        group from: :us_core_v700_practitioner_role
+        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_v700_screening_assessment
+        group from: :us_core_311_data_absent_reason
+      end
+
+      group from: :us_core_v700_smart_granular_scopes,
+            required_suite_options: USCoreOptions::SMART_2_REQUIREMENT
+      
+    end
+  end
+end

data/lib/us_core_test_kit/generator/granular_scope_test_generator.rb

@@ -80,6 +80,10 @@ module USCoreTestKit
         group_metadata.resource
       end
 
+      def conformance_expectation
+        search_metadata[:expectation]
+      end
+
       def search_params
         @search_params ||=
           search_metadata[:names].map do |name|
@@ -111,6 +115,10 @@ module USCoreTestKit
         path == 'class' ? 'local_class' : path
       end
 
+      def optional?
+        conformance_expectation != 'SHALL' || !search_metadata[:must_support_or_mandatory]
+      end
+
       def search_definition(name)
         group_metadata.search_definitions[name.to_sym]
       end
@@ -127,15 +135,6 @@ module USCoreTestKit
         end
       end
 
-      def url_version
-        case group_metadata.version
-        when 'v3.1.1'
-          'STU3.1.1'
-        when 'v4.0.0'
-          'STU4'
-        end
-      end
-
       def search_test_properties_string
         search_properties
           .map { |key, value| "#{' ' * 8}#{key}: #{value}" }

data/lib/us_core_test_kit/generator/ig_resources.rb

@@ -39,8 +39,9 @@ module USCoreTestKit
         # remove '_' from search parameter name, such as _id or _tag
         normalized_name = normalized_name = name.to_s.delete_prefix('_')
 
-        resources_by_type['SearchParameter']
-          .find { |param| param.id == "us-core-#{resource.downcase}-#{normalized_name}" }
+        resources_by_type['SearchParameter'].find do |param|
+          param.id == "us-core-#{resource.downcase}-#{normalized_name}" || param.name == name
+        end
       end
 
       private

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -118,7 +118,7 @@ module USCoreTestKit
 
                 value_extractor = ValueExactor.new(ig_resources, resource, profile_elements)
 
-                values = value_extractor.values_from_value_set_binding(pattern_element).presence ||
+                values = value_extractor.codings_from_value_set_binding(pattern_element).presence ||
                          value_extractor.values_from_resource_metadata([metadata[:path]]).presence || []
 
                 {
@@ -346,7 +346,7 @@ module USCoreTestKit
           MustSupportMetadataExtractorUsCore5.new(profile, @must_supports).handle_special_cases
         when '6.1.0'
           MustSupportMetadataExtractorUsCore6.new(profile, @must_supports).handle_special_cases
-        when '7.0.0-ballot'
+        when '7.0.0'
           MustSupportMetadataExtractorUsCore7.new(profile, @must_supports).handle_special_cases
         end
       end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_7.rb

@@ -5,7 +5,7 @@ module USCoreTestKit
     class MustSupportMetadataExtractorUsCore7
       attr_accessor :profile, :must_supports
 
-      US_CORE_CATEGORY = ['sdoh', 'functional-status', 'disability-status', 'cognitive-status']
+      US_CORE_CATEGORY = ['sdoh', 'functional-status', 'disability-status', 'cognitive-status'].freeze
 
       def initialize(profile, must_supports)
         self.profile = profile
@@ -32,11 +32,11 @@ module USCoreTestKit
           }
         end
 
-        if more_choices.present?
-          must_supports[:choices] ||= []
-          must_supports[:choices].concat(more_choices)
-        end
+        return if more_choices.empty?
+
+        must_supports[:choices] ||= []
+        must_supports[:choices].concat(more_choices)
       end
     end
   end
-end
+end

data/lib/us_core_test_kit/generator/naming.rb

@@ -28,6 +28,14 @@ module USCoreTestKit
       PROCEDURE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure'
       PROVENANCE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance'
 
+      IG_LINKS = {
+        'v3.1.1' => 'http://hl7.org/fhir/us/core/STU3.1.1',
+        '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'
+      }.freeze
+
       class << self
         def resources_with_multiple_profiles
           ['Condition', 'DiagnosticReport', 'Observation']
@@ -54,6 +62,10 @@ module USCoreTestKit
         def upper_camel_case_for_profile(group_metadata)
           snake_case_for_profile(group_metadata).camelize
         end
+
+        def ig_link(version)
+          IG_LINKS[version]
+        end
       end
     end
   end

data/lib/us_core_test_kit/generator/search_definition_metadata_extractor.rb

@@ -47,6 +47,8 @@ module USCoreTestKit
               path.gsub!(/[. ]as[( ](#{as_type}[^)]*)[)]?/, as_type.upcase_first) if as_type.present?
             end
 
+            path.gsub!('Resource.', "#{resource}.") if path.start_with?('Resource.')
+
             full_paths = path.split('|')
 
             # There is a bug in US Core 5 asserted-date search parameter. See FHIR-40573
@@ -162,16 +164,15 @@ module USCoreTestKit
       end
 
       def multiple_or_expectation
-        param_hash['_multipleOr']['extension'].first['valueCode']
+        param_hash['_multipleOr'] ? param_hash['_multipleOr']['extension'].first['valueCode'] : 'MAY'
       end
 
       def values
         values_from_must_supports(profile_element).presence ||
-        value_extractor.values_from_fixed_codes(profile_element, type).presence ||
-        #value_extractor.values_from_required_binding(profile_element).presence ||
-        value_extractor.values_from_value_set_binding(profile_element).presence ||
-        values_from_resource_metadata(paths).presence ||
-        []
+          value_extractor.values_from_fixed_codes(profile_element, type).presence ||
+          value_extractor.codes_from_value_set_binding(profile_element).presence ||
+          values_from_resource_metadata(paths).presence ||
+          []
       end
 
       def values_from_must_supports(profile_element)
@@ -196,7 +197,7 @@ module USCoreTestKit
             when 'patternCoding', 'patternCodeableConcept'
               slice[:discriminator][:code]
             when 'requiredBinding'
-              slice[:discriminator][:values]
+              value_extractor.codes_from_system_code_pair(slice[:discriminator][:values])
             when 'value'
               slice[:discriminator][:values]
                 .select { |value| value[:path] == 'coding.code' }
@@ -214,7 +215,7 @@ module USCoreTestKit
 
       def values_from_resource_metadata(paths)
         if multiple_or_expectation == 'SHALL' || paths.any? { |path| path.downcase.include?('status') }
-          value_extractor.values_from_resource_metadata(paths)
+          value_extractor.codes_from_system_code_pair(value_extractor.values_from_resource_metadata(paths))
         else
           []
         end

data/lib/us_core_test_kit/generator/search_test_generator.rb

@@ -208,13 +208,8 @@ module USCoreTestKit
         end
       end
 
-      def url_version
-        case group_metadata.version
-        when 'v3.1.1'
-          'STU3.1.1'
-        when 'v4.0.0'
-          'STU4'
-        end
+      def ig_link
+        Naming.ig_link(group_metadata.version)
       end
 
       def search_test_properties_string
@@ -286,7 +281,7 @@ module USCoreTestKit
         #{first_search_description}
         #{post_search_description}
 
-        [US Core Server CapabilityStatement](http://hl7.org/fhir/us/core/#{url_version}/CapabilityStatement-us-core-server.html)
+        [US Core Server CapabilityStatement](#{ig_link}/CapabilityStatement-us-core-server.html)
         DESCRIPTION
       end
     end