davinci_dtr_test_kit 0.11.0 → 0.12.0

data/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_response_validation_test.rb

@@ -15,35 +15,33 @@ module DaVinciDTRTestKit
       to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
       the valueset.
 
-      This test may process multiple resources, labeling messages with the corresponding tested resources
       This test may process multiple resources, labeling messages with the corresponding tested resources
       in the order that they were received.
     )
 
     run do
       skip_if retrieval_method == 'Static', 'Performing only static flow tests - only one flow is required.'
+      profile_with_version = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters|2.0.1'
       endpoint = custom_endpoint.blank? ? '/Questionnaire/$questionnaire-package' : custom_endpoint
       if initial_adaptive_questionnaire_request.nil?
-        resources = load_tagged_requests(QUESTIONNAIRE_TAG)
+        # making the assumption that only one response was received - if there were multiple, we are only validating the first
+        response = load_tagged_requests(QUESTIONNAIRE_TAG)[0]
+        scratch[:adaptive_responses] = [response]
+        resource = FHIR.from_contents(response.response[:body])
       else
-        resources = []
-        if initial_adaptive_questionnaire_request.is_a?(Array)
-          initial_adaptive_questionnaire_request.each do |_resource|
-            resources.push(fhir_operation("#{url}#{endpoint}", body: JSON.parse(initial_adaptive_questionnaire_request),
-                                                               headers: { 'Content-Type': 'application/json' }))
-          end
-        else
-          resources.push(fhir_operation("#{url}#{endpoint}", body: JSON.parse(initial_adaptive_questionnaire_request),
-                                                             headers: { 'Content-Type': 'application/json' }))
-        end
+        response = fhir_operation("#{url}#{endpoint}", body: JSON.parse(initial_adaptive_questionnaire_request),
+                                                              headers: { 'Content-Type': 'application/json' })
+        resource = FHIR.from_contents(response.response[:body])
+        scratch[:adaptive_responses] = [response]
       end
-      scratch[:adaptive_responses] = resources
+      
       assert !scratch[:adaptive_responses].nil?, 'No resources to validate.'
-      perform_response_validation_test(
-        resources,
-        :parameters,
-        'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters'
-      )
+      assert_response_status([200, 201], response: response.response)
+      assert_resource_type(:parameters, resource: resource)
+      assert_valid_resource(resource: resource, profile_url: profile_with_version)
+      questionnaire_bundle = resource.parameter.find { |param| param.resource.resourceType == 'Bundle' }&.resource
+      assert questionnaire_bundle, 'No questionnaire bundle found in the response'
+      assert_valid_resource(resource: questionnaire_bundle, profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle|2.0.1')
     end
   end
 end

data/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_next_request_validation_test.rb

@@ -3,7 +3,7 @@ module DaVinciDTRTestKit
   class PayerAdaptiveFormNextRequestTest < Inferno::Test
     include URLs
     include DaVinciDTRTestKit::ValidationTest
-    title '[USER INPUT VALIDATION] Next Question request is valid'
+    title 'User Input Validation:  Next Question request is valid'
     description %(
       This test validates the conformance of the client's request to the
       [SDC Parameters Next Question In](http://hl7.org/fhir/uv/sdc/StructureDefinition/parameters-questionnaire-next-question-in)
@@ -49,13 +49,12 @@ module DaVinciDTRTestKit
           using_manual_entry
         )
       else
-        raise new Inferno::Exceptions::AssertionException.new "Resource does not conform to the either
-         accepted profiles: http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt
-         or http://hl7.org/fhir/uv/sdc/StructureDefinition/parameters-questionnaire-next-question-in"
+        messages << { type: 'error',
+        message: format_markdown("No resources were of type 'Parameters' or 'QuestionnaireResponse'") }
       end
-    rescue Inferno::Exceptions::AssertionException => e
-      msg = e.message.to_s.strip
-      skip msg
+      errors_found = messages.any? { |message| message[:type] == 'error' }
+      skip_if errors_found, "No resources conform to the profiles http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt
+        or http://hl7.org/fhir/uv/sdc/StructureDefinition/parameters-questionnaire-next-question-in"
     end
   end
 end

data/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_next_response_validation_test.rb

@@ -14,7 +14,6 @@ module DaVinciDTRTestKit
       to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
       the valueset.
 
-      This test may process multiple resources, labeling messages with the corresponding tested resources
       This test may process multiple resources, labeling messages with the corresponding tested resources
       in the order that they were received.
     )
@@ -38,6 +37,9 @@ module DaVinciDTRTestKit
         :questionnaireResponse,
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse'
       )
+      errors_found = messages.any? { |message| message[:type] == 'error' }
+      skip_if errors_found, "No resources conform to the profiles http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt
+        or http://hl7.org/fhir/uv/sdc/StructureDefinition/parameters-questionnaire-next-question-in"
     end
   end
 end

data/lib/davinci_dtr_test_kit/payer_server_groups/static_form_request_validation_test.rb

@@ -5,7 +5,7 @@ module DaVinciDTRTestKit
     include DaVinciDTRTestKit::ValidationTest
     include URLs
     id :dtr_v201_payer_static_form_request_validation_test
-    title '[USER INPUT VALIDATION] Client sends payer server a request for a static form'
+    title 'User Input Validation:  Client sends payer server a request for a static form'
     description %(
       Inferno will validate that the request to the payer server conforms to the
        [Input Parameters profile](http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters).
@@ -14,35 +14,24 @@ module DaVinciDTRTestKit
        values. CodeableConcept element bindings will fail if none of their codings have a code/system belonging
        to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system
        are not found in the valueset.
-
-       This test may process multiple resources, labeling messages with the corresponding tested resources
-       in the order that they were received.
     )
     input :initial_static_questionnaire_request, :access_token, :retrieval_method
 
     run do
       skip_if retrieval_method == 'Adaptive', 'Performing only adaptive flow tests - only one flow is required.'
+      profile_with_version = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters|2.0.1'
       if initial_static_questionnaire_request.nil?
-        using_manual_entry = false
         skip_if access_token.nil?, 'No access token provided - required for client flow.'
-        resources = load_tagged_requests(QUESTIONNAIRE_TAG)
-        skip_if resources.blank?, 'No request resource received from the client.'
-        assert perform_request_validation_test(
-          resources,
-          :parameters,
-          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters',
-          questionnaire_package_url,
-          using_manual_entry
-        )
+        requests = load_tagged_requests(QUESTIONNAIRE_TAG)
+        skip_if requests.blank?, 'No request resource received from the client.'
+        # making the assumption that only one request was made here - if there were multiple, we are only validating the first
+        resource_is_valid?(resource: FHIR.from_contents(requests[0].request[:body]), profile_url: profile_with_version)
       else
-        # TODO: fix redundant logic here
-        skip_if initial_static_questionnaire_request.nil?, 'No request resource was provided - required for manual flow'
         request = FHIR.from_contents(initial_static_questionnaire_request)
-        assert assert_valid_resource(resource: request, profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters')
+        resource_is_valid?(resource: request, profile_url: profile_with_version)
       end
-    rescue Inferno::Exceptions::AssertionException => e
-      msg = e.message.to_s.strip
-      skip msg
+      errors_found = messages.any? { |message| message[:type] == 'error' }
+      skip_if errors_found, "Resource does not conform to the profile #{profile_with_version}"
     end
   end
 end

data/lib/davinci_dtr_test_kit/payer_server_groups/static_form_response_validation_test.rb

@@ -15,39 +15,32 @@ module DaVinciDTRTestKit
       to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
       the valueset.
 
-      This test may process multiple resources, labeling messages with the corresponding tested resources
-      in the order that they were received.
     )
     input :url
 
     run do
       skip_if retrieval_method == 'Adaptive', 'Performing only adaptive flow tests - only one flow is required.'
+      profile_with_version = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters|2.0.1'
       if initial_static_questionnaire_request.nil?
         skip_if access_token.nil?, 'No access token provided - required for client flow.'
         resources = load_tagged_requests(QUESTIONNAIRE_TAG)
         skip_if resources.nil?, 'No request resource received from the client.'
         scratch[:output_parameters] = resources
-        perform_response_validation_test(
-          resources,
-          :parameters,
-          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters'
-        )
+        # making the assumption that only one response was received- if there were multiple, we are only validating the first
+        assert_valid_resource(resource: FHIR.from_contents(resources[0].request[:body]), profile_url: profile_with_version)
       else
         request = fhir_operation("#{url}/Questionnaire/$questionnaire-package",
                                  body: JSON.parse(initial_static_questionnaire_request),
                                  headers: { 'Content-Type': 'application/json' })
+        assert_valid_json(request.response[:body])
         resource = FHIR.from_contents(request.response[:body])
         scratch[:output_parameters] = resource
         assert_response_status([200, 201], response: request.response)
-        assert_resource_type(:parameters, resource:)
-        perform_response_validation_test(
-          [request],
-          :parameters,
-          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-output-parameters'
-        )
+        assert_resource_type(:parameters, resource: resource)
+        assert_valid_resource(resource: resource, profile_url: profile_with_version)
         questionnaire_bundle = resource.parameter.find { |param| param.resource.resourceType == 'Bundle' }&.resource
         assert questionnaire_bundle, 'No questionnaire bundle found in the response'
-        assert_valid_resource(resource: questionnaire_bundle, profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle')
+        assert_valid_resource(resource: questionnaire_bundle, profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle|2.0.1')
       end
     end
   end

data/lib/davinci_dtr_test_kit/validation_test.rb

@@ -5,14 +5,15 @@ module DaVinciDTRTestKit
     end
 
     def validate_resource(fhir_resource, resource_type, profile_url, index)
-      assert fhir_resource.present?, 'Resource does not contain a recognized FHIR object'
       begin
+        assert fhir_resource.present?, 'Resource does not contain a recognized FHIR object'
         assert_resource_type(resource_type, resource: fhir_resource)
         assert_valid_resource(resource: fhir_resource,
                               profile_url:)
       rescue StandardError => e
+        add_message('error', e.message)
         messages.each do |message|
-          message[:message].prepend("[Resource #{index + 1}] ")
+          message[:message].prepend("[Resource #{index + 1}] ") unless message[:message].start_with? '[Resource'
         end
         if tests_failed[profile_url].blank?
           tests_failed[profile_url] = [e]
@@ -37,19 +38,16 @@ module DaVinciDTRTestKit
       resources = [resources] unless resources.is_a?(Array)
       resources.each_with_index do |resource, index|
         if using_manual_entry
-          assert_valid_json(resource.to_json)
           fhir_resource = FHIR.from_contents(resource.to_json)
         else
-          assert resource.url == resource_url,
-                 "Request made to wrong URL: #{resource.request[:url]}. Should instead be to #{resource_url}"
-          assert_valid_json(resource.request[:body])
+          if resource.url != resource_url
+            messages << { type: 'warning',
+                          message: format_markdown("Request made to wrong URL: #{resource.request[:url]}. Should instead be to #{resource_url}") }
+          end
           fhir_resource = FHIR.from_contents(resource.request[:body])
         end
         validate_resource(fhir_resource, resource_type, profile_url, index)
       end
-      return if tests_failed[profile_url].blank?
-
-      raise tests_failed[profile_url][0]
     end
 
     def perform_response_validation_test(
@@ -60,6 +58,7 @@ module DaVinciDTRTestKit
       omit_if resources.blank?,
               "No #{resource_type} resources provided so the #{profile_url} profile does not apply"
       resources.each_with_index do |resource, index|
+        assert_valid_json(resource.response[:body])
         fhir_resource = FHIR.from_contents(resource.response[:body])
         assert_response_status([200, 202], request: resource, response: resource.response)
         validate_resource(fhir_resource, resource_type, profile_url, index)

data/lib/davinci_dtr_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/davinci_dtr_test_kit.rb

@@ -1,4 +1,4 @@
 require_relative 'davinci_dtr_test_kit/dtr_payer_server_suite'
 require_relative 'davinci_dtr_test_kit/dtr_smart_app_suite'
-# require_relative 'davinci_dtr_test_kit/dtr_full_ehr_suite'
+require_relative 'davinci_dtr_test_kit/dtr_full_ehr_suite'
 # require_relative 'davinci_dtr_test_kit/dtr_light_ehr_suite'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: davinci_dtr_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Karl Naden
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.37
+        version: 0.4.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.37
+        version: 0.4.42
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -54,12 +54,20 @@ files:
 - lib/davinci_dtr_test_kit/auth_groups/token_request_test.rb
 - lib/davinci_dtr_test_kit/auth_groups/token_validation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/dtr_smart_app_questionnaire_workflow_group.rb
-- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_dinner_questionnaire_package_request_test.rb
-- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_questionnaire_response_save_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_dinner_questionnaire_package_request_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_launch_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_prepopulation_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_prepopulation_override_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_prepopulation_representation_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_questionnaire_workflow_group.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_rendering_enabled_questions_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_full_ehr_store_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_dinner_questionnaire_package_request_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_prepopulation_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_prepopulation_override_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_questionnaire_response_save_test.rb
 - lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_questionnaire_workflow_group.rb
-- lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_attestation_test.rb
-- lib/davinci_dtr_test_kit/client_groups/dinner_static/prepopulation_override_attestation_test.rb
-- lib/davinci_dtr_test_kit/client_groups/dinner_static/rendering_enabled_questions_attestation_test.rb
+- lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_smart_app_rendering_enabled_questions_attestation_test.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_full_ehr_questionnaire_workflow_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_package_group.rb
 - lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_rendering_attestation_test.rb
@@ -72,6 +80,7 @@ files:
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_basic_conformance_test.rb
 - lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_pre_population_test.rb
 - lib/davinci_dtr_test_kit/cql_test.rb
+- lib/davinci_dtr_test_kit/docs/dtr_full_ehr_suite_description_v201.md
 - lib/davinci_dtr_test_kit/docs/dtr_payer_server_suite_description_v201.md
 - lib/davinci_dtr_test_kit/docs/dtr_smart_app_suite_description_v201.md
 - lib/davinci_dtr_test_kit/dtr_full_ehr_suite.rb

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/dtr_dinner_questionnaire_package_request_test.rb

@@ -1,97 +0,0 @@
-require 'base64'
-require_relative '../../urls'
-
-module DaVinciDTRTestKit
-  class DTRDinnerQuestionnairePackageRequestTest < Inferno::Test
-    include URLs
-
-    id :dtr_dinner_questionnaire_package_request
-    title 'Invoke the DTR Questionnaire Package operation'
-    description %(
-      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
-      send a response.
-    )
-    input :smart_app_launch, type: 'radio', title: 'SMART App Launch',
-                             description: 'How will the DTR SMART App launch?',
-                             options: { list_options: [{ label: 'Launch from Inferno', value: 'inferno' },
-                                                       { label: 'Launch from EHR', value: 'ehr' }] }
-    input :client_id
-    input :launch_uri, optional: true, description: 'Required if "Launch from Inferno" is selected'
-    input :smart_patient_id, optional: true, title: 'SMART App Launch Patient ID (Dinner Static)',
-                             type: 'text',
-                             description: %(
-                               Patient instance id to be provided by Inferno as the `patient` as a part of the SMART app
-                               launch.
-                             )
-    input :smart_fhir_context, optional: true, title: 'SMART App Launch fhirContext (Dinner Static)',
-                               type: 'textarea',
-                               description: %(
-                               References to be provided by Inferno as the `fhirContext` as a part of the SMART app
-                               launch. These references help determine the behavior of the app. Referenced instances
-                               may be providedin the "EHR-available resources" input.
-                             )
-    input :ehr_bundle, optional: true, title: 'EHR-available resources (Dinner Static)', type: 'textarea',
-                       description: %(
-                         Resources available from the EHR needed to drive the dinner static workflow.
-                         Formatted as a FHIR bundle that contains resources, each with an `id` property populated. Each
-                         instance present will be available for retrieval from Inferno at the endpoint
-                         `[fhir-base]/[resource type]/[instance id].`
-                       )
-
-    def example_client_jwt_payload_part
-      Base64.strict_encode64({ inferno_client_id: client_id }.to_json).delete('=')
-    end
-
-    run do
-      launch_prompt = if smart_app_launch == 'inferno'
-                        %(Launch the DTR SMART App from Inferno by right clicking
-                          [this link](#{launch_uri}?iss=#{fhir_base_url}&launch=#{launch_uri})
-                          and selecting or "Open in new window" or "Open in new tab".)
-                      else
-                        %(Launch the SMART App from your EHR.)
-                      end
-      inferno_prompt_cont = %(As the DTR app steps through the launch steps, Inferno will wait and respond to the app's
-                              requests for SMART configuration, authorization and access token.)
-
-      wait(
-        identifier: client_id,
-        message: %(
-          ### SMART App Launch
-
-          #{launch_prompt}
-
-          #{inferno_prompt_cont if smart_app_launch == 'inferno'}
-
-          Then, Inferno will expect the SMART App to invoke the DTR Questionnaire Package operation by sending a POST
-          request to
-
-          `#{questionnaire_package_url}`
-
-          A questionnaire package generated by Inferno will be returned.
-
-          ### Pre-population
-
-          Inferno will then wait for the client to complete Questionnaire pre-population. The client should make FHIR
-          GET requests using service base path:
-
-          `#{fhir_base_url}`
-
-          ### Request Identification
-
-          In order to identify requests for this session, Inferno will look for
-          an `Authorization` header with value:
-
-          ```
-          Bearer eyJhbGcmOiJub25lIn0.#{example_client_jwt_payload_part}.
-          ```
-
-          ### Continuing the Tests
-
-          When the DTR application has finished loading the Questionnaire,
-          including any clinical data requests to support pre-population,
-          [Click here](#{resume_pass_url}?client_id=#{client_id}) to continue.
-        )
-      )
-    end
-  end
-end