us_core_test_kit 0.11.5 → 0.11.6

data/lib/us_core_test_kit/resource_search_param_checker.rb

@@ -2,7 +2,7 @@ require_relative 'fhir_resource_navigation'
 
 module USCoreTestKit
   module ResourceSearchParamChecker
-    include FHIRResourceNavigation
+    include Inferno::DSL::FHIRResourceNavigation
 
     def search_param_paths(name)
       paths = metadata.search_definitions[name.to_sym][:paths]
@@ -136,4 +136,4 @@ module USCoreTestKit
     end
     
   end
-end
+end

data/lib/us_core_test_kit/search_test.rb

@@ -1,14 +1,14 @@
 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'
+require_relative 'fhir_resource_navigation'
 
 module USCoreTestKit
   module SearchTest
     extend Forwardable
     include DateSearchValidation
-    include FHIRResourceNavigation
+    include Inferno::DSL::FHIRResourceNavigation
     include ResourceSearchParamChecker
     include WellKnownCodeSystems
 
@@ -168,6 +168,18 @@ module USCoreTestKit
       end
     end
 
+    def excluded_code?(coding, codes_to_exclude)
+      codes_to_exclude.any? do |exclude_code|
+        if exclude_code.include?('|')
+          system, code = exclude_code.split('|')
+          coding.code == code && coding.system == system
+        else
+          code = exclude_code
+          coding.code == code
+        end
+      end
+    end
+
     def filter_conditions(resources)
       # HL7 JIRA FHIR-37917. US Core v5.0.1 does not required patient+category.
       # In order to distinguish which resources matches the current profile, Inferno has to manually filter
@@ -181,6 +193,16 @@ module USCoreTestKit
       end
     end
 
+    def filter_adi_document_reference(resources)
+      resources.select! do |resource|
+        resource.category.any? do |category|
+          category.coding.any? do |coding|
+            metadata.search_definitions[:category][:values].include? coding.code
+          end
+        end
+      end
+    end
+
     def search_and_check_response(params, resource_type = self.resource_type)
       fhir_search resource_type, params:, tags: tags(params)
 
@@ -620,7 +642,7 @@ module USCoreTestKit
             element.family || element.given&.first || element.text
           when FHIR::Address
             element.text || element.city || element.state || element.postalCode || element.country
-          when USCoreTestKit::PrimitiveType
+          when Inferno::DSL::PrimitiveType
             element.value
           else
             if metadata.version != 'v3.1.1' &&
@@ -663,7 +685,7 @@ module USCoreTestKit
         (element.family || element.given&.first || element.text).present?
       when FHIR::Address
         (element.text || element.city || element.state || element.postalCode || element.country).present?
-      when USCoreTestKit::PrimitiveType
+      when Inferno::DSL::PrimitiveType
         element.value.present?
       else
         true
@@ -733,7 +755,7 @@ module USCoreTestKit
           values_found <<
             if value.is_a? FHIR::Reference
               value.reference
-            elsif value.is_a? USCoreTestKit::PrimitiveType
+            elsif value.is_a? Inferno::DSL::PrimitiveType
               value.value
             else
               value

data/lib/us_core_test_kit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.11.5'
-  LAST_UPDATED = '2025-06-30'
+  VERSION = '0.11.6'
+  LAST_UPDATED = '2025-07-07'
 end

data/lib/us_core_test_kit.rb

@@ -4,6 +4,7 @@ require_relative 'us_core_test_kit/generated/v4.0.0/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v5.0.1/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v6.1.0/us_core_test_suite'
 require_relative 'us_core_test_kit/generated/v7.0.0/us_core_test_suite'
+require_relative 'us_core_test_kit/generated/v8.0.0/us_core_test_suite'
 require_relative 'us_core_test_kit/client/generated/v3.1.1/us_core_client_test_suite'
 require_relative 'us_core_test_kit/client/generated/v4.0.0/us_core_client_test_suite'
 require_relative 'us_core_test_kit/client/generated/v5.0.1/us_core_client_test_suite'