inferno_core 0.4.39 → 0.4.40

data/lib/inferno/dsl.rb

@@ -2,10 +2,12 @@ require_relative 'dsl/assertions'
 require_relative 'dsl/fhir_client'
 require_relative 'dsl/fhir_validation'
 require_relative 'dsl/fhir_resource_validation'
+require_relative 'dsl/fhirpath_evaluation'
 require_relative 'dsl/http_client'
 require_relative 'dsl/results'
 require_relative 'dsl/runnable'
 require_relative 'dsl/suite_endpoint'
+require_relative 'dsl/messages'
 
 module Inferno
   # The DSL for writing tests.
@@ -16,7 +18,9 @@ module Inferno
       HTTPClient,
       Results,
       FHIRValidation,
-      FHIRResourceValidation
+      FHIRResourceValidation,
+      FhirpathEvaluation,
+      Messages
     ].freeze
 
     EXTENDABLE_DSL_MODULES = [

data/lib/inferno/entities/test.rb

@@ -1,6 +1,5 @@
 require_relative '../dsl'
 require_relative '../repositories/tests'
-require_relative '../utils/markdown_formatter'
 require 'pry'
 
 module Inferno
@@ -8,7 +7,6 @@ module Inferno
     class Test
       extend Forwardable
       include DSL
-      include Inferno::Utils::MarkdownFormatter
 
       def_delegators 'self.class', :title, :id, :block, :inputs, :outputs
 
@@ -23,20 +21,6 @@ module Inferno
         @suite_options = params[:suite_options].presence || {}
       end
 
-      # @private
-      def messages
-        @messages ||= []
-      end
-
-      # Add a message to the result.
-      #
-      # @param type [String] error, warning, or info
-      # @param message [String]
-      # @return [void]
-      def add_message(type, message)
-        messages << { type: type.to_s, message: format_markdown(message) }
-      end
-
       # Set output values. Once set, these values will be available to any
       # subsequent tests.
       #
@@ -59,54 +43,6 @@ module Inferno
         @outputs_to_persist ||= {}
       end
 
-      # Add an informational message to the results of a test. If passed a
-      # block, a failed assertion will become an info message and test execution
-      # will continue.
-      #
-      # @param message [String]
-      # @return [void]
-      # @example
-      #   # Add an info message
-      #   info 'This message will be added to the test results'
-      #
-      #   # The message for the failed assertion will be treated as an info
-      #   # message. Test exection will continue.
-      #   info { assert false == true }
-      def info(message = nil)
-        unless block_given?
-          add_message('info', message) unless message.nil?
-          return
-        end
-
-        yield
-      rescue Exceptions::AssertionException => e
-        add_message('info', e.message)
-      end
-
-      # Add a warning message to the results of a test. If passed a block, a
-      # failed assertion will become a warning message and test execution will
-      # continue.
-      #
-      # @param message [String]
-      # @return [void]
-      # @example
-      #   # Add a warning message
-      #   warning 'This message will be added to the test results'
-      #
-      #   # The message for the failed assertion will be treated as a warning
-      #   # message. Test exection will continue.
-      #   warning { assert false == true }
-      def warning(message = nil)
-        unless block_given?
-          add_message('warning', message) unless message.nil?
-          return
-        end
-
-        yield
-      rescue Exceptions::AssertionException => e
-        add_message('warning', e.message)
-      end
-
       # @private
       def method_missing(name, *args, &)
         parent_instance = self.class.parent&.new
@@ -167,18 +103,6 @@ module Inferno
           Inferno::Repositories::Tests.new
         end
 
-        # Set/Get the block that is executed when a Test is run
-        #
-        # @param block [Proc]
-        # @return [Proc] the block that is executed when a Test is run
-        def block(&block)
-          return @block unless block_given?
-
-          @block = block
-        end
-
-        alias run block
-
         def short_id
           @short_id ||= begin
             prefix = parent.respond_to?(:short_id) ? "#{parent.short_id}." : ''

data/lib/inferno/entities/test_group.rb

@@ -1,5 +1,6 @@
 require_relative '../dsl'
 require_relative '../repositories/test_groups'
+require_relative '../result_collection'
 
 module Inferno
   module Entities
@@ -9,8 +10,19 @@ module Inferno
       extend DSL::HTTPClient::ClassMethods
       extend DSL::Runnable
       include DSL::FHIRValidation
+      include DSL::FhirpathEvaluation
+      include DSL::Results
+      include DSL::Assertions
+      include DSL::Messages
 
-      def_delegators 'self.class', :title, :id, :groups, :inputs, :outputs, :tests
+      def_delegators 'self.class', :title, :id, :block, :groups, :inputs, :outputs, :tests
+
+      attr_accessor :result_message, :results
+
+      # @private
+      def initialize
+        @results = Inferno::ResultCollection.new
+      end
 
       # @private
       def method_missing(name, *args, &)

data/lib/inferno/entities/test_suite.rb

@@ -1,8 +1,10 @@
 require_relative 'test_group'
 require_relative '../dsl/runnable'
 require_relative '../dsl/suite_option'
+require_relative '../dsl/messages'
 require_relative '../repositories/test_groups'
 require_relative '../repositories/test_suites'
+require_relative '../result_collection'
 
 module Inferno
   module Entities
@@ -14,6 +16,19 @@ module Inferno
       extend DSL::HTTPClient::ClassMethods
       include DSL::FHIRValidation
       include DSL::FHIRResourceValidation
+      include DSL::FhirpathEvaluation
+      include DSL::Results
+      include DSL::Assertions
+      include DSL::Messages
+
+      def_delegators 'self.class', :block
+
+      attr_accessor :result_message, :results
+
+      # @private
+      def initialize
+        @results = Inferno::ResultCollection.new
+      end
 
       class << self
         extend Forwardable

data/lib/inferno/exceptions.rb

@@ -64,6 +64,25 @@ module Inferno
       end
     end
 
+    class FhirpathNotFoundException < RuntimeError
+      def initialize(fhirpath_name)
+        super("No '#{fhirpath_name}' FHIRPath evaluator found")
+      end
+    end
+
+    # ErrorInFhirpathException is used when an exception occurred in
+    # calling the FHIRPath service, for example a connection timeout
+    # or an unexpected response format.
+    # Note: This class extends TestResultException instead of RuntimeError
+    # to bypass printing the stack trace in the UI, since
+    # the stack trace of this exception is not likely be useful.
+    # Instead the message should point to where in the fhirpath evaluator an error occurred.
+    class ErrorInFhirpathException < TestResultException
+      def result
+        'error'
+      end
+    end
+
     class RequiredInputsNotFound < RuntimeError
       def initialize(missing_inputs)
         super("Missing the following required inputs: #{missing_inputs.join(', ')}")

data/lib/inferno/ext/fhir_client.rb

@@ -1,13 +1,13 @@
 module FHIR
   class Client
-    attr_accessor :oauth_credentials
+    attr_accessor :oauth_credentials, :auth_info
 
     def need_to_refresh?
-      oauth_credentials&.need_to_refresh?
+      !!(auth_info&.need_to_refresh? || oauth_credentials&.need_to_refresh?)
     end
 
     def able_to_refresh?
-      oauth_credentials&.able_to_refresh?
+      !!(auth_info&.able_to_refresh? || oauth_credentials&.able_to_refresh?)
     end
   end
 end

data/lib/inferno/jobs/invoke_validator_session.rb

@@ -8,16 +8,15 @@ module Inferno
         suite = Inferno::Repositories::TestSuites.new.find suite_id
         validator = suite.fhir_validators[validator_name.to_sym][validator_index]
         response_body = validator.validate(FHIR::Patient.new, 'http://hl7.org/fhir/StructureDefinition/Patient')
-        if response_body.start_with? '{'
-          res = JSON.parse(response_body)
-          session_id = res['sessionId']
-          session_repo = Inferno::Repositories::ValidatorSessions.new
-          session_repo.save(test_suite_id: suite_id, validator_session_id: session_id,
-                            validator_name:, suite_options: validator.requirements)
-          validator.session_id = session_id
-        else
-          Inferno::Application['logger'].error("InvokeValidatorSession - error from validator: #{response_body}")
-        end
+        res = JSON.parse(response_body)
+        session_id = res['sessionId']
+        session_repo = Inferno::Repositories::ValidatorSessions.new
+        session_repo.save(test_suite_id: suite_id, validator_session_id: session_id,
+                          validator_name:, suite_options: validator.requirements)
+        validator.session_id = session_id
+      rescue JSON::ParserError
+        Inferno::Application['logger']
+          .error("InvokeValidatorSession - error unexpected response format from validator: #{response_body}")
       end
     end
   end