davinci_dtr_test_kit 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3449c737f53b2443bc81890e9788ff4aad6837c70865512e58b5a5d3809ad96e
-  data.tar.gz: 4b2775168992e4887e5e330178138bd918a225bf9d57f2b7425a021acc7ee7c1
+  metadata.gz: 5120a6592cc4d31933d917e3214c89c8d505cdf6f8c3d5065d000588988052a8
+  data.tar.gz: c850d248ab0ae414fe399d03749d781e9f8c186525d67ba76c0d9cbad509aa17
 SHA512:
-  metadata.gz: e6107a0cf03478d3bdc9c9b155af0664b8d39b9a3819e563c3dcf45bc69b34d80a83b0be270022be6d75aeb95a6b2b9b85d486c00693a9ad3e4f0605e2d504ee
-  data.tar.gz: 69701c0a2b4a2a69ae16d5e8dd1b79fd9d27fddf0230d02dc6793be32752d965f01688d3661df72cfdddc9a208b252fda1303f516b5aa6458d33631383fc17f2
+  metadata.gz: 852190bb650b3f15d3fe25e79a08ba78778aeb85f836f32f6ed5e925859f14196cfb9d5719246a625c85803db6a606526ee2e735669bed0d574adaac3b23b8d9
+  data.tar.gz: 30e796f34e0b3e6b9088a2883af8bda32f8ac26d945c66cc6d4070b925c0eb40b362b9f76036d62b07aef6cc89d41e8c133efbb95d1bfb01233aa0289bd5889b

data/lib/davinci_dtr_test_kit/auth_groups/token_request_test.rb

@@ -17,7 +17,7 @@ module DaVinciDTRTestKit
         message: %(
           Submit your token request to
 
-          `#{token_url}`
+          `#{payer_token_url}`
         )
       )
     end

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

@@ -0,0 +1,52 @@
+require 'base64'
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRDinnerQuestionnairePackageRequestTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_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 :access_token,
+          description: %(
+            `Bearer` token that the client under test will send in the
+            `Authorization` header of each HTTP request to Inferno. Inferno
+            will look for this value to associate requests with this session.
+          )
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          ### Questionnaire Package
+
+          Inferno will wait for the Full EHR 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.
+
+          ### Request Identification
+
+          In order to identify requests for this session, Inferno will look for
+          an `Authorization` header with value:
+
+          ```
+          Bearer #{access_token}
+          ```
+
+          ### Continuing the Tests
+
+          When the DTR application has finished loading the Questionnaire
+          [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerLaunchAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_launch_attestation
+    title 'Launch DTR for a patient that has an official name (Attestation)'
+    description %(
+      Attest that DTR has been launched for a patient with data that will be used for prepopulation.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that DTR has been launched in the context of a patient with an official name, including
+          first and last.
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerPrepopulationAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_rendering_prepopulation_attestation
+    title 'Check that the client pre-populates the questionnaire (Attestation)'
+    description %(
+      Validate that pre-population of patient name information occurs as expected.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that the DTR application pre-populates the following questions with the respective
+          value for the official name of the patient:
+          - Last Name
+          - First Name
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerPrepopulationOverrideAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_prepopulation_override_attestation
+    title 'Validate the user can override pre-populated data (Attestation)'
+    description %(
+      Validate that the user can edit a pre-populated item and replace it with another value.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that I have changed the prepopulated value in the First Name field to a new value.
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerPrepopulationRepresentationAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_prepopulation_representation_attestation
+    title 'Verify the QuestionnaireResponse representation of the item data sources (Attestation)'
+    description %(
+      Attest that the QuestionnaireResponse representation of the stored answers includes the required
+      source indicators, including `auto`, `override`, and `manual`.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that the QuestionnaireResponse representation of the stored answers includes the
+          [orgin extension with source details](https://build.fhir.org/ig/HL7/davinci-dtr/StructureDefinition-information-origin.html),
+          including on the following fields entered during the tests:
+          - PBD.1 (Last Name): `auto`
+          - PBD.2 (First Name): `override`
+          - 3.1 (dinner choice): `manual`
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+require_relative 'dtr_full_ehr_launch_attestation_test'
+require_relative 'dtr_full_ehr_dinner_questionnaire_package_request_test'
+require_relative '../shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'dtr_full_ehr_prepopulation_attestation_test'
+require_relative 'dtr_full_ehr_prepopulation_override_attestation_test'
+require_relative 'dtr_full_ehr_rendering_enabled_questions_attestation_test'
+require_relative 'dtr_full_ehr_store_attestation_test'
+require_relative 'dtr_full_ehr_prepopulation_representation_attestation_test'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
+    id :dtr_full_ehr_static_dinner_questionnaire_workflow
+    title 'Static Questionnaire Workflow'
+    description %(
+      This test validates that a DTR Full EHR client can perform a full DTR Static Questionnaire workflow
+      using a mocked questionnaire requesting what a patient wants for dinner. The client system must
+      demonstrate its ability to:
+
+      1. Fetch the static questionnaire package
+         ([DinnerOrderStatic](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/lib/davinci_dtr_test_kit/fixtures/dinner_static/questionnaire_dinner_order_static.json))
+      2. Render and pre-populate the questionnaire appropriately, including:
+         - pre-populate data as directed by the questionnaire
+         - display questions only when they are enabled by other answers
+      3. Complete and store the questionnaire response for future use.
+    )
+
+    group do
+      id :dtr_full_ehr_static_questionnaire_retrieval
+      title 'Retrieving the Static Questionnaire'
+      description %(
+        After DTR launch, Inferno will wait for the client system to request a questionnaire using the
+        $questionnaire-package operation and will return a static questionnaire for the
+        tester to complete. Inferno will then validate the the conformance of the request.
+      )
+      run_as_group
+
+      # Test 0: attest to launch
+      test from: :dtr_full_ehr_dinner_static_launch_attestation
+      # Test 1: wait for the $questionnaire-package request
+      test from: :dtr_full_ehr_dinner_questionnaire_package_request
+      # Test 2: validate the $questionnaire-package body
+      test from: :dtr_questionnaire_package_request_validation
+    end
+
+    group do
+      id :dtr_full_ehr_static_questionnaire_rendering
+      title 'Filling Out the Static Questionnaire'
+      description %(
+        The tester will interact with the questionnaire within their client system
+        such that pre-population steps are taken, the qustionnaire is rendered, and
+        they are able to fill it out. The tester will attest that questionnaire pre-population
+        and rendering directives were followed.
+      )
+      run_as_group
+
+      # Test 1: attest to the pre-population of the name fields
+      test from: :dtr_full_ehr_dinner_static_rendering_prepopulation_attestation
+      # Test 2: attest to the pre-population and edit of the first name field
+      test from: :dtr_full_ehr_dinner_static_prepopulation_override_attestation
+      # Test 3: attest to the display of the toppings questions only when a dinner answer is selected
+      test from: :dtr_full_ehr_dinner_static_rendering_enabledQs_attestation
+    end
+
+    group do
+      id :dtr_full_ehr_static_questionnaire_response
+      title 'Saving the QuestionnaireResponse'
+      description %(
+        The tester will attest to the completion of the questionnaire such that
+        the results are stored for later use.
+      )
+      run_as_group
+
+      # Test 1: attest QuestionnaireResponse saved
+      test from: :dtr_full_ehr_dinner_static_store_attestation
+      # Test 2: validate basic conformance of the QuestionnaireResponse
+      # - not using currently
+      # Test 3: validate workflow-specific details such as pre-population and overrides
+      test from: :dtr_full_ehr_dinner_static_prepopulation_representation_attestation
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerRenderingAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_rendering_enabledQs_attestation
+    title 'Check that the client renders enabled questions appropriately (Attestation)'
+    description %(
+      Validate that the rendering of the questionnaire includes only the "What would you like on..."
+      question appropriate for the dinner selection, if made.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that the client application does not display any "What would you like on..."
+          questions until I have selected a dinner choice and then only displays the
+          "What would you like on..." question relevant for the dinner request:
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRStaticDinnerStoreAttestationTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_static_store_attestation
+    title 'Complete and Store the QuestionnaireResponse (Attestation)'
+    description %(
+      Attest that the questionnaire has been completed and the response has been persisted
+      and can be exported as a FHIR QuestionnaireResponse instance.
+    )
+    input :access_token
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          I attest that the questionnaire has been completed and stored within the EHR for future
+          use and export as a FHIR QuestionnaireResponse instance.
+
+          [Click here](#{resume_pass_url}?token=#{access_token}) if the above statement is **true**.
+
+          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+        )
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{dtr_dinner_questionnaire_package_request_test.rb → dtr_smart_app_dinner_questionnaire_package_request_test.rb}

@@ -2,10 +2,10 @@ require 'base64'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRDinnerQuestionnairePackageRequestTest < Inferno::Test
+  class DTRSmartAppDinnerQuestionnairePackageRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_dinner_questionnaire_package_request
+    id :dtr_smart_app_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
@@ -49,7 +49,7 @@ module DaVinciDTRTestKit
             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]
             ```
@@ -119,7 +119,7 @@ module DaVinciDTRTestKit
           an `Authorization` header with value:
 
           ```
-          Bearer eyJhbGcmOiJub25lIn0.#{example_client_jwt_payload_part}.
+          Bearer eyJhbGciOiJub25lIn0.#{example_client_jwt_payload_part}.
           ```
 
           ### Continuing the Tests

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{prepopulation_attestation_test.rb → dtr_smart_app_prepopulation_attestation_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRStaticDinnerPrepopulationAttestationTest < Inferno::Test
+  class DTRSmartAppStaticDinnerPrepopulationAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_dinner_static_rendering_prepopulation_attestation
+    id :dtr_smart_app_dinner_static_rendering_prepopulation_attestation
     title 'Check that the client pre-populates the questionnaire (Attestation)'
     description %(
       Validate that pre-population of patient name information occurs as expected.

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{prepopulation_override_attestation_test.rb → dtr_smart_app_prepopulation_override_attestation_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRStaticDinnerPrepopulationOverrideAttestationTest < Inferno::Test
+  class DTRSmartAppStaticDinnerPrepopulationOverrideAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_dinner_static_prepopulation_override_attestation
+    id :dtr_smart_app_dinner_static_prepopulation_override_attestation
     title 'Validate the user can override pre-populated data (Attestation)'
     description %(
       Validate that the user can edit a pre-populated item and replace it with another value.

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{dtr_questionnaire_response_save_test.rb → dtr_smart_app_questionnaire_response_save_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRStaticDinnerQuestionnaireResponseSaveTest < Inferno::Test
+  class DTRSmartAppStaticDinnerQuestionnaireResponseSaveTest < Inferno::Test
     include URLs
 
-    id :dtr_static_dinner_questionnaire_response_save
+    id :dtr_smart_app_static_dinner_questionnaire_response_save
     title 'Save the QuestionnaireResponse after completing it'
     description %(
       Inferno, acting as the EHR, will wait for a request to save the QuestionnaireResponse from the client.

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

@@ -1,9 +1,9 @@
-require_relative 'dtr_dinner_questionnaire_package_request_test'
+require_relative 'dtr_smart_app_dinner_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative 'prepopulation_attestation_test'
-require_relative 'prepopulation_override_attestation_test'
-require_relative 'rendering_enabled_questions_attestation_test'
-require_relative 'dtr_questionnaire_response_save_test'
+require_relative 'dtr_smart_app_prepopulation_attestation_test'
+require_relative 'dtr_smart_app_prepopulation_override_attestation_test'
+require_relative 'dtr_smart_app_rendering_enabled_questions_attestation_test'
+require_relative 'dtr_smart_app_questionnaire_response_save_test'
 require_relative '../shared/dtr_questionnaire_response_basic_conformance_test'
 require_relative '../shared/dtr_questionnaire_response_pre_population_test'
 
@@ -27,7 +27,7 @@ module DaVinciDTRTestKit
     )
 
     group do
-      id :dtr_static_questionnaire_retrieval
+      id :dtr_smart_app_static_questionnaire_retrieval
       title 'Retrieving the Static Questionnaire'
       description %(
         Inferno will wait for the client system to request a questionnaire using the
@@ -37,13 +37,13 @@ module DaVinciDTRTestKit
       run_as_group
 
       # Test 1: wait for the $questionnaire-package request
-      test from: :dtr_dinner_questionnaire_package_request
+      test from: :dtr_smart_app_dinner_questionnaire_package_request
       # Test 2: validate the $questionnaire-package body
       test from: :dtr_questionnaire_package_request_validation
     end
 
     group do
-      id :dtr_static_questionnaire_rendering
+      id :dtr_smart_app_static_questionnaire_rendering
       title 'Filling Out the Static Questionnaire'
       description %(
         The tester will interact with the questionnaire within their client system
@@ -58,15 +58,15 @@ module DaVinciDTRTestKit
       # since the questionnaire asks them to
       # TODO: once Tom has gotten the reference server hooked up
       # Test 2: attest to the pre-population of the name fields
-      test from: :dtr_dinner_static_rendering_prepopulation_attestation
+      test from: :dtr_smart_app_dinner_static_rendering_prepopulation_attestation
       # Test 3: attest to the pre-population and edit of the location field
-      test from: :dtr_dinner_static_prepopulation_override_attestation
+      test from: :dtr_smart_app_dinner_static_prepopulation_override_attestation
       # Test 4: attest to the display of the toppings questions only when a dinner answer is selected
-      test from: :dtr_dinner_static_rendering_enabledQs_attestation
+      test from: :dtr_smart_app_dinner_static_rendering_enabledQs_attestation
     end
 
     group do
-      id :dtr_static_questionnaire_response
+      id :dtr_smart_app_static_questionnaire_response
       title 'Saving the QuestionnaireResponse'
       description %(
         The tester will complete the questionnaire such that a QuestionnaireResponse is stored
@@ -77,7 +77,7 @@ module DaVinciDTRTestKit
       run_as_group
 
       # Test 1: wait for a QuestionnaireResponse
-      test from: :dtr_static_dinner_questionnaire_response_save,
+      test from: :dtr_smart_app_static_dinner_questionnaire_response_save,
            receives_request: :questionnaire_response_save
       # Test 2: validate basic conformance of the QuestionnaireResponse
       test from: :dtr_questionnaire_response_basic_conformance,

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{rendering_enabled_questions_attestation_test.rb → dtr_smart_app_rendering_enabled_questions_attestation_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRStaticDinnerRenderingAttestationTest < Inferno::Test
+  class DTRSmartAppStaticDinnerRenderingAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_dinner_static_rendering_enabledQs_attestation
+    id :dtr_smart_app_dinner_static_rendering_enabledQs_attestation
     title 'Check that the client renders enabled questions appropriately (Attestation)'
     description %(
       Validate that the rendering of the questionnaire includes only the "What would you like on..."

data/lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_package_request_validation_test.rb

@@ -29,7 +29,7 @@ module DaVinciDTRTestKit
       assert input_params.present?, 'Request does not contain a recognized FHIR object'
       assert_resource_type(:parameters, resource: input_params)
       assert_valid_resource(resource: input_params,
-                            profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters')
+                            profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters|2.0.1')
     end
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/shared/dtr_questionnaire_response_basic_conformance_test.rb

@@ -22,7 +22,7 @@ module DaVinciDTRTestKit
       assert_resource_type(:questionnaire_response, resource: questionnaire_response)
 
       assert_valid_resource(resource: questionnaire_response,
-                            profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaireresponse')
+                            profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaireresponse|2.0.1')
     end
   end
 end

data/lib/davinci_dtr_test_kit/docs/dtr_full_ehr_suite_description_v201.md

@@ -0,0 +1,127 @@
+The Da Vinci DTR Test Kit Full EHR Suite validates the conformance of SMART apps
+to the STU 2 version of the HL7® FHIR®
+[Da Vinci Documentation Templates and Rules (DTR) Implementation Guide](https://hl7.org/fhir/us/davinci-dtr/STU2/).
+
+## Scope
+
+These tests are a **DRAFT** intended to allow app implementers to perform
+preliminary checks of their systems against DTR IG requirements and [provide
+feedback](https://github.com/inferno-framework/davinci-dtr-test-kit/issues)
+on the tests. Future versions of these tests may validate other
+requirements and may change the test validation logic.
+
+## Test Methodology
+
+Inferno will simulate a DTR payer server that will response to
+requests for questionnaires for the EHR under test to interact with. 
+The EHR will be expected to initiate requests to Inferno to elicit responses. Over the
+course of these interactions, Inferno will seek to observe conformant handling of 
+DTR workflows and requirements around the retrieval, completion, and storage of
+questionnaires.
+
+Tests within this suite are associated with specific questionnaires that the EHR will
+demonstrate completion of. In each case, the EHR under test will initiate a request to
+the payer server simulated by Inferno for a questionnaire using the 
+`$questionnaire-package` operation. Inferno will always return the specific questionnaire
+for the test being executed regardless of the input provided by the EHR, though it must
+be conformant. The EHR will then be asked to complete the questionnaire, including
+- Pre-populating answers based on directives in the questionnaire
+- Rendering the questionnaire for users and allowing them to make additional updates.
+  These tests can include specific directions on details to include in the completed
+  questionnaire.
+- Storing the completed questionnaire for future use as a FHIR QuestionnaireResponse.
+
+EHRs will be required to complete all questionnaires in the suite, which in aggregate
+contain all questionnaire features that apps must support. Currently, the suite includes
+one questionnaire:
+1. A fictious "dinner" questionnaire created for these tests. It tests basic
+   item rendering and pre-population.
+Additional questionnaires will be added in the future.
+
+All requests sent by the app will be checked 
+for conformance to the DTR IG requirements individually and used in aggregate to determine
+whether required features and functionality are present. HL7® FHIR® resources are
+validated with the Java validator using `tx.fhir.org` as the terminology server.
+
+## Running the Tests
+
+### Quick Start
+
+In order to run these tests, EHRs must be configured to interact with Inferno's simulated
+payer server endpoint. The endpoint will be `[URL prefix]/custom/dtr_full_ehr/fhir` where
+`[URL prefix]` can be inferred from the URL of the test session which will be of the form 
+`[URL prefix]/dtr_full_ehr/[session id]`.
+
+In order for Inferno to associate requests sent to locations under these base URLs with this session,
+it needs to know the bearer token that the EHR will send on requests, for which 
+there are two options.
+
+1. If you want to choose your own bearer token, then
+    1. Select the "2. Basic Workflows" test from the list on the left (or other target test). 
+    2. Click the '*Run All Tests*' button on the right.
+    3. In the "access_token" field, enter the bearer token that will be sent by the client 
+       under test (as part of the Authorization header - `Bearer <provided value>`).
+    4. Click the '*Submit*' button at the bottom of the dialog.
+2. If you want to use a client_id to obtain an access token, then
+    1. Click the '*Run All Tests*' button on the right.
+    2. Provide the EHR's registered id "client_id" field of the input (NOTE, Inferno 
+       doesn't support the registration API, so this must be obtained from another
+       system or configured manually).
+    3. Click the '*Submit*' button at the bottom of the dialog.
+    4. Make a token request that includes the specified client id to the
+        `[URL prefix]/custom/dtr_full_ehr/mock_auth/token` endpoint to get
+        an access token to use on the request of the requests.
+
+In either case, the tests will continue from that point. Further executions of tests under
+this session will also use the selected bearer token.
+
+Note: authentication options for these tests have not been finalized and are subject to change.
+
+### Postman-based Demo
+
+If you do not have a DTR Full EHR but would like to try the tests out, you can use
+[this Postman collection](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/config/DTR%20Full%20EHR%20Tests%20Postman%20Demo.postman_collection.json)
+to make requests against Inferno. This does not include the capability to render and complete the
+questionnaires, but does have samples of correctly and incorrectly completed QuestionnaireResponses.
+To run the tests using this approach:
+
+1. Install [postman](https://www.postman.com/downloads/).
+1. Import [this Postman collection](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/config/DTR%20Full%20EHR%20Tests%20Postman%20Demo.postman_collection.json).
+1. Start a Da Vinci DTR Full EHR Test Suite Session.
+1. Update the postman collection configuration variables found by opening the "DTR Full EHR
+   Tests Postman Demo" collection and selecting the "Variables" tab.
+   - **base_url**: corresponds to the where the test suite session is running. Defaults to 
+   `inferno.healthit.gov`. If running in another location, see guidance on the "Overview" tab
+   of the postman collection.
+   - **access_token**: note the "Current value" (update if desired) for use later.
+1. Return to Inferno and in the test list at the left, select *2 Static Questionnaire Workflow*.
+1. Click the "Run All Tests" button in the upper right.
+1. Add the **access_token** configured in postman to the Inferno input with the same name
+1. Click the "Submit" button in Inferno.
+1. Attest that the EHR has launched its DTR workflow in Inferno by clicking the link for the **true** response.
+1. Once the next wait dialog has appeared within Inferno asking for a `$questionnaire-package` 
+   request, use postman to submit the "Questionnaire Package for Dinner (Static)" request. Confirm
+   that the response that looks similar to the "Example Working Response" in postman
+   and click the link to continue the tests.
+1. Attest to the remainder of the tests as desired to get a sense for what is involved in testing
+   with an actual EHR implementation. To see what a valid QuestionnaireResponse looks like, see
+   the "Sample QuestionnaireResponse for Dinner (Static) ..." request in postman.
+
+## Limitations
+
+The DTR IG is a complex specification and these tests currently validate conformance to only
+a subset of IG requirements. Future versions of the test suite will test further
+features. A few specific features of interest are listed below.
+
+### Heavy Reliance on Attestations
+
+Currently, these test kits do not have access to the QuestionnaireResponse and so validation
+that the EHR performed CQL calculations and generated a conformant QuestionnaireResponse
+based on pre-population and manual answers is left to a user attestation rather than a
+mechanical check. Some level of mechanical checks are expected to be added in the future.
+
+### Questionnaire Feature Coverage
+
+Not all questionnaire features that are must support within the DTR IG are currently represented
+in questionnaires tested by the IG. Adaptive questionnaires are a notable omission.
+Additional questionnaires testing additional features will be added in the future.

data/lib/davinci_dtr_test_kit/dtr_full_ehr_suite.rb

@@ -1,7 +1,7 @@
 require_relative 'ext/inferno_core/runnable'
 require_relative 'ext/inferno_core/record_response_route'
 require_relative 'ext/inferno_core/request'
-require_relative 'client_groups/resp_assist_device/dtr_full_ehr_questionnaire_workflow_group'
+require_relative 'client_groups/dinner_static/dtr_full_ehr_questionnaire_workflow_group'
 require_relative 'auth_groups/oauth2_authentication_group'
 require_relative 'mock_payer'
 require_relative 'version'
@@ -9,19 +9,11 @@ require_relative 'version'
 module DaVinciDTRTestKit
   class DTRFullEHRSuite < Inferno::TestSuite
     extend MockPayer
+    extend MockAuthServer
 
     id :dtr_full_ehr
     title 'Da Vinci DTR Full EHR Test Suite'
-    description %(
-        # Da Vinci DTR Full EHR Test Suite
-
-        This suite validates that an EHR or other application can act
-        as a full DTR application requesting questionnaires from a
-        payer server and using local data to complete and store them.
-        Inferno will act as payer server returning questionnaires
-        in response to queries from the system under test and validating
-        that they can be completed as expected.
-      )
+    description File.read(File.join(__dir__, 'docs', 'dtr_full_ehr_suite_description_v201.md'))
 
     version VERSION
 
@@ -74,6 +66,6 @@ module DaVinciDTRTestKit
     end
 
     group from: :oauth2_authentication
-    group from: :dtr_full_ehr_questionnaire_workflow
+    group from: :dtr_full_ehr_static_dinner_questionnaire_workflow
   end
 end

data/lib/davinci_dtr_test_kit/dtr_questionnaire_response_validation.rb

@@ -88,7 +88,7 @@ module DaVinciDTRTestKit
         end
 
         origin_extension = find_extension(target_item_answer,
-                                          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/information-origin')
+                                          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/information-origin|2.0.1')
         source_extension = find_extension(origin_extension, 'source')
 
         unless source_extension.present?
@@ -134,7 +134,7 @@ module DaVinciDTRTestKit
 
         # check origin.source extension
         origin_extension = find_extension(answer,
-                                          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/information-origin')
+                                          'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/information-origin|2.0.1')
         source_extension = find_extension(origin_extension, 'source')
 
         if source_extension.present?

data/lib/davinci_dtr_test_kit/fixture_loader.rb

@@ -23,7 +23,7 @@ module DaVinciDTRTestKit
           [
             'fixtures/dinner_static/questionnaire_dinner_order_static.json',
             'fixtures/dinner_static/questionnaire_response_dinner_order_static.json',
-            ['dtr_smart_app_static_dinner_questionnaire_workflow']
+            ['dtr_smart_app_static_dinner_questionnaire_workflow', 'dtr_full_ehr_static_dinner_questionnaire_workflow']
           ],
           [
             'fixtures/dinner_adaptive/questionnaire_dinner_order_adaptive.json',

data/lib/davinci_dtr_test_kit/payer_server_groups/adaptive_next_questionnaire_expressions_test.rb

@@ -6,7 +6,7 @@ module DaVinciDTRTestKit
     id :dtr_v201_payer_adaptive_next_form_expressions_test
     title 'Questionnaire(s) contains items with expressions necessary for pre-population'
     description %(
-      Inferno checks that the payer server response has appropriate expressions and that expressions are
+      Inferno checks that the payer server response to $next-question operation has appropriate expressions and that expressions are
        written in cql.
     )
 

data/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_request_validation_test.rb

@@ -3,7 +3,7 @@ module DaVinciDTRTestKit
   class PayerAdaptiveFormRequestTest < Inferno::Test
     include URLs
     include DaVinciDTRTestKit::ValidationTest
-    title '[USER INPUT VALIDATION] Questionnaire Package request is valid'
+    title 'User Input Validation: Questionnaire Package request is valid'
     description %(
       This test validates the conformance of the client's request to the
       [DTR Questionnaire Package Input Parameters](http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters)
@@ -13,32 +13,23 @@ 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.
     )
     id :payer_server_adaptive_questionnaire_request_validation
 
     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-input-parameters|2.0.1'
       if initial_adaptive_questionnaire_request.nil?
-        resources = load_tagged_requests(QUESTIONNAIRE_TAG)
-        using_manual_entry = false
+        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
-        resources = initial_adaptive_questionnaire_request
-        using_manual_entry = true
+        request = FHIR.from_contents(initial_adaptive_questionnaire_request)
+        resource_is_valid?(resource: request, profile_url: profile_with_version)
       end
-      skip_if resources.nil?, 'No request resources to validate.'
-      perform_request_validation_test(
-        resources,
-        :parameters,
-        'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-qpackage-input-parameters',
-        questionnaire_package_url,
-        using_manual_entry
-      )
-    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/payer_server_adaptive_response_bundles_validation_test.rb

@@ -20,21 +20,21 @@ module DaVinciDTRTestKit
 
     run do
       skip_if retrieval_method == 'Static', 'Performing only static flow tests - only one flow is required.'
-      test_passed = false
-      profile_url = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle'
+      test_passed = true
+      profile_url = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/DTR-QPackageBundle|2.0.1'
       assert !scratch[:adaptive_responses].nil?, 'No resources to validate.'
       scratch[:adaptive_responses].each_with_index do |resource, index|
         fhir_resource = FHIR.from_contents(resource.response[:body])
         fhir_resource.parameter.each do |param|
           resource_is_valid = validate_resource(param.resource, :bundle, profile_url, index)
-          test_passed = true if resource_is_valid
+          test_passed = false unless resource_is_valid
         rescue StandardError
           next
         end
       end
-      raise tests_failed[profile_url][0] if !test_passed && !tests_failed[profile_url].blank?
-
-      messages.clear if test_passed
+      if !test_passed && !tests_failed[profile_url].blank?
+        assert test_passed, "Not all returned resources conform to the profile: #{profile_url}"
+      end
     end
   end
 end

data/lib/davinci_dtr_test_kit/payer_server_groups/payer_server_adaptive_response_search_validation_test.rb

@@ -20,23 +20,23 @@ module DaVinciDTRTestKit
 
     run do
       skip_if retrieval_method == 'Static', 'Performing only static flow tests - only one flow is required.'
-      test_passed = false
-      profile_url = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaire-adapt-search'
+      test_passed = true
+      profile_url = 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaire-adapt-search|2.0.1'
       assert !scratch[:adaptive_responses].nil?, 'No resources to validate.'
       scratch[:adaptive_responses].each_with_index do |resource, index|
         fhir_resource = FHIR.from_contents(resource.response[:body])
         fhir_resource.parameter.each do |param|
           param.resource.entry.each do |entry|
             resource_is_valid = validate_resource(entry.resource, :questionnaire, profile_url, index)
-            test_passed = true if resource_is_valid
+            test_passed = false unless resource_is_valid
           end
         rescue StandardError
           next
         end
       end
-      raise tests_failed[profile_url][0] if !test_passed && !tests_failed[profile_url].blank?
-
-      messages.clear if test_passed
+      if !test_passed && !tests_failed[profile_url].blank?
+        assert test_passed, "Not all returned resources conform to the profile: #{profile_url}"
+      end
     end
   end
 end

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,36 +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'
-        assert_valid_json(initial_static_questionnaire_request)
         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,23 +15,19 @@ 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),
@@ -40,15 +36,11 @@ module DaVinciDTRTestKit
         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(

data/lib/davinci_dtr_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DaVinciDTRTestKit
-  VERSION = '0.11.1'
+  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.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Karl Naden
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 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