davinci_dtr_test_kit 0.13.0 → 0.14.1

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

@@ -1,3 +1,10 @@
+require_relative '../../tags'
+require_relative 'dtr_smart_app_adaptive_questionnaire_initial_retrieval_group'
+require_relative '../smart_app/dtr_smart_app_prepopulation_attestation_test'
+require_relative '../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
+require_relative 'dtr_adaptive_questionnaire_followup_questions_group'
+require_relative 'dtr_adaptive_questionnaire_completion_group'
+
 module DaVinciDTRTestKit
   class DTRSmartAppAdaptiveDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
     id :dtr_smart_app_adaptive_dinner_questionnaire_workflow
@@ -8,6 +15,7 @@ module DaVinciDTRTestKit
       demonstrate their ability to:
 
       1. Fetch the adaptive questionnaire package
+        ([DinnerOrderAdaptive](https://github.com/inferno-framework/davinci-dtr-test-kit/blob/main/lib/davinci_dtr_test_kit/fixtures/dinner_adaptive/questionnaire_dinner_order_adaptive.json))
       2. Fetch the first set of questions and render and pre-populate them appropriately, including:
          - fetch additional data needed for pre-population
          - pre-populate data as directed by the questionnaire
@@ -16,5 +24,72 @@ module DaVinciDTRTestKit
       4. Complete the questionnaire and provide the completed QuestionnaireResponse
          with appropriate indicators for pre-populated and manually-entered data.
     )
+
+    config(
+      options: {
+        smart_app: true
+      }
+    )
+
+    group do
+      id :dtr_smart_app_adaptive_questionnaire_retrieval
+      title 'Retrieving the Adaptive Questionnaire'
+      description %(
+        Inferno will wait for the client system to request a questionnaire using the
+        $questionnaire-package operation and follow up with an initial $next-question request to retrieve
+        the first set of questions.
+
+        The initial set of questions will be returned for the tester to complete.
+
+        Inferno will then validate the conformance of the requests.
+      )
+      run_as_group
+
+      group from: :dtr_smart_app_adaptive_questionnaire_initial_retrieval
+      group do
+        id :dtr_smart_app_initial_questionnaire_rendering
+        title 'Filling Out the 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.
+        )
+
+        # Test 1: attest to the pre-population of the name fields
+        test from: :dtr_smart_app_prepopulation_attestation
+        # Test 2: attest to the pre-population and edit of the location field
+        test from: :dtr_smart_app_prepopulation_override_attestation
+      end
+    end
+
+    group from: :dtr_adaptive_questionnaire_followup_questions,
+          config: {
+            options: {
+              accepts_multiple_requests: true,
+              next_tag: "followup_#{CLIENT_NEXT_TAG}"
+            },
+            inputs: {
+              access_token: { name: :client_id }
+            }
+          }
+
+    group from: :dtr_adaptive_questionnaire_completion,
+          config: {
+            options: {
+              accepts_multiple_requests: true,
+              next_tag: "completion_#{CLIENT_NEXT_TAG}"
+            },
+            inputs: {
+              access_token: { name: :client_id }
+            }
+          }
+    group from: :dtr_smart_app_saving_questionnaire_response,
+          config: {
+            options: {
+              adaptive: true,
+              qr_profile_url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt'
+            }
+          }
   end
 end

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

@@ -1,12 +1,10 @@
-require_relative 'dtr_full_ehr_launch_attestation_test'
-require_relative 'dtr_full_ehr_dinner_questionnaire_package_request_test'
+require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
+require_relative '../full_ehr/dtr_full_ehr_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_dinner_static_questionnaire_response_conformance_test'
-require_relative 'dtr_full_ehr_dinner_static_questionnaire_response_correctness_test'
+require_relative '../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
+require_relative '../full_ehr/dtr_full_ehr_rendering_enabled_questions_attestation_test'
+require_relative '../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
+require_relative '../full_ehr/dtr_full_ehr_saving_questionnaire_response_group'
 
 module DaVinciDTRTestKit
   class DTRFullEHRStaticDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
@@ -36,9 +34,9 @@ module DaVinciDTRTestKit
       run_as_group
 
       # Test 0: attest to launch
-      test from: :dtr_full_ehr_dinner_static_launch_attestation
+      test from: :dtr_full_ehr_launch_attestation
       # Test 1: wait for the $questionnaire-package request
-      test from: :dtr_full_ehr_dinner_questionnaire_package_request
+      test from: :dtr_full_ehr_questionnaire_package_request
       # Test 2: validate the $questionnaire-package body
       test from: :dtr_questionnaire_package_request_validation
     end
@@ -55,37 +53,23 @@ module DaVinciDTRTestKit
       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 from: :dtr_full_ehr_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 from: :dtr_full_ehr_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
+      test from: :dtr_full_ehr_rendering_enabled_questions_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.
-      )
-      input :questionnaire_response,
-            type: 'textarea',
-            title: 'Completed QuestionnaireResponse',
-            optional: true,
-            description: %(
-              The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire. IMPORTANT: If
-              you have not yet run the 'Filling Out the Static Questionnaire' group, leave this blank until you have
-              done so. Then, run just the 'Saving the QuestionnaireResponse' group and populate this input.
-            )
-      run_as_group
-
-      # Test 1: attest QuestionnaireResponse saved
-      test from: :dtr_full_ehr_dinner_static_store_attestation
-      # Test 2: verify basic conformance of the QuestionnaireResponse
-      test from: :dtr_full_ehr_dinner_static_questionnaire_response_conformance
-      # Test 3: check workflow-specific details such as pre-population and overrides
-      test from: :dtr_full_ehr_dinner_static_questionnaire_response_correctness
-    end
+    group from: :dtr_full_ehr_saving_questionnaire_response,
+          config: {
+            inputs: {
+              questionnaire_response: {
+                description: "The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire.
+                IMPORTANT: If you have not yet run the 'Filling Out the Static Questionnaire' group, leave this blank
+                until you have done so. Then, run just the 'Saving the QuestionnaireResponse' group and populate
+                this input."
+              }
+            }
+          }
   end
 end

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

@@ -11,6 +11,7 @@ module DaVinciDTRTestKit
       Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
       send a response.
     )
+    config options: { accepts_multiple_requests: true }
     input :smart_app_launch,
           type: 'radio',
           title: 'SMART App Launch',
@@ -21,38 +22,34 @@ module DaVinciDTRTestKit
     input :launch_uri,
           optional: true,
           description: 'Required if "Launch from Inferno" is selected'
-    input :smart_patient_id,
+    input :static_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.
+            Patient instance ID to be provided by Inferno as the patient as a part of the SMART App Launch.
           ),
           default: 'pat015'
-    input :smart_fhir_context,
+    input :static_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
+            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 provided in the "EHR-available resources" input.
           ),
           default: JSON.pretty_generate([{ reference: 'Coverage/cov015' },
                                          { reference: 'DeviceRequest/devreqe0470' }])
-    input :ehr_bundle,
+    input :static_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
+            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]
-            ```
+            <fhir-base>/<resource type>/<instance id>
           )
 
     def example_client_jwt_payload_part
@@ -62,19 +59,19 @@ module DaVinciDTRTestKit
     run do
       # validate relevant inputs and provide warnings if they are bad
       warning do
-        if smart_fhir_context
-          assert_valid_json(smart_fhir_context,
+        if static_smart_fhir_context
+          assert_valid_json(static_smart_fhir_context,
                             'The **SMART App Launch fhirContext** input is not valid JSON, so it will not be included in
                             the access token response.')
         end
       end
 
       warning do
-        if ehr_bundle
-          assert_valid_json(ehr_bundle,
+        if static_ehr_bundle
+          assert_valid_json(static_ehr_bundle,
                             'The **EHR-available resources** input is not valid JSON, so no tester-specified instances
                               will be available to access from Inferno.')
-          assert(FHIR.from_contents(ehr_bundle).is_a?(FHIR::Bundle),
+          assert(FHIR.from_contents(static_ehr_bundle).is_a?(FHIR::Bundle),
                  'The **EHR-available resources** input does not contain a FHIR Bundle, so no tester-specified instances
                  will be available to access from Inferno.')
         end

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

@@ -1,11 +1,9 @@
 require_relative 'dtr_smart_app_dinner_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_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'
+require_relative '../smart_app/dtr_smart_app_prepopulation_attestation_test'
+require_relative '../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
+require_relative '../smart_app/dtr_smart_app_rendering_enabled_questions_attestation_test'
+require_relative '../smart_app/dtr_smart_app_saving_questionnaire_response_group'
 
 module DaVinciDTRTestKit
   class DTRSmartAppStaticDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
@@ -32,7 +30,7 @@ module DaVinciDTRTestKit
       description %(
         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.
+        tester to complete. Inferno will then validate the conformance of the request.
       )
       run_as_group
 
@@ -58,33 +56,13 @@ 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_smart_app_dinner_static_rendering_prepopulation_attestation
+      test from: :dtr_smart_app_prepopulation_attestation
       # Test 3: attest to the pre-population and edit of the location field
-      test from: :dtr_smart_app_dinner_static_prepopulation_override_attestation
+      test from: :dtr_smart_app_prepopulation_override_attestation
       # Test 4: attest to the display of the toppings questions only when a dinner answer is selected
-      test from: :dtr_smart_app_dinner_static_rendering_enabledQs_attestation
+      test from: :dtr_smart_app_rendering_enabled_questions_attestation
     end
 
-    group do
-      id :dtr_smart_app_static_questionnaire_response
-      title 'Saving the QuestionnaireResponse'
-      description %(
-        The tester will complete the questionnaire such that a QuestionnaireResponse is stored
-        back into Inferno's EHR endpoint. The stored QuestionnaireResponse will be evaluated for
-        conformance, completeness, and correct indicators on pre-populated and manually-overriden
-        items.
-      )
-      run_as_group
-
-      # Test 1: wait for a QuestionnaireResponse
-      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,
-           uses_request: :questionnaire_response_save
-      # Test 3: validate workflow-specific details such as pre-population and overrides
-      test from: :dtr_questionnaire_response_pre_population,
-           uses_request: :questionnaire_response_save
-    end
+    group from: :dtr_smart_app_saving_questionnaire_response
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static → full_ehr}/dtr_full_ehr_launch_attestation_test.rb

@@ -1,26 +1,27 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRStaticDinnerLaunchAttestationTest < Inferno::Test
+  class DTRFullEHRLaunchAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_static_launch_attestation
+    id :dtr_full_ehr_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
+      random_id = SecureRandom.uuid
       wait(
-        identifier: access_token,
+        identifier: random_id,
         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_pass_url}?token=#{random_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{random_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static → full_ehr}/dtr_full_ehr_prepopulation_attestation_test.rb

@@ -1,28 +1,28 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRStaticDinnerPrepopulationAttestationTest < Inferno::Test
+  class DTRFullEHRPrepopulationAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_static_rendering_prepopulation_attestation
+    id :dtr_full_ehr_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
+      random_id = SecureRandom.uuid
       wait(
-        identifier: access_token,
+        identifier: random_id,
         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_pass_url}?token=#{random_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{random_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static → full_ehr}/dtr_full_ehr_prepopulation_override_attestation_test.rb

@@ -1,25 +1,25 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRStaticDinnerPrepopulationOverrideAttestationTest < Inferno::Test
+  class DTRFullEHRPrepopulationOverrideAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_static_prepopulation_override_attestation
+    id :dtr_full_ehr_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
+      random_id = SecureRandom.uuid
       wait(
-        identifier: access_token,
+        identifier: random_id,
         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_pass_url}?token=#{random_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{random_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static/dtr_full_ehr_dinner_questionnaire_package_request_test.rb → full_ehr/dtr_full_ehr_questionnaire_package_request_test.rb}

@@ -1,11 +1,10 @@
-require 'base64'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRDinnerQuestionnairePackageRequestTest < Inferno::Test
+  class DTRFullEHRQuestionnairePackageRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_questionnaire_package_request
+    id :dtr_full_ehr_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

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static/dtr_full_ehr_dinner_static_questionnaire_response_conformance_test.rb → full_ehr/dtr_full_ehr_questionnaire_response_conformance_test.rb}

@@ -1,15 +1,19 @@
 require_relative '../../dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRDinnerStaticQuestionnaireResponseConformanceTest < Inferno::Test
+  class DTRFullEHRQuestionnaireResponseConformanceTest < Inferno::Test
     include DTRQuestionnaireResponseValidation
 
-    id :dtr_full_ehr_dinner_static_questionnaire_response_conformance
+    id :dtr_full_ehr_questionnaire_response_conformance
     title 'QuestionnaireResponse is conformant'
 
+    def profile_url
+      config.options[:qr_profile_url]
+    end
+
     run do
       skip_if questionnaire_response.nil?, 'Completed QuestionnaireResponse input was blank'
-      verify_basic_conformance(questionnaire_response)
+      verify_basic_conformance(questionnaire_response, profile_url)
     end
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static/dtr_full_ehr_dinner_static_questionnaire_response_correctness_test.rb → full_ehr/dtr_full_ehr_questionnaire_response_correctness_test.rb}

@@ -1,29 +1,36 @@
 require_relative '../../dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRDinnerStaticQuestionnaireResponseCorrectnessTest < Inferno::Test
+  class DTRFullEHRQuestionnaireResponseCorrectnessTest < Inferno::Test
     include DTRQuestionnaireResponseValidation
 
-    id :dtr_full_ehr_dinner_static_questionnaire_response_correctness
+    id :dtr_full_ehr_questionnaire_response_correctness
     title 'QuestionnaireResponse is correct for the workflow'
     description %(
       The QuestionnaireResponse aligns with the following expectations for the workflow. This includes checks for
       the presence of the following answers and their appropriate origin source extensions:
 
-      - PBD.1 (Last Name): `auto`
+      - `PBD.1` (Last Name) and `LOC.1` (Location): `auto`
       - PBD.2 (First Name): `override`
-      - 3.1 (dinner choice): `manual`
+      - `3` (all nested dinner questions): `manual`
     )
 
     run do
       skip_if questionnaire_response.nil?, 'Completed QuestionnaireResponse input was blank'
       check_is_questionnaire_response(questionnaire_response)
 
-      questionnaire = Fixtures.questionnaire_for_test(id)
-      # questionnaire = Fixtures.find_questionnaire('DinnerOrderStatic')
       qr = FHIR.from_contents(questionnaire_response)
+      questionnaire = if config.options[:adaptive]
+                        qr.contained.find do |res|
+                          res.resourceType == 'Questionnaire'
+                        end
+                      else
+                        Fixtures.questionnaire_for_test(id)
+                      end
+      # questionnaire = Fixtures.find_questionnaire('DinnerOrderStatic')
       check_origin_sources(questionnaire.item, qr.item, expected_overrides: ['PBD.2'])
-      check_answer_presence(qr.item, link_ids: ['PBD.1', 'PBD.2', 'LOC.1'])
+      required_link_ids = extract_required_link_ids(questionnaire.item)
+      check_answer_presence(qr.item, required_link_ids)
       assert(messages.none? { |m| m[:type] == 'error' }, 'QuestionnaireResponse is not correct, see error message(s)')
     end
   end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static → full_ehr}/dtr_full_ehr_rendering_enabled_questions_attestation_test.rb

@@ -1,28 +1,28 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRStaticDinnerRenderingAttestationTest < Inferno::Test
+  class DTRFullEHRRenderingEnabledQuestionsAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_static_rendering_enabledQs_attestation
+    id :dtr_full_ehr_rendering_enabled_questions_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
+      random_id = SecureRandom.uuid
       wait(
-        identifier: access_token,
+        identifier: random_id,
         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_pass_url}?token=#{random_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{random_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/full_ehr/dtr_full_ehr_saving_questionnaire_response_group.rb

@@ -0,0 +1,29 @@
+require_relative 'dtr_full_ehr_store_attestation_test'
+require_relative 'dtr_full_ehr_questionnaire_response_conformance_test'
+require_relative 'dtr_full_ehr_questionnaire_response_correctness_test'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRSavingQuestionnaireResponseGroup < Inferno::TestGroup
+    id :dtr_full_ehr_saving_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.
+      )
+    input :questionnaire_response,
+          type: 'textarea',
+          title: 'Completed QuestionnaireResponse',
+          optional: true,
+          description: %(
+              The QuestionnaireResponse as exported from the EHR after completion of the Questionnaire.
+            )
+    run_as_group
+
+    # Test 1: attest QuestionnaireResponse saved
+    test from: :dtr_full_ehr_store_attestation
+    # Test 2: verify basic conformance of the QuestionnaireResponse
+    test from: :dtr_full_ehr_questionnaire_response_conformance
+    # Test 3: check workflow-specific details such as pre-population and overrides
+    test from: :dtr_full_ehr_questionnaire_response_correctness
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/{dinner_static → full_ehr}/dtr_full_ehr_store_attestation_test.rb

@@ -1,27 +1,27 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRStaticDinnerStoreAttestationTest < Inferno::Test
+  class DTRFullEHRStoreAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_dinner_static_store_attestation
+    id :dtr_full_ehr_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
+      random_id = SecureRandom.uuid
       wait(
-        identifier: access_token,
+        identifier: random_id,
         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_pass_url}?token=#{random_id}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?token=#{access_token}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{random_id}) if the above statement is **false**.
         )
       )
     end

data/lib/davinci_dtr_test_kit/client_groups/resp_assist_device/dtr_questionnaire_rendering_attestation_test.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
@@ -7,24 +8,24 @@ module DaVinciDTRTestKit
     id :dtr_questionnaire_rendering_attestation
     title 'Check that the client renders the questionnaire (Attestation)'
     description %(
-      Thist test provides the tester an opportunity to observe their client application following the receipt of the
-      questionnaire pacakage and attest that the application renders the questionnaire.
+      This test provides the tester an opportunity to observe their client application following the receipt of the
+      questionnaire package and attest that the application renders the questionnaire.
     )
-    input :client_id
 
     run do
       load_tagged_requests QUESTIONNAIRE_PACKAGE_TAG
       skip_if request.blank?, 'A Questionnaire Package request must be made prior to running this test'
+      token = SecureRandom.uuid
 
       wait(
-        identifier: client_id,
+        identifier: token,
         message: %(
           I attest that the client application displays the questionnaire and respects the following rendering style:
           - The "Signature" field label is rendered with green text
 
-          [Click here](#{resume_pass_url}?client_id=#{client_id}) if the above statement is **true**.
+          [Click here](#{resume_pass_url}?token=#{token}) if the above statement is **true**.
 
-          [Click here](#{resume_fail_url}?client_id=#{client_id}) if the above statement is **false**.
+          [Click here](#{resume_fail_url}?token=#{token}) if the above statement is **false**.
         )
       )
     end