davinci_pas_test_kit 0.15.2 → 0.16.0

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/pas_client_inquire_response_must_support_group.rb

@@ -5,8 +5,6 @@ require_relative 'requestor/client_inquire_response_must_support_requestor_test'
 require_relative 'beneficiary/client_inquire_response_must_support_beneficiary_test'
 require_relative 'practitioner/client_inquire_response_must_support_practitioner_test'
 require_relative 'practitioner_role/client_inquire_response_must_support_practitioner_role_test'
-require_relative 'task/client_inquire_response_must_support_task_test'
-require_relative '../../v2.2.1/workflows/pas_client_response_attest'
 
 module DaVinciPASTestKit
   module DaVinciPASV221
@@ -14,12 +12,9 @@ module DaVinciPASTestKit
       id :pas_client_v221_inquire_response_must_support
       title '$inquire Response Must Support Coverage'
       description %(
-        Check that `$inquire` responses provided to the client contain
+        Check that `$inquire` responses provided to the PAS client contain
         all PAS-defined profiles and their must support elements.
         
-        **USER INPUT VALIDATION**: These tests validate responses provided by the tester,
-        not the system under test. Errors will be treated as skips instead of failures.
-        
         For `$inquire` responses, this includes the following profiles:
         
         - [PAS Inquiry Response Bundle](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-pas-inquiry-response-bundle.html)
@@ -29,7 +24,6 @@ module DaVinciPASTestKit
         - [PAS Beneficiary Patient](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-beneficiary.html)
         - [PAS Practitioner](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-practitioner.html)
         - [PAS PractitionerRole](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-practitionerrole.html)
-        - [PAS Task](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-task.html)
         
         
         
@@ -37,42 +31,26 @@ module DaVinciPASTestKit
       run_as_group
 
       test from: :pas_client_v221_inquire_response_must_support_pas_inquiry_response_bundle do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_claiminquiryresponse do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-7'
+        verifies_requirements(*verifies_requirements, 'hl7.fhir.us.davinci-pas_2.2.1@conf-7')
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_insurer do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_requestor do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_beneficiary do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_practitioner do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_inquire_response_must_support_practitioner_role do
-        optional
-      end
-      test from: :pas_client_v221_inquire_response_must_support_task do
-        optional
-      end
-      test from: :pas_client_v221_response_attest,
-           title: 'PAS client handled the $inquire response must support elements',
-           description: %(
-             This test provides the tester an opportunity to verify that their client
-             correctly processed and used the must support elements present in the
-             $inquire responses received from Inferno during these tests.
-           ),
-           config: { options: {
-             workflow_tag: MUST_SUPPORT_WORKFLOW_TAG,
-             attest_message: "I attest that the client system correctly processed the must support elements " \
-                             "contained in the $inquire responses received from Inferno and did not error."
-           } } do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-8'
+        simulation_verification
       end
     end
   end

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/pas_client_submit_must_support_group.rb

@@ -7,7 +7,7 @@ module DaVinciPASTestKit
       id :pas_client_v221_submit_must_support
       title '$submit Request Must Support Coverage'
       description %(
-        Check that the client can demonstrate `$submit` requests that contain
+        Check that the PAS client demonstrated `$submit` requests that contain
         all PAS-defined profiles and their must support elements.
         
         For `$submit` requests, this includes the following profiles:
@@ -33,8 +33,8 @@ module DaVinciPASTestKit
       )
       run_as_group
       
-      # At least one of the PAS request profiles must be present; unobserved must support
-      # elements on the request profiles that are present may be attested as not collected.
+      # At least one of the PAS request profiles must be present, with all of its must support
+      # elements observed.
       test from: :pas_client_v221_must_support_with_attestation_option do
         id :pas_client_v221_submit_request_profiles_must_support_with_attestation_option
         title 'At least one instance of a request profile (PAS Medication Request, PAS Service Request, PAS Device Request, or PAS Nutrition Order) is observed with all of its must support elements'
@@ -49,17 +49,19 @@ module DaVinciPASTestKit
             ],
             ig_version: 'v2.2.1',
             type: 'request',
-            operation: 'submit'
+            operation: 'submit',
+            disable_attestation: true
           }
         )
         description MustSupportWithAttestationOption.build_description(config.options)
+        verifies_requirements(*verifies_requirements, 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-1')
       end
 
       # Mandatory - the PAS Claim Update profile must always be demonstrated.
-      test from: :pas_client_v221_submit_request_must_support_claim_update
-
-      # All other submit request profiles - unobserved must support elements may be
-      # attested as not collected by the client system.
+      test from: :pas_client_v221_submit_request_must_support_claim_update do
+        verifies_requirements(*verifies_requirements, 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-1')
+      end
+      # All other submit request profiles - all must support elements must be observed.
       test from: :pas_client_v221_must_support_with_attestation_option do
         id :pas_client_v221_submit_request_other_must_support_with_attestation_option
         title 'All must support elements for other profiles referenced by Claim submissions are observed on $submit requests'
@@ -79,10 +81,12 @@ module DaVinciPASTestKit
             ],
             ig_version: 'v2.2.1',
             type: 'request',
-            operation: 'submit'
+            operation: 'submit',
+            disable_attestation: true
           }
         )
         description MustSupportWithAttestationOption.build_description(config.options)
+        verifies_requirements(*verifies_requirements, 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-1')
       end
     end
   end

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/pas_client_submit_response_must_support_group.rb

@@ -6,8 +6,6 @@ require_relative 'requestor/client_submit_response_must_support_requestor_test'
 require_relative 'beneficiary/client_submit_response_must_support_beneficiary_test'
 require_relative 'practitioner/client_submit_response_must_support_practitioner_test'
 require_relative 'practitioner_role/client_submit_response_must_support_practitioner_role_test'
-require_relative 'task/client_submit_response_must_support_task_test'
-require_relative '../../v2.2.1/workflows/pas_client_response_attest'
 
 module DaVinciPASTestKit
   module DaVinciPASV221
@@ -15,12 +13,9 @@ module DaVinciPASTestKit
       id :pas_client_v221_submit_response_must_support
       title '$submit Response Must Support Coverage'
       description %(
-        Check that `$submit` responses provided to the client contain
+        Check that `$submit` responses provided to the PAS client contain
         all PAS-defined profiles and their must support elements.
         
-        **USER INPUT VALIDATION**: These tests validate responses provided by the tester,
-        not the system under test. Errors will be treated as skips instead of failures.
-        
         For `$submit` responses, this includes the following profiles:
         
         - [PAS Response Bundle](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-pas-response-bundle.html)
@@ -31,7 +26,6 @@ module DaVinciPASTestKit
         - [PAS Beneficiary Patient](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-beneficiary.html)
         - [PAS Practitioner](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-practitioner.html)
         - [PAS PractitionerRole](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-practitionerrole.html)
-        - [PAS Task](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-task.html)
         
         
         
@@ -39,45 +33,29 @@ module DaVinciPASTestKit
       run_as_group
 
       test from: :pas_client_v221_submit_response_must_support_pas_response_bundle do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_claimresponse do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-7'
+        verifies_requirements(*verifies_requirements, 'hl7.fhir.us.davinci-pas_2.2.1@conf-7')
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_communication_request do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_insurer do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_requestor do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_beneficiary do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_practitioner do
-        optional
+        simulation_verification
       end
       test from: :pas_client_v221_submit_response_must_support_practitioner_role do
-        optional
-      end
-      test from: :pas_client_v221_submit_response_must_support_task do
-        optional
-      end
-      test from: :pas_client_v221_response_attest,
-           title: 'PAS client handled the $submit response must support elements',
-           description: %(
-             This test provides the tester an opportunity to verify that their client
-             correctly processed and used the must support elements present in the
-             $submit responses received from Inferno during these tests.
-           ),
-           config: { options: {
-             workflow_tag: MUST_SUPPORT_WORKFLOW_TAG,
-             attest_message: "I attest that the client system correctly processed the must support elements " \
-                             "contained in the $submit responses received from Inferno and did not error."
-           } } do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-8'
+        simulation_verification
       end
     end
   end

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/pas_inquiry_response_bundle/client_inquire_response_must_support_pas_inquiry_response_bundle_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Inquiry Response Bundle are observed on $inquire responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$inquire`
         responses, including instances of the PAS Inquiry Response Bundle Profile.
         This test checks all identified instances of the PAS Inquiry Response Bundle
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Bundle.entry
@@ -22,6 +22,7 @@ module DaVinciPASTestKit
         * Bundle.entry:ClaimResponse.resource
         * Bundle.timestamp
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/pas_response_bundle/client_submit_response_must_support_pas_response_bundle_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Response Bundle are observed on $submit responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$submit`
         responses, including instances of the PAS Response Bundle Profile.
         This test checks all identified instances of the PAS Response Bundle
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Bundle.entry
@@ -23,6 +23,7 @@ module DaVinciPASTestKit
         * Bundle.identifier
         * Bundle.timestamp
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/practitioner/client_inquire_response_must_support_practitioner_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Practitioner are observed on $inquire responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$inquire`
         responses, including instances of the PAS Practitioner Profile.
         This test checks all identified instances of the PAS Practitioner
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Practitioner.address
@@ -28,6 +28,7 @@ module DaVinciPASTestKit
         * Practitioner.telecom.system
         * Practitioner.telecom.value
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/practitioner/client_submit_response_must_support_practitioner_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Practitioner are observed on $submit responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$submit`
         responses, including instances of the PAS Practitioner Profile.
         This test checks all identified instances of the PAS Practitioner
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Practitioner.address
@@ -28,6 +28,7 @@ module DaVinciPASTestKit
         * Practitioner.telecom.system
         * Practitioner.telecom.value
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/practitioner_role/client_inquire_response_must_support_practitioner_role_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS PractitionerRole are observed on $inquire responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$inquire`
         responses, including instances of the PAS PractitionerRole Profile.
         This test checks all identified instances of the PAS PractitionerRole
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * PractitionerRole.code
@@ -24,6 +24,7 @@ module DaVinciPASTestKit
         * PractitionerRole.telecom.system
         * PractitionerRole.telecom.value
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/practitioner_role/client_submit_response_must_support_practitioner_role_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS PractitionerRole are observed on $submit responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$submit`
         responses, including instances of the PAS PractitionerRole Profile.
         This test checks all identified instances of the PAS PractitionerRole
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * PractitionerRole.code
@@ -24,6 +24,7 @@ module DaVinciPASTestKit
         * PractitionerRole.telecom.system
         * PractitionerRole.telecom.value
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/requestor/client_inquire_response_must_support_requestor_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Requestor Organization are observed on $inquire responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$inquire`
         responses, including instances of the PAS Requestor Organization Profile.
         This test checks all identified instances of the PAS Requestor Organization
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Organization.active
@@ -34,6 +34,7 @@ module DaVinciPASTestKit
         * Organization.telecom.value
         * Organization.type
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/generated/v2.2.1/requestor/client_submit_response_must_support_requestor_test.rb

@@ -7,11 +7,11 @@ module DaVinciPASTestKit
       title 'All must support elements for profile PAS Requestor Organization are observed on $submit responses'
       description %(
         
-        PAS client systems are required to be able to receive all
-        must support elements on instances of all profiles included in 
+        PAS clients are required to be able to receive all
+        must support elements on instances of all profiles included in `$submit`
         responses, including instances of the PAS Requestor Organization Profile.
         This test checks all identified instances of the PAS Requestor Organization
-        Profile on responses sent to the client to ensure that the following
+        Profile on responses sent to the PAS client to ensure that the following
         must support elements are observed:
 
         * Organization.active
@@ -34,6 +34,7 @@ module DaVinciPASTestKit
         * Organization.telecom.value
         * Organization.type
       )
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2'
 
       config(
         options: {

data/lib/davinci_pas_test_kit/client/jobs/send_pas_subscription_notification.rb

@@ -20,8 +20,18 @@ module DaVinciPASTestKit
 
       sidekiq_options retry: false
 
+      # How long an Inferno test that starts this job waits for it to send the notification. The job polls for
+      # the test to start waiting for up to this long, since there is no point sending once the wait has timed out.
+      TEST_WAIT_TIMEOUT_SECONDS = 300
+      TEST_WAITING_POLL_INTERVAL_SECONDS = 0.5
+
+      # test_run_id and result_id may be nil when the job is started by an Inferno test, which does not know
+      # them until it is waiting. They are then looked up from the test session once the test waits.
+      # When resume_test_after_notification is true, the job ends the wait with the resume_token after
+      # sending the notification (or fails it if the job errors).
+      # Sidekiq job arguments are positional, so the boolean cannot be a keyword argument
       def perform(test_run_id, test_session_id, result_id, notification_bearer_token, notification_json, resume_token,
-                  notification_suite_id, ig_version = 'v2.0.1')
+                  notification_suite_id, ig_version = 'v2.0.1', resume_test_after_notification = false) # rubocop:disable Style/OptionalBooleanParameter
         @test_run_id = test_run_id
         @test_session_id = test_session_id
         @result_id = result_id
@@ -30,8 +40,17 @@ module DaVinciPASTestKit
         @resume_token = resume_token
         @notification_suite_id = notification_suite_id
         @ig_version = ig_version
+        @resume_test_after_notification = resume_test_after_notification
 
         await_subscription_creation # NOTE: currently must exist - see PASClientPendedSubmitTest
+        if @result_id.nil? && !test_starts_waiting?
+          # the test can't be resumed because it isn't waiting, so just explain why no notification was sent
+          Inferno::Application['logger'].error(
+            "Subscription notification not sent: no test started waiting on '#{@resume_token}' " \
+            "within #{TEST_WAIT_TIMEOUT_SECONDS} seconds."
+          )
+          return
+        end
         sleep 1
         return unless test_still_waiting?
 
@@ -39,6 +58,12 @@ module DaVinciPASTestKit
         return unless test_still_waiting?
 
         send_event_notification
+        resume_test(RESUME_PASS_PATH) if @resume_test_after_notification
+      rescue StandardError => e
+        raise unless @resume_test_after_notification
+
+        Inferno::Application['logger'].error("Sending the subscription notification failed: #{e.message}")
+        resume_test(RESUME_FAIL_PATH)
       end
 
       def requests_repo
@@ -94,8 +119,44 @@ module DaVinciPASTestKit
         @subscription_full_url ||= "#{fhir_subscription_url}/#{subscription.id}"
       end
 
+      def test_runs_repo
+        @test_runs_repo ||= Inferno::Repositories::TestRuns.new
+      end
+
+      # @resume_token is the same identifier the test's own wait() call registers (and that
+      # resume_test later ends the wait with), so this is an exact match on the waiting test
+      # run - not a guess at "the most recent run for this session", which could pick up an
+      # unrelated run if the tester has more than one for the same session.
+      def test_run_id
+        @test_run_id ||= test_runs_repo.find_latest_waiting_by_identifier(@resume_token)&.id
+      end
+
+      def waiting_result
+        results_repo.find_waiting_result(test_run_id:)
+      end
+
+      def result_id
+        @result_id ||= waiting_result&.id
+      end
+
       def test_still_waiting?
-        results_repo.find_waiting_result(test_run_id: @test_run_id)
+        waiting_result.present?
+      end
+
+      # Inferno tests start the job before they begin waiting, so poll until the test is waiting, giving up
+      # once the test's own wait would have timed out.
+      # @return [Boolean] whether the test is waiting
+      def test_starts_waiting?
+        (TEST_WAIT_TIMEOUT_SECONDS / TEST_WAITING_POLL_INTERVAL_SECONDS).to_i.times do
+          return true if test_still_waiting?
+
+          sleep TEST_WAITING_POLL_INTERVAL_SECONDS
+        end
+        test_still_waiting?
+      end
+
+      def resume_test(path)
+        test_suite_connection.get(path.delete_prefix('/'), { token: @resume_token })
       end
 
       def await_subscription_creation
@@ -130,7 +191,7 @@ module DaVinciPASTestKit
           request_body: response.env.request_body,
           response_body: response.env.response_body,
           test_session_id: @test_session_id,
-          result_id: @result_id,
+          result_id:,
           request_headers: inferno_request_headers,
           response_headers: inferno_response_headers,
           tags:

data/lib/davinci_pas_test_kit/client/pas_client_subscription_pas_conformance_test.rb

@@ -9,14 +9,15 @@ module DaVinciPASTestKit
     id :pas_client_subscription_pas_conformance_test
     title 'Subscription creation request has the correct structure and content'
     description %(
-      This test verifies that the Subscription created by the client under test
+      This test verifies that the Subscription created by the PAS client
       is conformant to PAS requirements on the Subscription, including
       - The use of the [PAS-defined Subscription
         Topic](https://hl7.org/fhir/us/davinci-pas/STU2/SubscriptionTopic-PASSubscriptionTopic.html), and
-      - Inclusion of filter criteria for the client's organization.
+      - Inclusion of filter criteria for the PAS client's organization.
     )
 
-    verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@spec-62'
+    verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@spec-62', 'hl7.fhir.uv.subscriptions_1.1.0@64',
+                          'hl7.fhir.uv.subscriptions_1.1.0@96', 'hl7.fhir.uv.subscriptions_1.1.0@116'
 
     def ig_version
       config.options[:ig_version]

data/lib/davinci_pas_test_kit/client/registration/abstract_configuration_other_display_test.rb

@@ -3,9 +3,11 @@ module DaVinciPASTestKit
     id :pas_client_reg_config_other_display
     title 'PAS client registers Inferno as a PAS server'
     description %(
-      This test provides all the information needed for testers to configure
-      the client under test to communicate with Inferno's simulated PAS server
-      using dedicated endpoints.
+      During this test, Inferno will wait while the tester configures the PAS client
+      to communicate with Inferno's simulated PAS server using dedicated
+      endpoints. The "User Action Required" dialog that appears during the test
+      will provide all the information needed for testers to configure the PAS client,
+      including the FHIR base URL.
     )
     attestation
 
@@ -37,7 +39,7 @@ module DaVinciPASTestKit
           FHIR Base URL: `#{session_fhir_base_url(wait_identifier)}`
 
           [Click here](#{confirmation_url}) once you have configured
-          the client to connect to Inferno at the above endpoints.
+          the PAS client to send PAS requests to Inferno at the above endpoint.
         )
       )
     end

data/lib/davinci_pas_test_kit/client/registration/abstract_configuration_smart_display_test.rb

@@ -3,9 +3,12 @@ module DaVinciPASTestKit
     id :pas_client_reg_config_smart_display
     title 'PAS client registers Inferno as a PAS server'
     description %(
-      This test provides all the information needed for testers to configure
-      the client under test to communicate with Inferno's simulated PAS server
-      including SMART endpoints to obtain access tokens.
+      During this test, Inferno will wait while the tester configures the PAS client
+      to communicate with Inferno's simulated PAS server using
+      endpoints authenticated using SMART Backend Services. The "User Action Required"
+      dialog that appears during the test will provide all the information needed
+      for testers to configure the PAS client, including the FHIR base URL, the
+      token endpoint, and the PAS client's assigned client id.
     )
     attestation
 
@@ -29,7 +32,8 @@ module DaVinciPASTestKit
           - Token endpoint: `#{token_url}`
 
           [Click here](#{confirmation_url}) once you have configured
-          the client to connect to Inferno at the above endpoints.
+          the PAS client to authenticate with Inferno and send PAS requests
+          to Inferno at the above endpoint.
         )
       )
     end

data/lib/davinci_pas_test_kit/client/registration/abstract_configuration_udap_display_test.rb

@@ -3,9 +3,13 @@ module DaVinciPASTestKit
     id :pas_client_reg_config_udap_display
     title 'PAS client registers Inferno as a PAS server'
     description %(
-      This test provides all the information needed for testers to configure
-      the client under test to communicate with Inferno's simulated PAS server
-      including UDAP endpoints to obtain access tokens.
+      During this test, Inferno will wait while the tester configures the PAS client
+      to communicate with Inferno's simulated PAS server using
+      endpoints authenticated using the UDAP Client Credentials flow.
+      The "User Action Required" dialog that appears during the test will provide
+      all the information needed for testers to configure the PAS client,
+      including the FHIR base URL, the token endpoint, and the
+      assigned client id.
     )
     attestation
 
@@ -29,7 +33,8 @@ module DaVinciPASTestKit
           - Token endpoint: `#{token_url}`
 
           [Click here](#{confirmation_url}) once you have configured
-          the client to connect to Inferno at the above endpoints.
+          the PAS client to authenticate with Inferno and send PAS requests
+          to Inferno at the above endpoint.
         )
       )
     end

data/lib/davinci_pas_test_kit/client/registration/abstract_other_auth_attest_test.rb

@@ -3,8 +3,8 @@ module DaVinciPASTestKit
     id :pas_client_reg_other_auth_attest
     title 'PAS client supports a non-standard approach for authenticating with the PAS server'
     description %(
-      Since a standard auth approach was not chosen for this session, this test provides testers with an
-      opportunity to attest to their client's ability to authenticate itself to a server
+      Since a standard auth approach was not chosen for this session, this test asks testers
+      to attest to the PAS client's ability to authenticate itself to a server
       using a method that this Inferno test suite does not support, such as mutual authentication
       TLS.
     )
@@ -14,7 +14,8 @@ module DaVinciPASTestKit
     output :attest_false_url
 
     run do
-      identifier = test_session_id
+      # only the tester continues this wait, so use a fresh random identifier - see SessionIdentification
+      identifier = SecureRandom.uuid
       attest_true_url = "#{resume_pass_url}?token=#{identifier}"
       output(attest_true_url:)
       attest_false_url = "#{resume_fail_url}?token=#{identifier}"
@@ -25,7 +26,7 @@ module DaVinciPASTestKit
         message: %(
           **Other Authentication Attestation**:
 
-          I attest that the client system can authenticate itself with a PAS server using
+          I attest that the PAS client can authenticate itself with a PAS server using
           a mechanism other than the SMART Backend Services or UDAP B2B client credentials
           flows.