davinci_dtr_test_kit 0.14.2 → 0.15.0

data/lib/davinci_dtr_test_kit/auth_groups/token_validation_test.rb

@@ -1,5 +1,5 @@
 module DaVinciDTRTestKit
-  class TokentRequestTest < Inferno::Test
+  class TokenValidationTest < Inferno::Test
     id :token_validation
     title 'Client token request is valid'
     description 'Inferno will verify that an access token was successfully returned to the client under test.'

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_custom_questionnaire_expressions_test.rb

@@ -0,0 +1,22 @@
+require_relative '../../cql_test'
+module DaVinciDTRTestKit
+  class DTRCustomQuestionnaireExpressionsTest < Inferno::Test
+    include DaVinciDTRTestKit::CQLTest
+
+    id :dtr_custom_questionnaire_expressions
+    title %(
+      [USER INPUT VERIFICATION] Custom static questionnaire(s) contain items with expressions
+      necessary for pre-population
+    )
+    description %(
+      Inferno checks that the custom response has appropriate expressions and that expressions are
+      written in cql.
+    )
+
+    run do
+      skip_if scratch[:static_questionnaire_bundles].blank?, 'No questionnaire bundle found in the custom response'
+      questionnaires = extract_questionnaires_from_bundles(scratch[:static_questionnaire_bundles])
+      verify_questionnaire_items(questionnaires, final_cql_test: true)
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_custom_questionnaire_extensions_test.rb

@@ -0,0 +1,19 @@
+require_relative '../../cql_test'
+module DaVinciDTRTestKit
+  class DTRCustomQuestionnaireExtensionsTest < Inferno::Test
+    include DaVinciDTRTestKit::CQLTest
+
+    id :dtr_custom_questionnaire_extensions
+    title '[USER INPUT VERIFICATION] Custom static questionnaire(s) contain extensions necessary for pre-population'
+    description %(
+      Inferno checks that the custom response has appropriate extensions and references to libraries within
+      those extensions.
+    )
+
+    run do
+      skip_if scratch[:static_questionnaire_bundles].blank?, 'No questionnaire bundle found in the custom response'
+      questionnaires = extract_questionnaires_from_bundles(scratch[:static_questionnaire_bundles])
+      verify_questionnaire_extensions(questionnaires)
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_custom_questionnaire_libraries_test.rb

@@ -0,0 +1,21 @@
+require_relative '../../cql_test'
+module DaVinciDTRTestKit
+  class DTRCustomQuestionnaireLibrariesTest < Inferno::Test
+    include DaVinciDTRTestKit::CQLTest
+
+    id :dtr_custom_questionnaire_libraries
+    title %(
+      [USER INPUT VERIFICATION] Custom Questionnaire Package response parameters contain libraries
+      necessary for pre-population
+    )
+    description %(
+      Inferno check that the custom response contains no duplicate library names
+      and that libraries contain cql and elm data.
+    )
+
+    run do
+      skip_if scratch[:static_questionnaire_bundles].blank?, 'No questionnaire bundle found in the custom response'
+      check_libraries(scratch[:static_questionnaire_bundles])
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_custom_questionnaire_package_validation_test.rb

@@ -0,0 +1,39 @@
+require_relative '../../cql_test'
+module DaVinciDTRTestKit
+  class DTRCustomQuestionnairePackageValidationTest < Inferno::Test
+    include DaVinciDTRTestKit::CQLTest
+
+    id :dtr_custom_qp_validation
+    title '[USER INPUT VERIFICATION] Custom Questionnaire Package response is valid'
+    description %(
+      Inferno will validate that the user provided response to the questionnaire-package operation is conformant
+      to the
+      [Questionnaire Package operation definition](https://hl7.org/fhir/us/davinci-dtr/STU2/OperationDefinition-questionnaire-package.html).
+      This includes verifying that the response conforms to the
+      [DTR Questionnaire Package Bundle profile](https://hl7.org/fhir/us/davinci-dtr/STU2/StructureDefinition-DTR-QPackageBundle.html)
+      and, in the event that the server includes that Bundle in a Parameters object, the
+      [DTR Questionnaire Package Output Parameters profile](https://hl7.org/fhir/us/davinci-dtr/STU2/StructureDefinition-dtr-qpackage-output-parameters.html).
+
+      It verifies the presence of mandatory elements and that elements with required bindings contain appropriate
+      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.
+    )
+
+    input :custom_questionnaire_package_response,
+          title: 'Custom Questionnaire Package Response JSON',
+          description: %(
+            A JSON PackageBundle may be provided here to replace Inferno's response to the
+            $questionnaire-package request.
+          ),
+          type: 'textarea'
+
+    run do
+      assert_valid_json custom_questionnaire_package_response, 'Custom questionnaire package response is not valid JSON'
+
+      resource = FHIR.from_contents(custom_questionnaire_package_response)
+
+      perform_questionnaire_package_validation(resource, 'static')
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_full_ehr_custom_static_workflow_group.rb

@@ -0,0 +1,121 @@
+require_relative 'dtr_custom_questionnaire_package_validation_test'
+require_relative 'dtr_custom_questionnaire_libraries_test'
+require_relative 'dtr_custom_questionnaire_extensions_test'
+require_relative 'dtr_custom_questionnaire_expressions_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 '../shared/dtr_prepopulation_attestation_test'
+require_relative '../shared/dtr_rendering_attestation_test'
+require_relative '../shared/dtr_prepopulation_override_attestation_test'
+require_relative '../full_ehr/dtr_full_ehr_saving_questionnaire_response_group'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRCustomStaticWorkflowGroup < Inferno::TestGroup
+    id :dtr_full_ehr_custom_static_workflow
+    title 'Static Questionnaire Workflow'
+    description %(
+      This group validates that a DTR Full EHR client can perform a full DTR Static Questionnaire workflow.
+      Testers will provide a custom Questionnaire package of their choice for the test and
+      will request and complete the Questionnaire in the context of a patient with data
+      for prepopulation. As a part of this workflow, the Full EHR system must demonstrate its ability to:
+
+      1. Request the Questionnaire using the $questionnaire-package operation,
+      2. Support the tester in completing the questionnaire, including
+         - Rendering the questionnaire.
+         - Pre-populating at least two answers into the questionnaire.
+         - Allowing the tester to manually enter responses, including overriding pre-populated answers.
+      3. Complete and store the QuestionnaireResponse for future use.
+    )
+
+    group do
+      id :dtr_full_ehr_custom_static_retrieval
+      title 'Retrieving the Static Questionnaire'
+      description %(
+        During this test, DTR will be launch in the Full EHR to start the demonstration of
+        static Questionnaire capabilities. This launch must occur within the context of a patient
+        that will demonstrate the Questionnaire's pre-population logic. The patient's data needs
+        to support pre-population of at least two answers to allow for demonstration of both
+        pre-populated and manually-overridden answers in the resulting QuestionnaireResponse.
+
+        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
+        and of the provided Questionnaire that Inferno responded with.
+      )
+      run_as_group
+
+      input_order :access_token, :custom_questionnaire_package_response
+
+      # Test 0: attest to launch
+      test from: :dtr_full_ehr_launch_attest,
+           config: { options: { attestation_message:
+              'I attest that DTR has been launched in the context of a patient with data that will exercise pre-population logic in the provided static questionnaire resulting in at least 2 pre-populated answers.' } }, # rubocop:disable Layout/LineLength
+           title: 'Launch DTR (Attestation)'
+      # Test 1: wait for the $questionnaire-package request
+      test from: :dtr_full_ehr_qp_request do
+        input :custom_questionnaire_package_response
+      end
+      # Test 2: validate the $questionnaire-package body
+      test from: :dtr_qp_request_validation
+      # Test 3: validate the user provided $questionnaire-package response
+      test from: :dtr_custom_qp_validation
+      # Test 4: verify the custom response has the necessary libraries for pre-population
+      test from: :dtr_custom_questionnaire_libraries
+      # Test 5: verify the custom response has the necessaru extensions for pre-population
+      test from: :dtr_custom_questionnaire_extensions
+      # Test 6: verify custom response has necessary expressions for pre-population
+      test from: :dtr_custom_questionnaire_expressions
+    end
+
+    group do
+      id :dtr_full_ehr_custom_static_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 proper rendering of the Questionnaire
+      test from: :dtr_rendering_attest
+      # Test 2: attest to the pre-population
+      test from: :dtr_prepopulation_attest
+      # Test 2: attest to the ability to manually complete questions
+      test from: :dtr_prepopulation_override_attest
+    end
+
+    group from: :dtr_full_ehr_saving_qr do
+      input :custom_questionnaire_package_response,
+            title: 'Custom Questionnaire Package Response JSON',
+            description: %(
+              A JSON PackageBundle may be provided here to replace Inferno's response to the
+              $questionnaire-package request.
+            ),
+            type: 'textarea'
+
+      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."
+          }
+        }
+      )
+
+      children.last.description(
+        %(
+           Verify that the QuestionnaireResponse
+            - Is for the Questionnaire provided by the tester.
+            - Has source extensions demonstrating answers that are manually entered,
+             automatically pre-populated, and manually overridden.
+            - Contains answers for all required items.
+         )
+      )
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/custom_static/dtr_smart_app_custom_static_workflow_group.rb

@@ -0,0 +1,91 @@
+require_relative 'dtr_custom_questionnaire_package_validation_test'
+require_relative 'dtr_custom_questionnaire_libraries_test'
+require_relative 'dtr_custom_questionnaire_extensions_test'
+require_relative 'dtr_custom_questionnaire_expressions_test'
+require_relative '../smart_app/dtr_smart_app_questionnaire_package_request_test'
+require_relative '../shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../shared/dtr_prepopulation_attestation_test'
+require_relative '../shared/dtr_rendering_attestation_test'
+require_relative '../shared/dtr_prepopulation_override_attestation_test'
+require_relative '../smart_app/dtr_smart_app_saving_questionnaire_response_group'
+require_relative '../smart_app/dtr_smart_app_questionnaire_response_correctness_test'
+
+module DaVinciDTRTestKit
+  class DTRSmartAppCustomStaticWorkflowGroup < Inferno::TestGroup
+    id :dtr_smart_app_custom_static_workflow
+    title 'Static Questionnaire Workflow'
+    description %(
+      This group validates that a DTR SMART App client  can perform a full DTR Static Questionnaire workflow.
+      Testers will provide a custom Questionnaire package of their choice for the test and
+      will request and complete the Questionnaire in the context of a patient with data
+      for prepopulation. As a part of this workflow, the DTR SMART App client must demonstrate its ability to:
+
+      1. Request the Questionnaire using the $questionnaire-package operation,
+      2. Support the tester in completing the questionnaire, including
+        - Fetching additional data needed for pre-population
+        - Rendering the questionnaire.
+        - Pre-populating at least two answers into the questionnaire.
+        - Allowing the tester to manually enter responses, including overriding pre-populated answers.
+      3. Provide the completed QuestionnaireResponse with appropriate indicators for pre-populated
+         and manually-entered data.
+    )
+
+    group do
+      id :dtr_smart_app_custom_static_retrieval
+      title 'Retrieving the Static Questionnaire'
+      description %(
+        During this test, DTR will be launch in the SMART App client to start the demonstration of
+        static Questionnaire capabilities. This launch must occur within the context of a patient
+        that will demonstrate the Questionnaire's pre-population logic. The patient's data needs
+        to support pre-population of at least two answers to allow for demonstration of both
+        pre-populated and manually-overridden answers in the resulting QuestionnaireResponse.
+
+        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 conformance of the request
+        and of the provided Questionnaire that Inferno responded with.
+      )
+      run_as_group
+
+      # Test 1: wait for the $questionnaire-package request
+      test from: :dtr_smart_app_qp_request do
+        input :custom_questionnaire_package_response
+      end
+      # Test 2: validate the $questionnaire-package body
+      test from: :dtr_qp_request_validation
+      # Test 3: validate the user provided $questionnaire-package response
+      test from: :dtr_custom_qp_validation
+      # Test 4: verify the custom response has the necessary libraries for pre-population
+      test from: :dtr_custom_questionnaire_libraries
+      # Test 5: verify the custom response has the necessaru extensions for pre-population
+      test from: :dtr_custom_questionnaire_extensions
+      # Test 6: verify custom response has necessary expressions for pre-population
+      test from: :dtr_custom_questionnaire_expressions
+    end
+
+    group do
+      id :dtr_smart_app_custom_static_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 proper rendering of the Questionnaire
+      test from: :dtr_rendering_attest
+      # Test 1: attest to the pre-population
+      test from: :dtr_prepopulation_attest
+      # Test 2: attest to the ability to manually complete questions
+      test from: :dtr_prepopulation_override_attest
+    end
+
+    group from: :dtr_smart_app_saving_qr do
+      config(options: { custom: true })
+      test from: :dtr_smart_app_qr_correctness,
+           uses_request: :questionnaire_response_save
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_completion_group.rb → dtr_adaptive_completion_group.rb}

@@ -1,8 +1,8 @@
-require_relative 'dtr_adaptive_questionnaire_next_question_retrieval_group'
+require_relative 'dtr_adaptive_next_question_retrieval_group'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireCompletionGroup < Inferno::TestGroup
-    id :dtr_adaptive_questionnaire_completion
+  class DTRAdaptiveCompletionGroup < Inferno::TestGroup
+    id :dtr_adaptive_completion
     title 'Completing the Adaptive Questionnaire'
     description %(
       The client makes a final $next-question call, including the answers to all required questions asked so far.
@@ -18,6 +18,6 @@ module DaVinciDTRTestKit
     )
     run_as_group
 
-    group from: :dtr_adaptive_questionnaire_next_question_retrieval
+    group from: :dtr_adaptive_next_question_retrieval
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_followup_questions_group.rb → dtr_adaptive_followup_questions_group.rb}

@@ -1,8 +1,8 @@
-require_relative 'dtr_adaptive_questionnaire_next_question_retrieval_group'
+require_relative 'dtr_adaptive_next_question_retrieval_group'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireFollowupQuestionsGroup < Inferno::TestGroup
-    id :dtr_adaptive_questionnaire_followup_questions
+  class DTRAdaptiveFollowupQuestionsGroup < Inferno::TestGroup
+    id :dtr_adaptive_followup_questions
     title 'Retrieving the Next Question'
     description %(
       The client makes a subsequent call to request the next question or set of questions
@@ -21,6 +21,6 @@ module DaVinciDTRTestKit
 
     run_as_group
 
-    group from: :dtr_adaptive_questionnaire_next_question_retrieval
+    group from: :dtr_adaptive_next_question_retrieval
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_next_question_request_test.rb → dtr_adaptive_next_question_request_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireNextQuestionRequestTest < Inferno::Test
+  class DTRAdaptiveNextQuestionRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_adaptive_questionnaire_next_question_request
+    id :dtr_adaptive_next_question_request
     title 'Invoke the $next-question operation'
     description %(
       Inferno will wait for the client to invoke the $next-question operation to retrieve the next question

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_next_question_request_validation_test.rb → dtr_adaptive_next_question_request_validation_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireNextQuestionRequestValidationTest < Inferno::Test
+  class DTRAdaptiveNextQuestionRequestValidationTest < Inferno::Test
     include URLs
 
-    id :dtr_next_question_request_validation
+    id :dtr_adaptive_next_question_request_validation
     title '$next-question request is valid'
     description %(
       Per the [OperationDefinition: Adaptive questionnaire next question](https://build.fhir.org/ig/HL7/sdc/OperationDefinition-Questionnaire-next-question.html#root)

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_next_question_retrieval_group.rb → dtr_adaptive_next_question_retrieval_group.rb}

@@ -1,10 +1,10 @@
-require_relative 'dtr_adaptive_questionnaire_next_question_request_test'
-require_relative 'dtr_adaptive_questionnaire_next_question_request_validation_test'
-require_relative 'dtr_adaptive_questionnaire_response_validation_test'
+require_relative 'dtr_adaptive_next_question_request_test'
+require_relative 'dtr_adaptive_next_question_request_validation_test'
+require_relative 'dtr_adaptive_response_validation_test'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireNextQuestionRetrievalGroup < Inferno::TestGroup
-    id :dtr_adaptive_questionnaire_next_question_retrieval
+  class DTRAdaptiveNextQuestionRetrievalGroup < Inferno::TestGroup
+    id :dtr_adaptive_next_question_retrieval
     title 'Next Question Request and Validation'
     description %(
       Inferno will wait for the client system to request the next question (or set of questions) using the
@@ -14,10 +14,10 @@ module DaVinciDTRTestKit
     )
 
     # Test 1: wait for the $next-question request
-    test from: :dtr_adaptive_questionnaire_next_question_request
+    test from: :dtr_adaptive_next_question_request
     # Test 2: validate the $next-question request
-    test from: :dtr_next_question_request_validation
+    test from: :dtr_adaptive_next_question_request_validation
     # Test 3: validate the QuestionnaireResponse in the input parameter
-    test from: :dtr_adaptive_questionnaire_response_validation
+    test from: :dtr_adaptive_response_validation
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_adaptive_questionnaire_response_validation_test.rb → dtr_adaptive_response_validation_test.rb}

@@ -2,14 +2,14 @@ require_relative '../../urls'
 require_relative '../../dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
-  class DTRAdaptiveQuestionnaireResponseValidationTest < Inferno::Test
+  class DTRAdaptiveResponseValidationTest < Inferno::Test
     include URLs
     include DTRQuestionnaireResponseValidation
 
-    id :dtr_adaptive_questionnaire_response_validation
+    id :dtr_adaptive_response_validation
     title 'Adaptive QuestionnaireResponse is valid'
     description %(
-      This test validates the conformance of the Adative QuestionnaireResponse to the
+      This test validates the conformance of the Adaptive QuestionnaireResponse to the
       [SDCQuestionnaireResponseAdapt](http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt)
       structure. It verifies the presence of mandatory elements and that elements
       with required bindings contain appropriate values.

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_full_ehr_adaptive_dinner_questionnaire_workflow_group.rb → dtr_full_ehr_adaptive_dinner_workflow_group.rb}

@@ -1,13 +1,13 @@
 require_relative '../../tags'
-require_relative 'dtr_full_ehr_adaptive_questionnaire_initial_retrieval_group'
+require_relative 'dtr_full_ehr_adaptive_initial_retrieval_group'
 require_relative '../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
 require_relative '../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
-require_relative 'dtr_adaptive_questionnaire_followup_questions_group'
-require_relative 'dtr_adaptive_questionnaire_completion_group'
+require_relative 'dtr_adaptive_followup_questions_group'
+require_relative 'dtr_adaptive_completion_group'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRAdaptiveDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
-    id :dtr_full_ehr_adaptive_dinner_questionnaire_workflow
+  class DTRFullEHRAdaptiveDinnerWorkflowGroup < Inferno::TestGroup
+    id :dtr_full_ehr_adaptive_dinner_workflow
     title 'Adaptive Questionnaire Workflow'
     description %(
       This test validates that a DTR Full EHR client can perform a full DTR Adaptive Questionnaire workflow
@@ -25,7 +25,7 @@ module DaVinciDTRTestKit
     )
 
     group do
-      id :dtr_full_ehr_adaptive_questionnaire_retrieval
+      id :dtr_full_ehr_adaptive_retrieval
       title 'Retrieving the Adaptive Questionnaire'
       description %(
         After DTR launch, Inferno will wait for the client system to request a questionnaire using the
@@ -39,25 +39,25 @@ module DaVinciDTRTestKit
       )
       run_as_group
 
-      group from: :dtr_full_ehr_adaptive_questionnaire_initial_retrieval
+      group from: :dtr_full_ehr_adaptive_initial_retrieval
       group do
         id :dtr_full_ehr_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
+          such that pre-population steps are taken, the questionnaire 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_full_ehr_prepopulation_attestation
+        test from: :dtr_full_ehr_prepopulation_attest
         # Test 2: attest to the pre-population and edit of the first name field
-        test from: :dtr_full_ehr_prepopulation_override_attestation
+        test from: :dtr_full_ehr_prepopulation_override_attest
       end
     end
 
-    group from: :dtr_adaptive_questionnaire_followup_questions,
+    group from: :dtr_adaptive_followup_questions,
           config: {
             options: {
               accepts_multiple_requests: true,
@@ -65,7 +65,7 @@ module DaVinciDTRTestKit
             }
           }
 
-    group from: :dtr_adaptive_questionnaire_completion,
+    group from: :dtr_adaptive_completion,
           config: {
             options: {
               accepts_multiple_requests: true,

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_full_ehr_adaptive_questionnaire_initial_retrieval_group.rb → dtr_full_ehr_adaptive_initial_retrieval_group.rb}

@@ -1,27 +1,27 @@
 require_relative '../../tags'
 require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
-require_relative 'dtr_full_ehr_adaptive_questionnaire_request_test'
+require_relative 'dtr_full_ehr_adaptive_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative 'dtr_adaptive_questionnaire_next_question_request_validation_test'
-require_relative 'dtr_adaptive_questionnaire_response_validation_test'
+require_relative 'dtr_adaptive_next_question_request_validation_test'
+require_relative 'dtr_adaptive_response_validation_test'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRAdaptiveQuestionnaireInitialRetrievalGroup < Inferno::TestGroup
-    id :dtr_full_ehr_adaptive_questionnaire_initial_retrieval
+  class DTRFullEHRAdaptiveInitialRetrievalGroup < Inferno::TestGroup
+    id :dtr_full_ehr_adaptive_initial_retrieval
     title 'Adaptive Questionnaire Package and Initial Questions Retrieval'
 
     config(options: { next_tag: "initial_#{CLIENT_NEXT_TAG}" })
     run_as_group
 
     # Test 0: attest to launch
-    test from: :dtr_full_ehr_launch_attestation
+    test from: :dtr_full_ehr_launch_attest
     # Test 1: wait for the $questionnaire-package request and initial $next-question request
-    test from: :dtr_full_ehr_adaptive_questionnaire_request
+    test from: :dtr_full_ehr_adaptive_request
     # Test 2: validate the $questionnaire-package request body
-    test from: :dtr_questionnaire_package_request_validation
+    test from: :dtr_qp_request_validation
     # Test 3: validate the $next-question request body
-    test from: :dtr_next_question_request_validation
+    test from: :dtr_adaptive_next_question_request_validation
     # Test 4: validate the QuestionnaireResponse in the input parameter
-    test from: :dtr_adaptive_questionnaire_response_validation
+    test from: :dtr_adaptive_response_validation
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_full_ehr_adaptive_questionnaire_request_test.rb → dtr_full_ehr_adaptive_request_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRAdaptiveQuestionnaireRequestTest < Inferno::Test
+  class DTRFullEHRAdaptiveRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_adaptive_questionnaire_request
+    id :dtr_full_ehr_adaptive_request
     title 'Invoke the Questionnaire Package and Initial Next Question Operation'
     description %(
       This test waits for two sequential client requests:

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_smart_app_questionnaire_workflow_group.rb → dtr_smart_app_adaptive_dinner_workflow_group.rb}

@@ -1,13 +1,14 @@
 require_relative '../../tags'
-require_relative 'dtr_smart_app_adaptive_questionnaire_initial_retrieval_group'
+require_relative 'dtr_smart_app_adaptive_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'
+require_relative 'dtr_adaptive_followup_questions_group'
+require_relative 'dtr_adaptive_completion_group'
+require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
-  class DTRSmartAppAdaptiveDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
-    id :dtr_smart_app_adaptive_dinner_questionnaire_workflow
+  class DTRSmartAppAdaptiveDinnerWorkflowGroup < Inferno::TestGroup
+    id :dtr_smart_app_adaptive_dinner_workflow
     title 'Adaptive Questionnaire Workflow'
     description %(
       This test validates that a DTR SMART App client can perform a full DTR Adaptive Questionnaire workflow
@@ -32,7 +33,7 @@ module DaVinciDTRTestKit
     )
 
     group do
-      id :dtr_smart_app_adaptive_questionnaire_retrieval
+      id :dtr_smart_app_adaptive_retrieval
       title 'Retrieving the Adaptive Questionnaire'
       description %(
         Inferno will wait for the client system to request a questionnaire using the
@@ -45,7 +46,7 @@ module DaVinciDTRTestKit
       )
       run_as_group
 
-      group from: :dtr_smart_app_adaptive_questionnaire_initial_retrieval
+      group from: :dtr_smart_app_adaptive_initial_retrieval
       group do
         id :dtr_smart_app_initial_questionnaire_rendering
         title 'Filling Out the Questionnaire'
@@ -57,13 +58,13 @@ module DaVinciDTRTestKit
         )
 
         # Test 1: attest to the pre-population of the name fields
-        test from: :dtr_smart_app_prepopulation_attestation
+        test from: :dtr_smart_app_prepopulation_attest
         # Test 2: attest to the pre-population and edit of the location field
-        test from: :dtr_smart_app_prepopulation_override_attestation
+        test from: :dtr_smart_app_prepopulation_override_attest
       end
     end
 
-    group from: :dtr_adaptive_questionnaire_followup_questions,
+    group from: :dtr_adaptive_followup_questions,
           config: {
             options: {
               accepts_multiple_requests: true,
@@ -74,7 +75,7 @@ module DaVinciDTRTestKit
             }
           }
 
-    group from: :dtr_adaptive_questionnaire_completion,
+    group from: :dtr_adaptive_completion,
           config: {
             options: {
               accepts_multiple_requests: true,
@@ -84,12 +85,17 @@ module DaVinciDTRTestKit
               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'
-            }
-          }
+    group from: :dtr_smart_app_saving_qr do
+      config(
+        options: {
+          adaptive: true,
+          qr_profile_url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaireresponse-adapt'
+        }
+      )
+
+      # Test 3: validate workflow-specific details such as pre-population and overrides
+      test from: :dtr_qr_prepopulation,
+           uses_request: :questionnaire_response_save
+    end
   end
 end