us_core_test_kit 0.11.3 → 0.11.4

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_6.rb

@@ -31,6 +31,9 @@ module USCoreTestKit
         remove_practitioner_address
         remove_diagnosticreport_media
         remove_patient_gender_identity
+        remove_medicationdispense_practitioner
+        remove_coverage_group_name
+        remove_must_supports_from_encounter_diagnosis
       end
 
       def add_must_support_choices
@@ -114,6 +117,36 @@ module USCoreTestKit
         return unless profile.type == 'Patient'
         must_supports[:extensions].delete_if { |extension| extension[:id] == 'Patient.extension:genderIdentity' }
       end
+
+      # US Core v6.1.0 Patch FHIR-50239, Remove MustSupport target profile from MedicationDispense.performer.actor
+      # - US Core Practitioner
+      def remove_medicationdispense_practitioner
+        return unless profile.type == 'MedicationDispense'
+
+        element = must_supports[:elements].find { |element| element[:path] == 'performer.actor' }
+        element[:target_profiles].delete_if do |url|
+          url == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner'
+        end
+      end
+
+      # US Core v6.1.0 Patch FHIR-50283, Remove MustSupport element from Coverage:
+      # - group name
+      def remove_coverage_group_name
+        return unless profile.type == 'Coverage'
+        must_supports[:elements].delete_if { |element| element[:path] == 'class:group.name' }
+      end
+
+      # US Core v6.1.0 Patch FHIR-50288, Remove these MustSupport elements from US Core Condition Encounter Diagnosis:
+      # - Condition.extension:assertedDate
+      # - Condition.onsetDateTime
+      # - clinical status
+      # - verification status
+      def remove_must_supports_from_encounter_diagnosis
+        return unless profile.id == 'us-core-condition-encounter-diagnosis'
+        must_supports[:extensions].delete_if { |extension| extension[:id] == 'Condition.extension:assertedDate' }
+        must_supports[:elements].delete_if { |element| ['onsetDateTime', 'clinicalStatus', 'verificationStatus'].include?(element[:path]) }
+        must_supports[:choices].delete_if { |choice| choice[:paths].include?('onsetDateTime') }
+      end
     end
   end
 end

data/lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_7.rb

@@ -21,6 +21,9 @@ module USCoreTestKit
         add_must_support_choices
         us_core_6_extractor.remove_practitioner_address
         us_core_6_extractor.remove_patient_gender_identity
+        us_core_6_extractor.remove_coverage_group_name
+        us_core_6_extractor.remove_medicationdispense_practitioner
+        us_core_6_extractor.remove_must_supports_from_encounter_diagnosis
       end
 
       def add_must_support_choices

data/lib/us_core_test_kit/generator/must_support_test_generator.rb

@@ -76,6 +76,7 @@ module USCoreTestKit
       end
 
       def build_must_support_list_string(uscdi_only)
+
         slice_names = group_metadata.must_supports[:slices]
           .select { |slice| slice[:uscdi_only].presence == uscdi_only.presence }
           .map { |slice| slice[:slice_id] }

data/lib/us_core_test_kit/generator/suite_generator.rb

@@ -63,7 +63,7 @@ module USCoreTestKit
       end
 
       def title
-        "US Core #{ig_metadata.ig_version}"
+        "US Core Server #{ig_metadata.ig_version}"
       end
 
       def ig_identifier

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

@@ -18,7 +18,7 @@ module USCoreTestKit
     class <%= class_name %> < Inferno::TestSuite
       title '<%= title %>'
       description %(
-        The US Core Test Kit tests systems for their conformance to the [US Core
+        The US Core Server Test Kit tests server systems for their conformance to the [US Core
         Implementation Guide](<%=ig_link %>).
 
         HL7® FHIR® resources are validated with the Java validator using

data/lib/us_core_test_kit/metadata.rb

@@ -5,7 +5,7 @@ module USCoreTestKit
     id :us_core_test_kit
     title 'US Core Test Kit'
     description <<~DESCRIPTION
-      The US Core Test Kit validates the conformance of a server implementation to a specific
+      The US Core Test Kit validates the conformance of server and client implementations to a specific
       version of the [US Core IG](http://hl7.org/fhir/us/core). Currently, Inferno can test
       against implementations of following versions of the US Core IG:
       [v3.1.1](http://hl7.org/fhir/us/core/STU3.1.1/),
@@ -26,9 +26,13 @@ module USCoreTestKit
       ## Status
 
       The US Core Test Kit is actively developed and regularly updated. Starting with STU3,
-      each STU sequence is kept up-to-date with the latest version.
+      each STU sequence is kept up-to-date with the latest version. See the test descriptions
+      within the test kit for detail on the specific validations performed as part of testing
+      these requirements.
 
-      The test kit currently tests the following requirements:
+      ### Server Suites
+
+      The US Core Server suites are mature tests and currently verify the following requirements:
 
       - Support for Capability Statement
       - Support for all US Core Profiles
@@ -39,8 +43,13 @@ module USCoreTestKit
       - Clinical Notes Guidance
       - Missing Data Guidance
 
-      See the test descriptions within the test kit for detail on the specific validations
-      performed as part of testing these requirements.
+      ### Client suites
+      
+      The US Core Client suites are less mature and currently verify the following requirements:
+
+      - Support for making requests for data on all US Core Profiles
+      - Support for read and search interaction requests
+      - Initiate searches using each required search parameter combination
 
       ## Repository
 
@@ -59,7 +68,8 @@ module USCoreTestKit
       [issues section](https://github.com/inferno-framework/us-core-test-kit/issues)
       of the repository.
     DESCRIPTION
-    suite_ids [:us_core_v311, :us_core_v400, :us_core_v501, :us_core_v610, :us_core_v700]
+    suite_ids [:us_core_v311, :us_core_v400, :us_core_v501, :us_core_v610, :us_core_v700, :us_core_client_v311,
+               :us_core_client_v400, :us_core_client_v501, :us_core_client_v610, :us_core_client_v700]
     tags ['SMART App Launch', 'US Core']
     last_updated LAST_UPDATED
     version VERSION

data/lib/us_core_test_kit/search_test.rb

@@ -2,6 +2,7 @@ require_relative 'date_search_validation'
 require_relative 'fhir_resource_navigation'
 require_relative 'resource_search_param_checker'
 require_relative 'search_test_properties'
+require_relative 'well_known_code_systems'
 
 module USCoreTestKit
   module SearchTest
@@ -9,6 +10,7 @@ module USCoreTestKit
     include DateSearchValidation
     include FHIRResourceNavigation
     include ResourceSearchParamChecker
+    include WellKnownCodeSystems
 
     def_delegators 'self.class', :metadata, :provenance_metadata, :properties
     def_delegators 'properties',
@@ -574,6 +576,15 @@ module USCoreTestKit
         fetch_all_bundled_resources(resource_type:, bundle:, reply_handler: reply_and_assert_handler, max_pages:, additional_resource_types:, tags:)
     end
 
+    def prefer_well_known_code_system(element, include_system)
+      coding =
+        find_a_value_at(element, 'coding') { |c| c.code.present? && WellKnownCodeSystems.include?(c.system) }
+
+      return coding if coding.present?
+
+      find_a_value_at(element, 'coding') { |c| c.code.present? && (!include_system || c.system.present?) }
+    end
+
     def search_param_value(name, resource, include_system: false)
       paths = search_param_paths(name)
       search_value = nil
@@ -592,13 +603,8 @@ module USCoreTestKit
           when FHIR::Reference
             element.reference
           when FHIR::CodeableConcept
-            if include_system
-              coding =
-                find_a_value_at(element, 'coding') { |coding| coding.code.present? && coding.system.present? }
-              "#{coding.system}|#{coding.code}"
-            else
-              find_a_value_at(element, 'coding.code')
-            end
+            coding = prefer_well_known_code_system(element, include_system)
+            include_system ? "#{coding.system}|#{coding.code}" : coding.code
           when FHIR::Identifier
             include_system ? "#{element.system}|#{element.value}" : element.value
           when FHIR::Coding
@@ -641,13 +647,8 @@ module USCoreTestKit
       when FHIR::Reference
         element.reference.present?
       when FHIR::CodeableConcept
-        if include_system
-          coding =
-            find_a_value_at(element, 'coding') { |coding| coding.code.present? && coding.system.present? }
-          coding.present?
-        else
-          find_a_value_at(element, 'coding.code').present?
-        end
+        coding = prefer_well_known_code_system(element, include_system)
+        coding.present?
       when FHIR::Identifier
         include_system ? element.value.present? && element.system.present? : element.value.present?
       when FHIR::Coding

data/lib/us_core_test_kit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.11.3'
-  LAST_UPDATED = '2025-05-20'
+  VERSION = '0.11.4'
+  LAST_UPDATED = '2025-06-10'
 end

data/lib/us_core_test_kit/well_known_code_systems.rb

@@ -0,0 +1,21 @@
+module USCoreTestKit
+  module WellKnownCodeSystems
+    HL7_CODE_SYSTEMS = [
+      'http://terminology.hl7.org/CodeSystem',
+      'http://hl7.org/fhir/us/core/CodeSystem'
+    ].freeze
+
+    WELL_KNOWN_CODE_SYSTEMS = [
+      'http://loinc.org',
+      'http://snomed.info/sct'
+    ].freeze
+
+    class << self
+      def include?(system)
+        return false unless system.present?
+
+        WELL_KNOWN_CODE_SYSTEMS.include?(system) || HL7_CODE_SYSTEMS.any? { |cs| system.start_with?(cs) }
+      end
+    end
+  end
+end