davinci_dtr_test_kit 0.14.2 → 0.15.0

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

@@ -0,0 +1,24 @@
+require_relative '../../tags'
+require_relative 'dtr_smart_app_adaptive_request_test'
+require_relative '../shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'dtr_adaptive_next_question_request_validation_test'
+require_relative 'dtr_adaptive_response_validation_test'
+
+module DaVinciDTRTestKit
+  class DTRSmartAppAdaptiveInitialRetrievalGroup < Inferno::TestGroup
+    id :dtr_smart_app_adaptive_initial_retrieval
+    title 'Adaptive Questionnaire Package and Initial Questions Retrieval'
+
+    config(options: { next_tag: "initial_#{CLIENT_NEXT_TAG}" })
+    run_as_group
+
+    # Test 1: wait for the $questionnaire-package request and initial $next-question request
+    test from: :dtr_smart_app_adaptive_request
+    # Test 2: validate the $questionnaire-package request body
+    test from: :dtr_qp_request_validation
+    # Test 3: validate the $next-question request body
+    test from: :dtr_adaptive_next_question_request_validation
+    # Test 4: validate the QuestionnaireResponse in the input parameter
+    test from: :dtr_adaptive_response_validation
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/dinner_adaptive/{dtr_smart_app_adaptive_questionnaire_request_test.rb → dtr_smart_app_adaptive_request_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRSmartAppAdaptiveQuestionnaireRequestTest < Inferno::Test
+  class DTRSmartAppAdaptiveRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_smart_app_adaptive_questionnaire_request
+    id :dtr_smart_app_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_static/{dtr_full_ehr_questionnaire_workflow_group.rb → dtr_full_ehr_static_dinner_workflow_group.rb}

@@ -2,14 +2,14 @@ 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 '../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_rendering_enabled_questions_attestation_test'
+require_relative 'dtr_static_dinner_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
-    id :dtr_full_ehr_static_dinner_questionnaire_workflow
-    title 'Static Questionnaire Workflow'
+  class DTRFullEHRStaticDinnerWorkflowGroup < Inferno::TestGroup
+    id :dtr_full_ehr_static_dinner_workflow
+    title 'Dinner Order 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
@@ -24,7 +24,7 @@ module DaVinciDTRTestKit
     )
 
     group do
-      id :dtr_full_ehr_static_questionnaire_retrieval
+      id :dtr_full_ehr_static_retrieval
       title 'Retrieving the Static Questionnaire'
       description %(
         After DTR launch, Inferno will wait for the client system to request a questionnaire using the
@@ -34,15 +34,15 @@ module DaVinciDTRTestKit
       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
-      test from: :dtr_full_ehr_questionnaire_package_request
+      test from: :dtr_full_ehr_qp_request
       # Test 2: validate the $questionnaire-package body
-      test from: :dtr_questionnaire_package_request_validation
+      test from: :dtr_qp_request_validation
     end
 
     group do
-      id :dtr_full_ehr_static_questionnaire_rendering
+      id :dtr_full_ehr_static_rendering
       title 'Filling Out the Static Questionnaire'
       description %(
         The tester will interact with the questionnaire within their client system
@@ -53,14 +53,14 @@ module DaVinciDTRTestKit
       run_as_group
 
       # 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
       # Test 3: attest to the display of the toppings questions only when a dinner answer is selected
-      test from: :dtr_full_ehr_rendering_enabled_questions_attestation
+      test from: :dtr_static_dinner_enabled_questions_attest
     end
 
-    group from: :dtr_full_ehr_saving_questionnaire_response,
+    group from: :dtr_full_ehr_saving_qr,
           config: {
             inputs: {
               questionnaire_response: {

data/lib/davinci_dtr_test_kit/client_groups/dinner_static/{dtr_smart_app_questionnaire_workflow_group.rb → dtr_smart_app_static_dinner_workflow_group.rb}

@@ -1,14 +1,15 @@
-require_relative 'dtr_smart_app_dinner_questionnaire_package_request_test'
+require_relative '../smart_app/dtr_smart_app_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_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 'dtr_static_dinner_enabled_questions_attestation_test'
 require_relative '../smart_app/dtr_smart_app_saving_questionnaire_response_group'
+require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
-  class DTRSmartAppStaticDinnerQuestionnaireWorkflowGroup < Inferno::TestGroup
-    id :dtr_smart_app_static_dinner_questionnaire_workflow
-    title 'Static Questionnaire Workflow'
+  class DTRSmartAppStaticDinnerWorkflowGroup < Inferno::TestGroup
+    id :dtr_smart_app_static_dinner_workflow
+    title 'Dinner Order Static Questionnaire Workflow'
     description %(
       This test validates that a DTR SMART App client can perform a full DTR Static Questionnaire workflow
       using a mocked questionnaire requesting what a patient wants for dinner. The client system must
@@ -25,7 +26,7 @@ module DaVinciDTRTestKit
     )
 
     group do
-      id :dtr_smart_app_static_questionnaire_retrieval
+      id :dtr_smart_app_static_retrieval
       title 'Retrieving the Static Questionnaire'
       description %(
         Inferno will wait for the client system to request a questionnaire using the
@@ -35,13 +36,13 @@ module DaVinciDTRTestKit
       run_as_group
 
       # Test 1: wait for the $questionnaire-package request
-      test from: :dtr_smart_app_dinner_questionnaire_package_request
+      test from: :dtr_smart_app_qp_request
       # Test 2: validate the $questionnaire-package body
-      test from: :dtr_questionnaire_package_request_validation
+      test from: :dtr_qp_request_validation
     end
 
     group do
-      id :dtr_smart_app_static_questionnaire_rendering
+      id :dtr_smart_app_static_rendering
       title 'Filling Out the Static Questionnaire'
       description %(
         The tester will interact with the questionnaire within their client system
@@ -56,13 +57,17 @@ 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_prepopulation_attestation
+      test from: :dtr_smart_app_prepopulation_attest
       # Test 3: 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
       # Test 4: attest to the display of the toppings questions only when a dinner answer is selected
-      test from: :dtr_smart_app_rendering_enabled_questions_attestation
+      test from: :dtr_static_dinner_enabled_questions_attest
     end
 
-    group from: :dtr_smart_app_saving_questionnaire_response
+    group from: :dtr_smart_app_saving_qr do
+      # 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

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

@@ -2,10 +2,10 @@ require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRFullEHRRenderingEnabledQuestionsAttestationTest < Inferno::Test
+  class DTRStaticDinnerEnabledQuestionsAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_rendering_enabled_questions_attestation
+    id :dtr_static_dinner_enabled_questions_attest
     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/full_ehr/dtr_full_ehr_launch_attestation_test.rb

@@ -5,19 +5,24 @@ module DaVinciDTRTestKit
   class DTRFullEHRLaunchAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_launch_attestation
+    id :dtr_full_ehr_launch_attest
     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.
     )
 
+    def attestation_message
+      return config.options[:attestation_message] if config.options.key?(:attestation_message)
+
+      'I attest that DTR has been launched in the context of a patient with an official name, including first and last.'
+    end
+
     run do
       random_id = SecureRandom.uuid
       wait(
         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.
+          #{attestation_message}
 
           [Click here](#{resume_pass_url}?token=#{random_id}) if the above statement is **true**.
 

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

@@ -5,7 +5,7 @@ module DaVinciDTRTestKit
   class DTRFullEHRPrepopulationAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_prepopulation_attestation
+    id :dtr_full_ehr_prepopulation_attest
     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/full_ehr/dtr_full_ehr_prepopulation_override_attestation_test.rb

@@ -5,7 +5,7 @@ module DaVinciDTRTestKit
   class DTRFullEHRPrepopulationOverrideAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_prepopulation_override_attestation
+    id :dtr_full_ehr_prepopulation_override_attest
     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/full_ehr/dtr_full_ehr_questionnaire_package_request_test.rb

@@ -4,7 +4,7 @@ module DaVinciDTRTestKit
   class DTRFullEHRQuestionnairePackageRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_questionnaire_package_request
+    id :dtr_full_ehr_qp_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/full_ehr/dtr_full_ehr_questionnaire_response_conformance_test.rb

@@ -4,8 +4,13 @@ module DaVinciDTRTestKit
   class DTRFullEHRQuestionnaireResponseConformanceTest < Inferno::Test
     include DTRQuestionnaireResponseValidation
 
-    id :dtr_full_ehr_questionnaire_response_conformance
+    id :dtr_full_ehr_qr_conformance
     title 'QuestionnaireResponse is conformant'
+    description %(
+      Verify that the provided QuestionnaireResponse is conformant to the [DTR
+      QuestionnaireResponse](https://hl7.org/fhir/us/davinci-dtr/STU2/StructureDefinition-dtr-questionnaireresponse.html)
+      profile.
+    )
 
     def profile_url
       config.options[:qr_profile_url]

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

@@ -4,34 +4,22 @@ module DaVinciDTRTestKit
   class DTRFullEHRQuestionnaireResponseCorrectnessTest < Inferno::Test
     include DTRQuestionnaireResponseValidation
 
-    id :dtr_full_ehr_questionnaire_response_correctness
+    id :dtr_full_ehr_qr_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) and `LOC.1` (Location): `auto`
-      - PBD.2 (First Name): `override`
-      - `3` (all nested dinner questions): `manual`
+      Verify that the QuestionnaireResponse meets the expected workflow requirements by verifying the following:
+      This includes:
+        - **Completion Check**: Confirm that all required questions have been answered.
+        - **Origin Source Validation**: Verify that specific answers are derived from the correct sources:
+          - `PBD.1` (Last Name) and `LOC.1` (Location): `auto`
+          - `PBD.2` (First Name): `override`
+          - `3` (all nested dinner questions): `manual`
     )
 
     run do
-      skip_if questionnaire_response.nil?, 'Completed QuestionnaireResponse input was blank'
-      check_is_questionnaire_response(questionnaire_response)
+      skip_if questionnaire_response.blank?, 'Completed QuestionnaireResponse input was blank'
 
-      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'])
-      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)')
+      validate_questionnaire_response_correctness(questionnaire_response, try(:custom_questionnaire_package_response))
     end
   end
 end

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

@@ -4,7 +4,7 @@ require_relative 'dtr_full_ehr_questionnaire_response_correctness_test'
 
 module DaVinciDTRTestKit
   class DTRFullEHRSavingQuestionnaireResponseGroup < Inferno::TestGroup
-    id :dtr_full_ehr_saving_questionnaire_response
+    id :dtr_full_ehr_saving_qr
     title 'Saving the QuestionnaireResponse'
     description %(
         The tester will attest to the completion of the questionnaire such that
@@ -20,10 +20,10 @@ module DaVinciDTRTestKit
     run_as_group
 
     # Test 1: attest QuestionnaireResponse saved
-    test from: :dtr_full_ehr_store_attestation
+    test from: :dtr_full_ehr_store_attest
     # Test 2: verify basic conformance of the QuestionnaireResponse
-    test from: :dtr_full_ehr_questionnaire_response_conformance
+    test from: :dtr_full_ehr_qr_conformance
     # Test 3: check workflow-specific details such as pre-population and overrides
-    test from: :dtr_full_ehr_questionnaire_response_correctness
+    test from: :dtr_full_ehr_qr_correctness
   end
 end

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

@@ -5,7 +5,7 @@ module DaVinciDTRTestKit
   class DTRFullEHRStoreAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_full_ehr_store_attestation
+    id :dtr_full_ehr_store_attest
     title 'Complete and Store the QuestionnaireResponse (Attestation)'
     description %(
       Attest that the questionnaire has been completed and the response has been persisted

data/lib/davinci_dtr_test_kit/client_groups/light_ehr/dtr_smart_ehr_launch.rb

@@ -0,0 +1,18 @@
+require_relative 'fhir_launch_context_test'
+require_relative 'fhir_context_coverage_test'
+require_relative 'fhir_context_references_test'
+require 'smart_app_launch/ehr_launch_group_stu2'
+
+module DaVinciDTRTestKit
+  class DTRSMARTEHRLaunch < SMARTAppLaunch::EHRLaunchGroupSTU2
+    title 'DTR SMART EHR Launch'
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@117'
+
+    id :dtr_smart_ehr_launch
+    run_as_group
+
+    test from: :fhir_launch_context
+    test from: :fhir_context_coverage
+    test from: :fhir_context_references
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/light_ehr/fhir_context_coverage_test.rb

@@ -0,0 +1,42 @@
+module DaVinciDTRTestKit
+  class FhirContextCoverageTest < Inferno::Test
+    include DaVinciDTRTestKit::ReadTest
+
+    id :fhir_context_coverage
+    title 'fhirContext Coverage Reference Test'
+    description %(
+      This test validates that when the light EHR launches a DTR SMART App, the launch context includes
+      a `fhirContext` with one active Coverage resource and that the referenced Coverage can be read from
+      the light DTR EHR. See the [Launching DTR](https://hl7.org/fhir/us/davinci-dtr/STU2/specification.html#launching-dtr)
+      section of the DTR IG for details.
+    )
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@126'
+    optional
+
+    uses_request :token
+
+    fhir_client do
+      url :url
+      bearer_token JSON.parse(request.response_body)['access_token']
+    end
+
+    def scratch_resources
+      scratch[:coverage_references] ||= {}
+    end
+
+    run do
+      token_response_params = JSON.parse(request.response_body)
+
+      skip_if(!token_response_params['fhirContext'].present?,
+              %(fhirContext not present on the passed launch context, skipping test.'))
+
+      coverage = token_response_params['fhirContext'].find { |c| c.split('/')[0] == 'Coverage' }
+      assert coverage.present?, 'Coverage resource not present on fhirContext'
+
+      coverage_array = [coverage.split('/')[1]]
+      assert coverage_array.present?, 'Coverage resource not present on fhirContext in proper format'
+
+      perform_read_test(coverage_array, 'Coverage')
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/light_ehr/fhir_context_references_test.rb

@@ -0,0 +1,60 @@
+module DaVinciDTRTestKit
+  class FhirContextReferencesTest < Inferno::Test
+    include DaVinciDTRTestKit::ReadTest
+
+    id :fhir_context_references
+    title 'fhirContext Request, QuestionnaireResponse, or Task References Test'
+    description %(
+      This test validates that when the light EHR launches a DTR SMART App, the launch context includes
+      a `fhirContext` with exactly one of the following references and that the referenced resource can be read from
+      the light DTR EHR:
+      - A CRD-type Request or Encounter resource
+      - An existing incomplete QuestionnaireResponse previously created with DTR
+      - A Questionnaire Task
+
+      See the [Launching DTR](https://hl7.org/fhir/us/davinci-dtr/STU2/specification.html#launching-dtr)
+      section of the DTR IG for details.
+    )
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@127'
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@128'
+    verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@129'
+    optional
+
+    uses_request :token
+
+    fhir_client do
+      url :url
+      bearer_token JSON.parse(request.response_body)['access_token']
+    end
+
+    def scratch_resources
+      scratch[:crd_request_resources] ||= {}
+    end
+
+    run do
+      token_response_params = JSON.parse(request.response_body)
+
+      skip_if(!token_response_params['fhirContext'].present?,
+              %(fhirContext not present on the passed launch context, skipping test.))
+
+      context_reference = token_response_params['fhirContext'].filter do |c|
+        c.split('/')[0] == 'DeviceRequest' || c.split('/')[0] == 'ServiceRequest' ||
+          c.split('/')[0] == 'CommunicationRequest' || c.split('/')[0] == 'MedicationRequest' ||
+          c.split('/')[0] == 'Encounter' || c.split('/')[0] == 'Task' || c.split('/')[0] == 'QuestionnaireResponse'
+      end
+
+      assert context_reference.present?,
+             'fhirContext does not contain a CRD-type request, QuestionnaireResponse, or Task resource'
+
+      context_reference_amount = context_reference.length
+      assert context_reference_amount == 1,
+             'fhirContext should only contain one CRD-type request, QuestionnaireResponse, or Task'
+
+      crd_request_array = [(context_reference[0]).split('/')[1]]
+      assert crd_request_array.present?,
+             'fhirContext does not contain a CRD-type request, QuestionnaireResponse, or Task resource in proper format'
+
+      perform_read_test(crd_request_array, (context_reference[0]).split('/')[0])
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/light_ehr/fhir_launch_context_test.rb

@@ -0,0 +1,23 @@
+module DaVinciDTRTestKit
+  class FhirLaunchContextTest < Inferno::Test
+    include SMARTAppLaunch::TokenPayloadValidation
+
+    id :fhir_launch_context
+    title 'Token exchange response body contains fhirContext'
+    description %(
+      This test validates that when the light EHR launches a DTR SMART App, the launch context
+      includes a `fhirContext`. See the [Launching DTR](https://hl7.org/fhir/us/davinci-dtr/STU2/specification.html#launching-dtr)
+      section of the DTR IG for details.
+    )
+    optional
+
+    uses_request :token
+
+    run do
+      token_response_params = JSON.parse(request.response_body)
+      assert token_response_params['fhirContext'].present?, 'fhirContext not present on the passed launch context'
+
+      validate_fhir_context(token_response_params['fhirContext'])
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/{resp_assist_device/dtr_questionnaire_package_group.rb → respiratory/dtr_respiratory_questionnaire_package_group.rb}

@@ -1,16 +1,16 @@
-require_relative 'dtr_resp_questionnaire_package_request_test'
+require_relative 'dtr_respiratory_questionnaire_package_request_test'
 require_relative '../shared/dtr_questionnaire_package_request_validation_test'
 
 module DaVinciDTRTestKit
-  class DTRQuestionnairePackageGroup < Inferno::TestGroup
-    id :dtr_questionnaire_package
+  class DTRRespiratoryQuestionnairePackageGroup < Inferno::TestGroup
+    id :dtr_resp_qp
     title 'Questionnaire Package Retrieval'
     description %(
       Demonstrate the ability to request the Respiratory Assist Device Questionnaire Package from the payer.
     )
     run_as_group
 
-    test from: :dtr_resp_questionnaire_package_request
-    test from: :dtr_questionnaire_package_request_validation
+    test from: :dtr_resp_qp_request
+    test from: :dtr_qp_request_validation
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/{resp_assist_device/dtr_resp_questionnaire_package_request_test.rb → respiratory/dtr_respiratory_questionnaire_package_request_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRRespQuestionnairePackageRequestTest < Inferno::Test
+  class DTRRespiratoryQuestionnairePackageRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_resp_questionnaire_package_request
+    id :dtr_resp_qp_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/{resp_assist_device/dtr_questionnaire_response_group.rb → respiratory/dtr_respiratory_questionnaire_response_group.rb}

@@ -1,23 +1,23 @@
-require_relative 'dtr_questionnaire_response_save_test'
+require_relative 'dtr_respiratory_questionnaire_response_save_test'
 require_relative '../shared/dtr_questionnaire_response_basic_conformance_test'
-require_relative '../shared/dtr_questionnaire_response_pre_population_test'
+require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
-  class DTRQuestionnaireResponseGroup < Inferno::TestGroup
-    id :dtr_questionnaire_response
+  class DTRRespiratoryQuestionnaireResponseGroup < Inferno::TestGroup
+    id :dtr_resp_qr
     title 'Questionnaire Response'
     description %(
       Demonstrate the ability to pre-populate and respond to the Respiratory Assist Device Questionnaire.
     )
     run_as_group
 
-    test from: :dtr_resp_assist_questionnaire_response_save,
+    test from: :dtr_resp_qr_save,
          receives_request: :questionnaire_response_save
 
-    test from: :dtr_questionnaire_response_basic_conformance,
+    test from: :dtr_qr_basic_conformance,
          uses_request: :questionnaire_response_save
 
-    test from: :dtr_questionnaire_response_pre_population,
+    test from: :dtr_qr_prepopulation,
          uses_request: :questionnaire_response_save
   end
 end

data/lib/davinci_dtr_test_kit/client_groups/{resp_assist_device/dtr_questionnaire_response_save_test.rb → respiratory/dtr_respiratory_questionnaire_response_save_test.rb}

@@ -1,10 +1,10 @@
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRRespAssistQuestionnaireResponseSaveTest < Inferno::Test
+  class DTRRespiratoryQuestionnaireResponseSaveTest < Inferno::Test
     include URLs
 
-    id :dtr_resp_assist_questionnaire_response_save
+    id :dtr_resp_qr_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/{resp_assist_device/dtr_questionnaire_rendering_attestation_test.rb → respiratory/dtr_respiratory_rendering_attestation_test.rb}

@@ -2,10 +2,10 @@ require 'securerandom'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRQuestionnaireRenderingAttestationTest < Inferno::Test
+  class DTRRespiratoryRenderingAttestationTest < Inferno::Test
     include URLs
 
-    id :dtr_questionnaire_rendering_attestation
+    id :dtr_resp_rendering_attest
     title 'Check that the client renders the questionnaire (Attestation)'
     description %(
       This test provides the tester an opportunity to observe their client application following the receipt of the

data/lib/davinci_dtr_test_kit/client_groups/respiratory/dtr_respiratory_rendering_group.rb

@@ -0,0 +1,14 @@
+require_relative 'dtr_respiratory_rendering_attestation_test'
+
+module DaVinciDTRTestKit
+  class DTRRespiratoryRenderingGroup < Inferno::TestGroup
+    id :dtr_resp_rendering
+    title 'Questionnaire Rendering'
+    description %(
+      Demonstrate the ability to render the Respiratory Assist Device Questionnaire.
+    )
+    run_as_group
+
+    test from: :dtr_resp_rendering_attest
+  end
+end

data/lib/davinci_dtr_test_kit/client_groups/{resp_assist_device/dtr_smart_app_questionnaire_workflow_group.rb → respiratory/dtr_smart_app_respiratory_workflow_group.rb}

@@ -1,10 +1,10 @@
-require_relative 'dtr_questionnaire_package_group'
-require_relative 'dtr_questionnaire_rendering_group'
-require_relative 'dtr_questionnaire_response_group'
+require_relative 'dtr_respiratory_questionnaire_package_group'
+require_relative 'dtr_respiratory_rendering_group'
+require_relative 'dtr_respiratory_questionnaire_response_group'
 
 module DaVinciDTRTestKit
-  class DTRSmartAppQuestionnaireWorkflowGroup < Inferno::TestGroup
-    id :dtr_smart_app_questionnaire_workflow
+  class DTRSmartAppRespiratoryWorkflowGroup < Inferno::TestGroup
+    id :dtr_smart_app_resp_workflow
     title 'Respiratory Assist Device Questionnaire Workflow'
     description %(
       This workflow validates that a DTR SMART App can perform a full DTR
@@ -16,8 +16,8 @@ module DaVinciDTRTestKit
       3. Pre-populate the questionnaire response
     )
 
-    group from: :dtr_questionnaire_package
-    group from: :dtr_questionnaire_rendering
-    group from: :dtr_questionnaire_response
+    group from: :dtr_resp_qp
+    group from: :dtr_resp_rendering
+    group from: :dtr_resp_qr
   end
 end