inferno_core 1.0.8 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c17ba07e32fab23c4a830a0b6fd22f03ce711fdb89c2a555916355cd1e68e03
-  data.tar.gz: 4b20e2c2e7d181893f9282ed8954a053beef0a3ee53ce198668b708c024c9aff
+  metadata.gz: cc9addf71b6ea91eb5aa426eabe24df9a2cbdb3199271e3f60d8e66f1cacd8cc
+  data.tar.gz: 16fd0eaf84e1c2a391ba90efcedbeae1a24f82ad45dcc9b7a8b5e2365ed3d53d
 SHA512:
-  metadata.gz: 264803ea3c53af5df0157710f0091b994acebabdb6751e8f442707de01fc57b0f373bb2a5c021f0eb43ba47f1b293c11d534b482787284d352cf6caf09437b47
-  data.tar.gz: a899635f3a8d68ea3326ed344ce8ae7e8e09ad3f484dce2cba491b7678d849346ed4cb34ef4f0f7bab26f80d4332cd102d8ce896af5403f1b367606f9e2311dc
+  metadata.gz: 0eed6f34c2f0cfd4a78f12d7dc4ce853480520d740e4af6da052ec4b4eb2d3551ff4208e99516990438a957dcccf8a0ad38f01aaae34224b5286086fb88d4095
+  data.tar.gz: 0fc841b4d2ad71f098061277d9041caa6633e36679276ca6db2db8553c22a383d63c950196aacb661b9175b398aa8e80da5f5e8cd9b90d377019afb8b14d04b9

data/lib/inferno/apps/web/serializers/test.rb

@@ -21,6 +21,7 @@ module Inferno
         field :input_instructions
         field :user_runnable?, name: :user_runnable
         field :optional?, name: :optional
+        field :simulation_verification?, name: :is_simulation_verification
         field :verifies_requirements, if: :field_present?, extractor: RequirementsFilteringExtractor
       end
     end

data/lib/inferno/dsl/assertions.rb

@@ -1,4 +1,5 @@
 require_relative '../exceptions'
+require_relative 'messages'
 
 module Inferno
   module DSL
@@ -7,6 +8,7 @@ module Inferno
     # immediately stop execution and receive a `fail` result. Additional
     # assertions added to this module will be available in all tests.
     module Assertions
+      include Messages
       # Make an assertion
       #
       # @param test a value whose truthiness will determine whether the
@@ -59,6 +61,7 @@ module Inferno
       # @private
       def invalid_resource_message(resource, profile_url)
         return "Resource does not conform to the profile: #{profile_url}" if profile_url.present?
+        return 'No resource to validate.' unless resource.present?
 
         "Resource does not conform to the base #{resource&.resourceType} profile."
       end
@@ -70,12 +73,31 @@ module Inferno
       #   may include a version separated by a vertical bar (|),
       #   and defaults to validating against the base FHIR resource type
       # @param validator [Symbol] the name of the validator to use
+      # @param message_prefix [String] Prefix to add to the start of logged messages
       # @return [void]
-      def assert_valid_resource(resource: self.resource, profile_url: nil, validator: :default)
-        assert resource_is_valid?(resource:, profile_url:, validator:),
+      def assert_valid_resource(resource: self.resource, profile_url: nil, validator: :default, message_prefix: '')
+        assert resource_is_valid?(resource:, profile_url:, validator:, message_prefix:),
                invalid_resource_message(resource, profile_url)
       end
 
+      # @private
+      def invalid_object_message(model_url)
+        "Object does not conform to the logical model: #{model_url}"
+      end
+
+      # Validate an object against a logical model
+      #
+      # @param object [Hash]
+      # @param model_url [String] canonical url of the model to validate against,
+      #   may include a version separated by a vertical bar (|),
+      # @param validator [Symbol] the name of the validator to use
+      # @param message_prefix [String] Prefix to add to the start of logged messages
+      # @return [void]
+      def assert_conformance_to_logical_model(object, model_url, validator: :default, message_prefix: '')
+        assert conforms_to_logical_model?(object, model_url, validator:, message_prefix:),
+               invalid_object_message(model_url)
+      end
+
       # Validate each entry of a Bundle
       #
       # @param bundle [FHIR::Bundle]
@@ -87,6 +109,7 @@ module Inferno
       #   types as keys and profile urls (or nil) as values, only those resource
       #   types will be validated against the provided profile url or the base
       #   resource if nil.
+      # @param message_prefix [String] Prefix to add to the start of logged messages
       # @example
       #   # Only validate Patient bundle entries
       #   assert_valid_bundle_entries(resource_types: 'Patient')
@@ -104,7 +127,7 @@ module Inferno
       #     }
       #   )
       # @return [void]
-      def assert_valid_bundle_entries(bundle: resource, resource_types: {})
+      def assert_valid_bundle_entries(bundle: resource, resource_types: {}, message_prefix: '')
         assert_resource_type('Bundle', resource: bundle)
 
         types_to_check = normalize_types_to_check(resource_types)
@@ -115,7 +138,7 @@ module Inferno
             .map(&:resource)
             .select { |resource| types_to_check.empty? || types_to_check.include?(resource.resourceType) }
             .reject do |resource|
-              validation_params = { resource: }
+              validation_params = { resource:, message_prefix: }
               profile = types_to_check[resource.resourceType]
               validation_params[:profile_url] = profile if profile
 
@@ -161,9 +184,25 @@ module Inferno
       # @param message [String] extra failure message
       # @return [void]
       def assert_valid_json(maybe_json_string, message = '')
-        assert JSON.parse(maybe_json_string)
+        parsed_json_if_valid(maybe_json_string, message, continue: false)
+      end
+
+      # Return parsed json Hash if valid, or indicate an error with an error message or a failed assert
+      #
+      # @param maybe_json_string [String]
+      # @param message [String] extra failure message
+      # @param continue [Boolean] if true will log an error message and continue,
+      #        otherwise will raise an assert exception
+      # @return [void]
+      def parsed_json_if_valid(maybe_json_string, message = '', continue: true)
+        JSON.parse(maybe_json_string)
       rescue JSON::ParserError
-        assert false, "Invalid JSON. #{message}"
+        if continue
+          add_message(:error, "Invalid JSON. #{message}")
+          nil
+        else
+          assert false, "Invalid JSON. #{message}"
+        end
       end
 
       # Check for a valid http/https uri
@@ -224,6 +263,16 @@ module Inferno
         "Could not find #{missing_elements.join(', ')} in the #{resources.length} " \
           'provided resource(s)'
       end
+
+      # Check that there are no messages associated with the current runnable with a type of 'error'
+      #
+      # @param message [String] failure message
+      # @param message_list [Array] (optional) list of messages to check for errors,
+      #        if different from the runnable's messages
+      # @return [void]
+      def assert_no_error_messages(message = '', message_list: messages)
+        assert !error_messages?(message_list:), message.present? ? message : 'Errors found - see Messages for details.'
+      end
     end
   end
 end

data/lib/inferno/dsl/fhir_client.rb

@@ -1,6 +1,7 @@
 require_relative 'fhir_client_builder'
 require_relative 'request_storage'
 require_relative 'tcp_exception_handler'
+require_relative 'messages'
 
 module Inferno
   module DSL
@@ -37,6 +38,8 @@ module Inferno
     # @see Inferno::DSL::FHIRClientBuilder Documentation for the client
     #   configuration DSL
     module FHIRClient
+      include Messages
+
       # @private
       def self.included(klass)
         klass.extend ClassMethods