davinci_dtr_test_kit 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3449c737f53b2443bc81890e9788ff4aad6837c70865512e58b5a5d3809ad96e
-  data.tar.gz: 4b2775168992e4887e5e330178138bd918a225bf9d57f2b7425a021acc7ee7c1
+  metadata.gz: 0a072f135a4057afa53b8836a3436fab457fc8c1ab15199e19608732b16d16cb
+  data.tar.gz: e4942f1af9755743eab89b7a0cc8b559929ad8b4be4bed00e7e1a33b4de1b0bd
 SHA512:
-  metadata.gz: e6107a0cf03478d3bdc9c9b155af0664b8d39b9a3819e563c3dcf45bc69b34d80a83b0be270022be6d75aeb95a6b2b9b85d486c00693a9ad3e4f0605e2d504ee
-  data.tar.gz: 69701c0a2b4a2a69ae16d5e8dd1b79fd9d27fddf0230d02dc6793be32752d965f01688d3661df72cfdddc9a208b252fda1303f516b5aa6458d33631383fc17f2
+  metadata.gz: aae323b007b88a564283b1fc946490e3c2330d6b3081de4783c0611c25afd732327e631d7e782743bab1fe1cab797dad84bcd9403accedcdb21f464278d05f0f
+  data.tar.gz: e68f011efaa3f0785d94c7a1f683a9986474dc887f3b99492b62ccdaf5f3ecb92387be39c909872a6f6448dfc6cb8dc1520de971557d8325cf725b3fe6853771

data/lib/davinci_dtr_test_kit/auth_groups/token_request_test.rb

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

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

@@ -0,0 +1,52 @@
+require 'base64'
+require_relative '../../urls'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRDinnerQuestionnairePackageRequestTest < Inferno::Test
+    include URLs
+
+    id :dtr_full_ehr_dinner_questionnaire_package_request
+    title 'Invoke the DTR Questionnaire Package operation'
+    description %(
+      Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
+      send a response.
+    )
+
+    input :access_token,
+          description: %(
+            `Bearer` token that the client under test will send in the
+            `Authorization` header of each HTTP request to Inferno. Inferno
+            will look for this value to associate requests with this session.
+          )
+
+    run do
+      wait(
+        identifier: access_token,
+        message: %(
+          ### Questionnaire Package
+
+          Inferno will wait for the Full EHR to invoke the DTR Questionnaire Package operation by sending a POST
+          request to
+
+          `#{questionnaire_package_url}`
+
+          A questionnaire package generated by Inferno will be returned.
+
+          ### Request Identification
+
+          In order to identify requests for this session, Inferno will look for
+          an `Authorization` header with value:
+
+          ```
+          Bearer #{access_token}
+          ```
+
+          ### Continuing the Tests
+
+          When the DTR application has finished loading the Questionnaire
+          [Click here](#{resume_pass_url}?token=#{access_token}) to continue.
+        )
+      )
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require_relative '../../dtr_questionnaire_response_validation'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRDinnerStaticQuestionnaireResponseConformanceTest < Inferno::Test
+    include DTRQuestionnaireResponseValidation
+
+    id :dtr_full_ehr_dinner_static_questionnaire_response_conformance
+    title 'QuestionnaireResponse is conformant'
+
+    run do
+      skip_if questionnaire_response.nil?, 'Completed QuestionnaireResponse input was blank'
+      verify_basic_conformance(questionnaire_response)
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require_relative '../../dtr_questionnaire_response_validation'
+
+module DaVinciDTRTestKit
+  class DTRFullEHRDinnerStaticQuestionnaireResponseCorrectnessTest < Inferno::Test
+    include DTRQuestionnaireResponseValidation
+
+    id :dtr_full_ehr_dinner_static_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.2 (First Name): `override`
+      - 3.1 (dinner choice): `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)
+      check_origin_sources(questionnaire.item, qr.item, expected_overrides: ['PBD.2'])
+      check_answer_presence(qr.item, link_ids: ['PBD.1', 'PBD.2', 'LOC.1'])
+      assert(messages.none? { |m| m[:type] == 'error' }, 'QuestionnaireResponse is not correct, see error message(s)')
+    end
+  end
+end

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,10 +2,10 @@ require 'base64'
 require_relative '../../urls'
 
 module DaVinciDTRTestKit
-  class DTRDinnerQuestionnairePackageRequestTest < Inferno::Test
+  class DTRSmartAppDinnerQuestionnairePackageRequestTest < Inferno::Test
     include URLs
 
-    id :dtr_dinner_questionnaire_package_request
+    id :dtr_smart_app_dinner_questionnaire_package_request
     title 'Invoke the DTR Questionnaire Package operation'
     description %(
       Inferno will wait for a DTR questionnaire package request from the client. Upon receipt, Inferno will generate and
@@ -49,7 +49,7 @@ module DaVinciDTRTestKit
             Resources available from the EHR needed to drive the dinner static workflow.
             Formatted as a FHIR bundle that contains resources, each with an `id` property populated. Each
             instance present will be available for retrieval from Inferno at the endpoint:
-            
+
             ```
             [fhir-base]/[resource type]/[instance id]
             ```
@@ -83,7 +83,7 @@ module DaVinciDTRTestKit
       launch_prompt = if smart_app_launch == 'ehr'
                         %(Launch the DTR SMART App from Inferno by right clicking
                           [this link](#{launch_uri}?iss=#{fhir_base_url}&launch=#{launch_uri})
-                          and selecting or "Open in new window" or "Open in new tab".)
+                          and selecting "Open in new window" or "Open in new tab".)
                       else
                         %(Launch the SMART App from your EHR.)
                       end
@@ -119,7 +119,7 @@ module DaVinciDTRTestKit
           an `Authorization` header with value:
 
           ```
-          Bearer eyJhbGcmOiJub25lIn0.#{example_client_jwt_payload_part}.
+          Bearer eyJhbGciOiJub25lIn0.#{example_client_jwt_payload_part}.
           ```
 
           ### Continuing the Tests

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,10 @@
 require_relative '../../urls'
+require_relative '../../dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
   class DTRQuestionnaireResponseBasicConformanceTest < Inferno::Test
     include URLs
+    include DTRQuestionnaireResponseValidation
 
     id :dtr_questionnaire_response_basic_conformance
     title 'QuestionnaireResponse is conformant'
@@ -16,13 +18,7 @@ module DaVinciDTRTestKit
       assert request.url == questionnaire_response_url,
              "Request made to wrong URL: #{request.url}. Should instead be to #{questionnaire_response_url}"
 
-      assert_valid_json(request.request_body)
-      questionnaire_response = FHIR.from_contents(request.request_body)
-      assert questionnaire_response.present?, 'Request does not contain a recognized FHIR object'
-      assert_resource_type(:questionnaire_response, resource: questionnaire_response)
-
-      assert_valid_resource(resource: questionnaire_response,
-                            profile_url: 'http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-questionnaireresponse')
+      verify_basic_conformance(request.request_body)
     end
   end
 end

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative '../../dtr_questionnaire_response_validation'
+require_relative '../../fixtures'
 
 module DaVinciDTRTestKit
   class DTRQuestionnaireResponsePrePopulationTest < Inferno::Test
@@ -21,11 +24,12 @@ module DaVinciDTRTestKit
     )
 
     run do
-      assert_valid_json(request.request_body)
-      questionnaire_response = FHIR.from_contents(request.request_body)
-      skip_if !questionnaire_response.present?, 'QuestionnaireResponse not received'
-
-      validate_questionnaire_pre_population(questionnaire_response, id)
+      questionnaire_response_json = request.request_body
+      check_is_questionnaire_response(questionnaire_response_json)
+      questionnaire_response = FHIR.from_contents(questionnaire_response_json)
+      questionnaire = Fixtures.questionnaire_for_test(id)
+      response_template = Fixtures.questionnaire_response_for_test(id)
+      validate_questionnaire_pre_population(questionnaire, response_template, questionnaire_response)
     end
   end
 end