us_core_test_kit 0.8.1 → 0.9.0

data/lib/us_core_test_kit/reference_resolution_test.rb

@@ -119,36 +119,17 @@ module USCoreTestKit
         return resource.contained.any? do |contained_resource|
             contained_resource&.id == reference.reference_id &&
               resource_is_valid_with_target_profile?(contained_resource, target_profile)
-          end
+        end
       end
 
       reference_type = reference.resource_type
       reference_id = reference.reference_id
 
-      resolved_resource =
-        begin
-          if reference.relative?
-            begin
-              reference.resource_class
-            rescue NameError
-              return false
-            end
+      resolved_resource = resolve_reference(reference)
 
-            fhir_read(reference_type, reference_id)&.resource
-          else
-            if reference.base_uri.chomp('/') == fhir_client.instance_variable_get(:@base_service_url).chomp('/')
-              fhir_read(reference_type, reference_id)&.resource
-            else
-              get(reference.reference)&.resource
-            end
-          end
-        rescue StandardError => e
-          Inferno::Application['logger'].error("Unable to resolve reference #{reference.reference}")
-          Inferno::Application['logger'].error(e.full_message)
-          return false
-        end
+      return false if resolved_resource.nil?
 
-      return false unless resolved_resource&.resourceType == reference_type && resolved_resource&.id == reference_id
+      return false unless resolved_resource.resourceType == reference_type && resolved_resource.id == reference_id
 
       return false unless resource_is_valid_with_target_profile?(resolved_resource, target_profile)
 
@@ -156,6 +137,33 @@ module USCoreTestKit
       true
     end
 
+    def resolve_reference(reference)
+      reference_type = reference.resource_type
+      reference_id = reference.reference_id
+
+      begin
+        if reference.relative?
+          begin
+            reference.resource_class
+          rescue NameError
+            return nil
+          end
+
+          fhir_read(reference_type, reference_id)&.resource
+        else
+          if reference.base_uri.chomp('/') == fhir_client.instance_variable_get(:@base_service_url).chomp('/')
+            fhir_read(reference_type, reference_id)&.resource
+          else
+            get(reference.reference)&.resource
+          end
+        end
+      rescue StandardError => e
+        Inferno::Application['logger'].error("Unable to resolve reference #{reference.reference}")
+        Inferno::Application['logger'].error(e.full_message)
+        return nil
+      end
+    end
+
     def resource_is_valid_with_target_profile?(resource, target_profile)
       return true if target_profile.blank?
 

data/lib/us_core_test_kit/us_core_options.rb

@@ -1,10 +1,11 @@
 module USCoreTestKit
-    module USCoreOptions
-      SMART_1 = 'smart_app_launch_1'.freeze
-      SMART_2 = 'smart_app_launch_2'.freeze
-  
-      SMART_1_REQUIREMENT = { smart_app_launch_version: SMART_1 }.freeze
-      SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze
-    end
+  module USCoreOptions
+    SMART_1 = 'smart_app_launch_1'.freeze
+    SMART_2 = 'smart_app_launch_2'.freeze
+    SMART_2_2 = 'smart_app_launch_2_2'.freeze
+
+    SMART_1_REQUIREMENT = { smart_app_launch_version: SMART_1 }.freeze
+    SMART_2_REQUIREMENT = { smart_app_launch_version: SMART_2 }.freeze
+    SMART_2_2_REQUIREMENT = { smart_app_launch_version: SMART_2_2 }.freeze
   end
-  
+end

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: tls_test_kit
   requirement: !ruby/object:Gem::Requirement
@@ -131,13 +131,15 @@ files:
 - lib/us_core_test_kit/custom_groups/smart_app_launch_group.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu1.rb
 - lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2.rb
+- lib/us_core_test_kit/custom_groups/smart_ehr_launch_stu2_2.rb
 - lib/us_core_test_kit/custom_groups/smart_scopes_constants.rb
 - lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu1_group.rb
+- lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu2_2_group.rb
 - lib/us_core_test_kit/custom_groups/smart_standalone_launch_stu2_group.rb
 - lib/us_core_test_kit/custom_groups/smart_well_known_capabilities_test.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v3.1.1/clinical_notes_guidance_group.rb
-- lib/us_core_test_kit/custom_groups/v3.1.1/profile_support_test.rb
+- lib/us_core_test_kit/custom_groups/v3.1.1/resource_support_test.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/clinical_notes_guidance_group.rb
 - lib/us_core_test_kit/custom_groups/v4.0.0/document_reference_custodian_test.rb
@@ -148,6 +150,8 @@ files:
 - lib/us_core_test_kit/custom_groups/v7.0.0/capability_statement_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/screening_assessment_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_group.rb
+- lib/us_core_test_kit/custom_groups/v7.0.0/smart_app_launch_stu2_2_group.rb
+- lib/us_core_test_kit/custom_groups/v7.0.0/smart_discovery_stu2_2_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_discovery_stu2_group.rb
 - lib/us_core_test_kit/custom_groups/v7.0.0/smart_granular_scopes_group.rb
 - lib/us_core_test_kit/date_search_validation.rb
@@ -1739,6 +1743,7 @@ files:
 - lib/us_core_test_kit/generated/v6.1.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/pediatric_weight_for_height_group.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/metadata.yml
+- lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_address_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_id_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_identifier_search_test.rb
 - lib/us_core_test_kit/generated/v6.1.0/practitioner/practitioner_must_support_test.rb
@@ -2359,6 +2364,7 @@ files:
 - lib/us_core_test_kit/generated/v7.0.0/pediatric_weight_for_height/pediatric_weight_for_height_validation_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/pediatric_weight_for_height_group.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/metadata.yml
+- lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_address_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_id_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_identifier_search_test.rb
 - lib/us_core_test_kit/generated/v7.0.0/practitioner/practitioner_must_support_test.rb
@@ -2522,6 +2528,7 @@ files:
 - lib/us_core_test_kit/generator/must_support_metadata_extractor_us_core_7.rb
 - lib/us_core_test_kit/generator/must_support_test_generator.rb
 - lib/us_core_test_kit/generator/naming.rb
+- lib/us_core_test_kit/generator/practitioner_address_test_generator.rb
 - lib/us_core_test_kit/generator/provenance_revinclude_search_test_generator.rb
 - lib/us_core_test_kit/generator/read_test_generator.rb
 - lib/us_core_test_kit/generator/reference_resolution_test_generator.rb
@@ -2558,6 +2565,7 @@ files:
 - lib/us_core_test_kit/igs/us_core_700/ValueSet-SmokingStatusType.json
 - lib/us_core_test_kit/igs/us_core_700/ValueSet-servicerequest-category.json
 - lib/us_core_test_kit/must_support_test.rb
+- lib/us_core_test_kit/practitioner_address_test.rb
 - lib/us_core_test_kit/primitive_type.rb
 - lib/us_core_test_kit/provenance_validator.rb
 - lib/us_core_test_kit/read_test.rb
@@ -2590,7 +2598,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: US Core Inferno tests