davinci_pas_test_kit 0.15.2 → 0.16.0

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_must_support_group.rb

@@ -7,90 +7,86 @@ require_relative 'workflows/pas_client_request_bundle_validation_test'
 require_relative 'workflows/pas_client_response_bundle_validation_test'
 require_relative 'workflows/pas_client_inquire_request_bundle_validation_test'
 require_relative 'workflows/pas_client_inquire_response_bundle_validation_test'
+require_relative '../client_input_descriptions'
 
 module DaVinciPASTestKit
   module DaVinciPASV221
     class PASClientMustSupportGroup < Inferno::TestGroup
       id :pas_client_v221_must_support
       title 'Must Support Elements'
-      run_as_group
-      description %(
-        During these tests, the client will show that it supports all PAS-defined profiles and the must support
-        elements defined in them. This includes
+      description "#{DaVinciPASTestKit.must_support_group_description('v2.2.1', 'da-vinci-pas-v221')}\n" \
+                  "#{MUST_SUPPORT_SEPARATE_GROUPS_DESCRIPTION}"
 
-        - The ability to make prior authorization submission and inquiry requests that contain all
-          PAS-defined profiles and their must support elements.
-        - The ability to receive in responses to those requests all PAS-defined profiles and their
-          must support elements.
+      MUST_SUPPORT_INPUT_ORDER = [:ms_submit_responses, :ms_inquire_responses, :client_id, :session_url_path].freeze
 
-        Clients under test will be asked to make additional requests to Inferno demonstrating coverage
-        of all must support items in the requests. Clients must also demonstrate that they can handle
-        all response must support elements. Because Inferno's mocked responses do not include all must
-        support elements, testers will need to provide responses that include examples of all must
-        support elements for Inferno to respond with.
-
-        Note that Inferno will consider requests made during the workflow group of tests, so only
-        profiles and must support elements not demonstrated during those tests need to be submitted
-        as a part of these.
-      )
+      input_order(*MUST_SUPPORT_INPUT_ORDER)
 
       # Combined receive group - single wait test for both submit and inquire
       group do
         id :pas_client_v221_must_support_receive
-        title 'Demonstrate Must Support Coverage'
-        description %(
-          Submit $submit and $inquire requests demonstrating coverage of must support elements.
-          Optionally, provide response bundles for Inferno to use when responding. Inferno will
-          verify both the requests received and the responses provided.
-        )
+        title MUST_SUPPORT_RECEIVE_GROUP_TITLE
+        description MUST_SUPPORT_RECEIVE_GROUP_DESCRIPTION
         run_as_group
 
-        test from: :pas_client_v221_gather_must_support
-      end
+        # The must support response inputs already belong to pas_client_v221_gather_must_support
+        # (the wait test below); declaring them here too, before the tests are defined, propagates
+        # them onto the bundle validation tests as well, so they can tell whether a tester-provided
+        # response was used - see PasClientResponseBundleValidationTest/PasClientInquireResponseBundleValidationTest
+        # #failed_entities_description. They are declared on this group rather than the parent so they
+        # do not also propagate onto the coverage group, which does not use them.
+        input :ms_submit_responses, optional: true
+        input :ms_inquire_responses, optional: true
 
-      # $submit Bundle Conformance Validation
-      group do
-        title '$submit Bundle Conformance'
-        description %(
-          Verify that the $submit request bundles sent by the client are conformant
-          and that the $submit response bundles provided for Inferno to send back
-          are conformant.
-        )
-        run_as_group
+        input_order(*MUST_SUPPORT_INPUT_ORDER)
+
+        test from: :pas_client_v221_gather_must_support
+        test from: :pas_client_v221_response_attest,
+             id: :pas_client_v221_response_attest_ms_submit_inquire,
+             title: MUST_SUPPORT_SUBMIT_INQUIRE_ATTEST_TITLE,
+             description: MUST_SUPPORT_SUBMIT_INQUIRE_ATTEST_DESCRIPTION,
+             config: { options: {
+               workflow_tag: MUST_SUPPORT_WORKFLOW_TAG,
+               no_requests_ok: true,
+               multiple_requests_ok: true,
+               attest_message: MUST_SUPPORT_SUBMIT_INQUIRE_ATTEST_MESSAGE
+             } } do
+          verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-8'
+        end
 
         test from: :pas_client_v221_request_bundle_validation_test,
-             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG } }
+             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG, no_requests_ok: true,
+                                  multiple_requests_ok: true } }
         test from: :pas_client_v221_response_bundle_validation_test,
-             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG } }
+             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG, no_requests_ok: true,
+                                  multiple_requests_ok: true } }
+        test from: :pas_client_v221_inquire_request_bundle_validation_test,
+             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG, no_requests_ok: true,
+                                  multiple_requests_ok: true } }
+        test from: :pas_client_v221_inquire_response_bundle_validation_test,
+             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG, no_requests_ok: true,
+                                  multiple_requests_ok: true } }
       end
 
-      # $submit Request Must Support (fail when errors detected)
-      group from: :pas_client_v221_submit_must_support
-
-      # $submit Response Must Support (skip when errors detected)
-      group from: :pas_client_v221_submit_response_must_support
-
-      # $inquire Bundle Conformance Validation
+      # Kept separate from the receive group so the analysis can be re-run without re-running the receive
+      # group, which would discard the requests made during its previous run
       group do
-        title '$inquire Bundle Conformance'
-        description %(
-          Verify that the $inquire request bundles sent by the client are conformant
-          and that the $inquire response bundles provided for Inferno to send back
-          are conformant.
-        )
+        id :pas_client_v221_must_support_coverage
+        title MUST_SUPPORT_COVERAGE_GROUP_TITLE
+        description MUST_SUPPORT_COVERAGE_GROUP_DESCRIPTION
         run_as_group
 
-        test from: :pas_client_v221_inquire_request_bundle_validation_test,
-             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG } }
-        test from: :pas_client_v221_inquire_response_bundle_validation_test,
-             config: { options: { workflow_tag: MUST_SUPPORT_WORKFLOW_TAG } }
-      end
+        # $submit Request Must Support (fail when errors detected)
+        group from: :pas_client_v221_submit_must_support
 
-      # $inquire Request Must Support (fail when errors detected)
-      group from: :pas_client_v221_inquire_must_support
+        # $submit Response Must Support (skip when errors detected)
+        group from: :pas_client_v221_submit_response_must_support
 
-      # $inquire Response Must Support (skip when errors detected)
-      group from: :pas_client_v221_inquire_response_must_support
+        # $inquire Request Must Support (fail when errors detected)
+        group from: :pas_client_v221_inquire_must_support
+
+        # $inquire Response Must Support (skip when errors detected)
+        group from: :pas_client_v221_inquire_response_must_support
+      end
     end
   end
 end

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_operation_failure_group.rb

@@ -9,8 +9,8 @@ module DaVinciPASTestKit
       id :pas_client_v221_operation_failure_group
       title 'Operation Failure'
       description %(
-        During these tests, the client will initiate a prior authorization
-        request and show it can respond appropriately to an operation failure response —
+        During these tests, the PAS client will initiate a prior authorization
+        request and show it can react appropriately to an operation failure response —
         a non-2XX HTTP status code accompanied by an OperationOutcome resource.
       )
       run_as_group
@@ -24,22 +24,25 @@ module DaVinciPASTestKit
                   :session_url_path
 
       test from: :pas_client_v221_operation_failure_submit_test
-      test from: :pas_client_v221_operation_outcome_validation_test
       test from: :pas_client_v221_response_attest,
            title: 'PAS client handles the operation failure appropriately',
            description: %(
-             This test provides the tester an opportunity to observe their client following
+             During this test, the tester will observe the PAS client following
              the receipt of the operation failure response and attest that the error details
              from the OperationOutcome were made available to the appropriate users (e.g.,
              technical staff, not the clinical end user).
            ),
            config: { options: {
              workflow_tag: OPERATION_FAILURE_WORKFLOW_TAG,
-             attest_message: 'I attest that the client system handles the operation failure response ' \
+             operation_tag: SUBMIT_TAG,
+             error_status_expected: true,
+             attest_message: 'I attest that the PAS client did not error when receiving the operation ' \
+                             'failure response and handles it ' \
                              'appropriately: the OperationOutcome details are available to technical staff ' \
                              'for review and the clinical end user is informed that the submission could ' \
                              'not be processed.'
            } }
+      test from: :pas_client_v221_operation_outcome_validation_test
     end
   end
 end

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_pended_group.rb

@@ -1,4 +1,5 @@
 require_relative 'workflows/pas_client_pended_submit_test'
+require_relative 'workflows/pas_client_pended_send_notification_test'
 require_relative 'workflows/pas_client_response_attest'
 require_relative 'workflows/pas_client_response_bundle_validation_test'
 require_relative 'workflows/pas_client_request_bundle_validation_test'
@@ -12,65 +13,89 @@ module DaVinciPASTestKit
       include UserInputResponse
 
       id :pas_client_v221_pended_group
-      title 'Pended Workflow'
+      title 'Pended Response'
       description %(
-        During these tests, the client will initiate a prior authorization
-        request and show it can respond appropriately to a 'pended' decision, including
+        During these tests, the PAS client will initiate a prior authorization
+        request and show it can react appropriately to a 'pended' decision, including
         waiting for a full-resource notification that contains the final decision.
-        In v2.2.1, the notification includes all details so no follow-up `$inquire`
-        request is needed.
+        In PAS v2.2.1, the notification includes all details so no follow-up `$inquire`
+        request is needed and Inferno does not currently accept them during this group.
       )
       run_as_group
 
       input :pended_json_response, optional: true
 
       input_order :pended_json_response,
+                  :notification_bundle,
+                  :client_endpoint_access_token,
                   :client_id,
                   :session_url_path
 
       group do
-        title 'Interaction'
+        title 'Interaction and Response Handling'
         description %(
-          All interactions for the pended prior authorization request workflow
-          between Inferno and the client under test will be performed during this test
+          All interactions for the pended prior authorization request scenario
+          between Inferno and the PAS client will be performed during this group
           including
-          - A `$submit` request from the client to Inferno where Inferno returns a pended response.
+          - A `$submit` request from the PAS client to Inferno where Inferno returns a pended response.
           - A full-resource notification that the prior authorization decision has been finalized
-            from Inferno to the client under test.
+            from Inferno to the PAS client.
+
+          In between these requests, testers will confirm that the PAS client registers
+          the request as pended and that it is updated with the final response
+          after the notification is received.
         )
 
         test from: :pas_client_v221_pended_submit_test
-      end
-
-      group do
-        title '$submit Conformance and Handling'
-
-        test from: :pas_client_v221_request_bundle_validation_test,
-             config: { options: { workflow_tag: PENDED_WORKFLOW_TAG } }
-        test from: :pas_client_v221_response_bundle_validation_test,
-             config: { options: { workflow_tag: PENDED_WORKFLOW_TAG } }
         test from: :pas_client_v221_response_attest,
+             id: :pas_client_v221_pended_response_attest,
              title: 'PAS client displays the request as "pended"',
              description: %(
-              This test provides the tester an opportunity to observe their client following
+              During this test, the tester will observe the PAS client following
               the receipt of the pended response and attest that users are able to determine
               that the response has been pended and a decision will be forthcoming.
              ),
              config: { options: {
                workflow_tag: PENDED_WORKFLOW_TAG,
-               attest_message: "I attest that following the receipt of the 'pended' response to the submitted " \
-                               'claim, the client system indicates to users that a final decision on request ' \
-                               'has not yet been made.'
+               operation_tag: SUBMIT_TAG,
+               attest_message: 'I attest that the PAS client did not error when handling the `$submit` ' \
+                               "response and displays the submitted claim as 'pended' meaning " \
+                               'that a final decision on prior authorization of the service has not been made.'
+             } }
+        test from: :pas_client_v221_pended_notify_and_attest_finalized_test
+        test from: :pas_client_v221_response_attest,
+             id: :pas_client_v221_pended_finalized_response_attest,
+             title: 'PAS client displays the final decision as "approved"',
+             description: %(
+              During this test, the tester will observe the PAS client following
+              the receipt of the full-resource notification containing the approved final decision
+              and attest that users are able to determine that the request has been approved.
+             ),
+             config: { options: {
+               workflow_tag: PENDED_WORKFLOW_TAG,
+               request_tags: [REST_HOOK_EVENT_NOTIFICATION_TAG],
+               attest_message: 'I attest that the PAS client did not error when handling the notification ' \
+                               "and displays the submitted claim as 'approved' meaning that the " \
+                               'user can proceed with ordering or providing the requested service.'
              } }
       end
 
       group do
-        title 'Notification Conformance and Handling'
+        title '$submit Conformance'
+
+        test from: :pas_client_v221_request_bundle_validation_test,
+             config: { options: { workflow_tag: PENDED_WORKFLOW_TAG } }
+        test from: :pas_client_v221_response_bundle_validation_test,
+             config: { options: { workflow_tag: PENDED_WORKFLOW_TAG } }
+      end
+
+      group do
+        title 'Notification Conformance'
 
         test from: :subscriptions_r4_client_notification_input_verification,
              title: 'Inferno\'s event notification Bundle is conformant',
              description: %(
-               This test checks that the notification Bundle sent to the client, which will be either
+               This test checks that the notification Bundle sent to the PAS client, which will be either
                the tester-provided notification Bundle in the **Claim updated notification JSON** input
                or mocked by Inferno based on details in the Subscription and submitted Claim, is conformant
                to Subscription Backport IG requirements.
@@ -84,10 +109,10 @@ module DaVinciPASTestKit
         test from: :subscriptions_r4_client_notification_input_payload_verification,
              title: 'Inferno\'s event notification Bundle matches the Subscription',
              description: %(
-               This test checks that the notification Bundle sent to the client, which will be either
+               This test checks that the notification Bundle sent to the PAS client, which will be either
                the tester-provided notification Bundle in the **Claim updated notification JSON** input
                or mocked by Inferno based on details in the Subscription and submitted Claim, matches the details
-               requested in the Subscription provided during the **2.1** "PAS Subscription Setup" tests.
+               requested in the Subscription provided during the "Subscription Setup" tests.
              ),
              simulation_verification: true,
              config: {
@@ -101,24 +126,11 @@ module DaVinciPASTestKit
         test from: :subscriptions_r4_client_event_notification_verification,
              title: 'PAS client accepts the "claim updated" event notification',
              description: %(
-               This test checks that the client responds appropriately to the event notification request.
+               This test checks that the PAS client responds appropriately to the event notification request.
              ) do
                verifies_requirements(*SubscriptionsTestKit::SubscriptionsR5BackportR4Client::EventNotificationVerificationTest.verifies_requirements,
                                      'hl7.fhir.us.davinci-pas_2.2.1@spec-8')
              end
-        test from: :pas_client_v221_response_attest,
-             title: 'PAS client displays the final decision as "approved"',
-             description: %(
-              This test provides the tester an opportunity to observe their client following
-              the receipt of the full-resource notification containing the approved final decision
-              and attest that users are able to determine that the request has been approved.
-             ),
-             config: { options: {
-               workflow_tag: PENDED_WORKFLOW_TAG,
-               attest_message: "I attest that the client system displays the submitted claim as 'approved' based " \
-                               'on the full-resource notification, meaning that the user can proceed with ' \
-                               'ordering or providing the requested service.'
-             } }
       end
     end
   end

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_processing_error_group.rb

@@ -10,8 +10,8 @@ module DaVinciPASTestKit
       id :pas_client_v221_processing_error_group
       title 'Processing Errors'
       description %(
-        During these tests, the client will initiate a prior authorization
-        request and show it can respond appropriately to a response containing
+        During these tests, the PAS client will initiate a prior authorization
+        request and show it can react appropriately to a response containing
         one or more ClaimResponse.error entries.
       )
       run_as_group
@@ -23,22 +23,24 @@ module DaVinciPASTestKit
                   :session_url_path
 
       test from: :pas_client_v221_processing_error_submit_test
-      test from: :pas_client_v221_request_bundle_validation_test,
-           config: { options: { workflow_tag: PROCESSING_ERROR_WORKFLOW_TAG } }
-      test from: :pas_client_v221_processing_error_response_validation_test
       test from: :pas_client_v221_response_attest,
            title: 'PAS client handles the processing errors appropriately',
            description: %(
-             This test provides the tester an opportunity to observe their client following
+             During this test, the tester will observe the PAS client following
              the receipt of the response containing ClaimResponse.error entries and attest
              that the processing error details were made available to the appropriate users.
            ),
            config: { options: {
              workflow_tag: PROCESSING_ERROR_WORKFLOW_TAG,
-             attest_message: 'I attest that the client system handles the processing error response ' \
+             operation_tag: SUBMIT_TAG,
+             attest_message: 'I attest that the PAS client did not error when receiving the processing ' \
+                             'error response and handles it ' \
                              'appropriately: the ClaimResponse error details are surfaced to the ' \
                              'appropriate users so that corrective action can be taken.'
            } }
+      test from: :pas_client_v221_request_bundle_validation_test,
+           config: { options: { workflow_tag: PROCESSING_ERROR_WORKFLOW_TAG } }
+      test from: :pas_client_v221_processing_error_response_validation_test
     end
   end
 end

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_registration_group.rb

@@ -12,8 +12,8 @@ module DaVinciPASTestKit
       id :pas_client_v221_registration
       title 'Client Registration'
       description %(
-        Register the client under test with Inferno's simulated PAS Server,
-        including configuration of the system under test to make requests against
+        Register the PAS client with Inferno's simulated PAS Server,
+        including configuration necessary to make requests against
         Inferno's simulated PAS endpoints and enable authentication and authorization of PAS requests.
       )
       run_as_group

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_subscription_setup_group.rb

@@ -8,20 +8,25 @@ module DaVinciPASTestKit
       id :pas_client_v221_subscription_setup
       title 'Subscription Setup'
       description %(
-        These tests verify that the client can create a Subscription instance
-        that will tell the Payer how to notify the client when pended claims
+        These tests verify that the PAS client can create a Subscription instance
+        that will tell the Payer how to notify the PAS client when pended claims
         are updated.
       )
       run_as_group
 
+      input_order :client_endpoint_access_token
+
       test from: :pas_client_v221_subscription_create_test
+      test from: :subscriptions_r4_client_subscription_verification,
+           title: 'Subscription creation request has the correct structure and content'
       test from: :pas_client_subscription_pas_conformance_test,
+           title: 'Subscription creation request meets PAS Subscription requirements',
            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/2.2.1/SubscriptionTopic-PASSubscriptionTopic.html), and
-             - Inclusion of filter criteria for the client's organization.
+             - Inclusion of filter criteria for the PAS client's organization.
            ),
            config: { options: { ig_version: 'v2.2.1' } }
       test from: :subscriptions_r4_client_handshake_notification_verification,

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_subscription_update_delete_group.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'subscriptions_test_kit'
+require_relative 'subscription/pas_client_subscription_update_delete_test'
+require_relative 'subscription/pas_client_subscription_put_update_pas_conformance_test'
+
+module DaVinciPASTestKit
+  module DaVinciPASV221
+    class PASClientSubscriptionUpdateDeleteGroup < Inferno::TestGroup
+      id :pas_client_v221_subscription_update_delete
+      title 'Subscription Update and Deletion'
+      description %(
+        During this group, the tester will demonstrate the ability of the PAS client
+        to update and delete the PAS Subscription instance that it created
+        during the "Subscription Setup" group. This group must be run after
+        all scenario and must support tests have been run as Inferno will
+        not send notifications once the Subscription created during the
+        "Subscription Setup" group has been modified or deleted during this
+        group.
+
+        Inferno will wait for the PAS client to send update and delete requests and
+        will then verify that the requests are conformant. Note that
+        - Update and delete requests are only accepted by Inferno while
+          this group is waiting.
+        - Only requests for the Subscription created during the most recent
+          run of the "Subscription Setup" group in this session will
+          be accepted.
+        - Once the Subscription has been deleted, Inferno will respond to
+          further update and read requests for it with a `404 Not Found`
+          until this group is re-run.
+        - If this group is re-run, Inferno will forget about the previous
+          update and delete interactions sent by the PAS client, including
+          deletion. The PAS client can interact with the Subscription as it
+          was after it was created. If the PAS client cannot resume
+          interacting with a Subscription that it has deleted, re-run
+          the *Subscription Setup* group to create a new Subscription.
+      )
+      run_as_group
+
+      group 'Subscription Update and Delete Interaction' do
+        id :pas_client_v221_subscription_update_delete_interaction
+        test from: :pas_client_v221_subscription_update_delete_test
+      end
+
+      group 'Subscription Update and Delete Conformance' do
+        id :pas_client_v221_subscription_update_delete_conformance
+        test from: :subscriptions_r4_client_put_update_verification do
+          title 'Subscription update requests have the correct structure and content'
+        end
+        test from: :pas_client_v221_subscription_put_update_pas_conformance_test
+        test from: :subscriptions_r4_client_delete_verification do
+          title 'Subscription delete requests have the correct structure and content'
+        end
+      end
+    end
+  end
+end

data/lib/davinci_pas_test_kit/client/v2.2.1/pas_client_workflows_group.rb

@@ -3,23 +3,43 @@ require_relative 'pas_client_denial_group'
 require_relative 'pas_client_pended_group'
 require_relative 'pas_client_claim_updates_group'
 require_relative 'pas_client_modification_group'
+require_relative 'pas_client_operation_failure_group'
+require_relative 'pas_client_processing_error_group'
 
 module DaVinciPASTestKit
   module DaVinciPASV221
     class PASClientWorkflowsGroup < Inferno::TestGroup
       id :pas_client_v221_workflows
-      title 'PAS Workflows'
+      title 'PAS Scenarios'
       description %(
-        The workflow tests verify that the client can participate in complete end-to-end prior
+        The scenario tests verify that the PAS client can participate in complete end-to-end prior
         authorization interactions, initiating requests and reacting appropriately to the
         responses returned.
       )
 
+      input_order :approval_json_response,
+                  :denial_json_response,
+                  :pended_json_response,
+                  :notification_bundle,
+                  :client_endpoint_access_token,
+                  :claim_update_initial_response,
+                  :claim_update_add_item_response,
+                  :claim_update_modify_cancel_response,
+                  :claim_update_cancel_all_response,
+                  :modification_json_response,
+                  :operation_failure_operation_outcome,
+                  :operation_failure_http_status,
+                  :processing_error_response,
+                  :client_id,
+                  :session_url_path
+
       group from: :pas_client_v221_approval_group
       group from: :pas_client_v221_denial_group
       group from: :pas_client_v221_pended_group
       group from: :pas_client_v221_claim_updates_group
       group from: :pas_client_v221_modification_group
+      group from: :pas_client_v221_operation_failure_group
+      group from: :pas_client_v221_processing_error_group
     end
   end
 end

data/lib/davinci_pas_test_kit/client/v2.2.1/subscription/pas_client_subscription_create_test.rb

@@ -8,7 +8,8 @@ module DaVinciPASTestKit
 
       id :pas_client_v221_subscription_create_test
 
-      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@spec-8'
+      verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@spec-8',
+                            'hl7.fhir.uv.subscriptions_1.1.0@23'
     end
   end
 end

data/lib/davinci_pas_test_kit/client/v2.2.1/subscription/pas_client_subscription_put_update_pas_conformance_test.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'subscriptions_test_kit'
+require_relative '../../../cross_suite/pas_subscription_verification'
+
+module DaVinciPASTestKit
+  module DaVinciPASV221
+    class PASClientSubscriptionPutUpdatePASConformanceTest < Inferno::Test
+      include SubscriptionsTestKit::SubscriptionsR5BackportR4Client::UpdateRequestLoading
+      include PASSubscriptionVerification
+
+      id :pas_client_v221_subscription_put_update_pas_conformance_test
+      title 'Subscription update requests meet PAS Subscription requirements'
+      description %(
+        This test verifies that the Subscriptions in the accepted [update](https://hl7.org/fhir/R4/http.html#update)
+        (`PUT`) requests that the PAS client sent to Inferno for the Subscription it created during this
+        session are conformant to PAS requirements on the Subscription, including
+        - Conformance to the [PAS Subscription
+          profile](https://hl7.org/fhir/us/davinci-pas/2.2.1/StructureDefinition-profile-subscription.html), and
+        - Filter criteria for the PAS client's organization in the format `org-identifier=<identifier>`.
+      )
+
+      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'
+
+      run do
+        load_update_requests('put')
+
+        # Numbered among all PUT requests so that messages line up with the general update conformance test
+        accepted_requests = requests.each.with_index(1).select { |update_request, _| update_request.status == 200 }
+        skip_if accepted_requests.none?, %(
+          Inferno did not accept any PUT update requests for the created Subscription, so there are no updated
+          Subscriptions to check.
+        )
+
+        accepted_requests.each do |update_request, request_number|
+          first_message_index = messages.length
+          add_pas_subscription_messages(JSON.parse(update_request.request_body), ig_version: 'v2.2.1')
+          messages[first_message_index..].each do |message|
+            message[:message] = "Request #{request_number}: #{message[:message]}"
+          end
+        end
+
+        assert messages.none? { |message| message[:type] == 'error' },
+               'Subscription PUT update requests do not conform to PAS requirements - see messages for details.'
+      end
+    end
+  end
+end

data/lib/davinci_pas_test_kit/client/v2.2.1/subscription/pas_client_subscription_update_delete_test.rb

@@ -0,0 +1,12 @@
+require_relative '../../abstract_subscription_update_delete_test'
+require_relative '../urls'
+
+module DaVinciPASTestKit
+  module DaVinciPASV221
+    class PASClientSubscriptionUpdateDeleteTest < AbstractSubscriptionUpdateDeleteTest
+      include URLs
+
+      id :pas_client_v221_subscription_update_delete_test
+    end
+  end
+end

data/lib/davinci_pas_test_kit/client/v2.2.1/workflows/pas_client_claim_update_referenced_resources_test.rb

@@ -1,12 +1,12 @@
 require_relative 'pas_client_claim_update_validation_utils'
-require_relative '../../../cross_suite/pas_bundle_validation'
+require_relative '../../../cross_suite/referenced_resource_presence_validation'
 
 module DaVinciPASTestKit
   module DaVinciPASV221
-    # spec-67 - reuses the existing PasBundleValidation reference-presence logic.
+    # spec-67 - reuses the existing reference-presence validation logic.
     class PASClientClaimUpdateReferencedResourcesTest < Inferno::Test
       include ClaimUpdateValidationUtils
-      include DaVinciPASTestKit::PasBundleValidation
+      include DaVinciPASTestKit::ReferencedResourcePresenceValidation
 
       id :pas_client_v221_claim_update_referenced_resources_test
       title 'Request Bundles updating a Claim include all resources referenced by the updated Claim'
@@ -28,9 +28,8 @@ module DaVinciPASTestKit
           # The reused reference-presence check verifies the primary Update Claim's parent reference and the
           # parent's own referenced resources, while skipping a non-primary Claim's `related` so the
           # deliberately-omitted grandparent (spec-65/66) is not flagged as missing.
-          validation_error_messages.clear
-          check_presence_of_referenced_resources(step[:claim], base_url, bundle.entry)
-          validation_error_messages.each do |message|
+          errors = check_presence_of_referenced_resources(step[:claim], base_url, bundle.entry)
+          errors.each do |message|
             add_message('error', "In the #{step[:label]} request: #{message}")
           end
         end