davinci_crd_test_kit 0.14.0 → 0.14.2

data/lib/davinci_crd_test_kit/client/v2.2.1/client_appointment_book_group.rb

@@ -14,6 +14,7 @@ require_relative 'verify_request/hook_request_data_fetch_verification_test'
 require_relative 'verify_response/inferno_response_validation'
 require_relative 'verify_response/client_display_cards_attest'
 require_relative 'verify_response/hook_response_support_coverage_information_test'
+require_relative 'client_urls'
 
 module DaVinciCRDTestKit
   module V221
@@ -25,12 +26,18 @@ module DaVinciCRDTestKit
         the user is scheduling one or more future encounters/visits for the patient.
         The CRD IG places [additional constraints on the use of the appintment-book hook](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#appointment-book),
         including the profiles that resources in each request must conform to.
+
+        Inferno's simulated `appointment-book` hook endpoints are available at:
+        - Complete Prefetch: `#{ClientURLs.base_url}#{APPOINTMENT_BOOK_PATH}`
+        - Subset Prefetch: `#{ClientURLs.base_url}#{APPOINTMENT_BOOK_PREFETCH_SUBSET_PATH}`
       DESCRIPTION
       run_as_group
 
       verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-2-A'
 
-      input_order :cds_jwt_iss, :cds_jwk_set
+      input_order :appointment_book_response_approach,
+                  :appointment_book_selected_response_types,
+                  :appointment_book_custom_response_template
 
       config(
         inputs: {
@@ -53,7 +60,9 @@ module DaVinciCRDTestKit
           crd_jwks_keys_json: { name: :appointment_book_crd_jwks_keys_json }
         },
         options: {
-          hook_name: 'appointment-book'
+          hook_name: 'appointment-book',
+          crd_interaction_group: 'hooks-appointment-book',
+          include_in_cross_hook_analysis: true
         }
       )
 
@@ -63,11 +72,14 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Authorization'
-        test from: :crd_v221_decode_auth_token
-        test from: :crd_v221_retrieve_jwks
-        test from: :crd_v221_token_header
-        test from: :crd_v221_token_payload
+        title 'Response Handling'
+
+        test from: :crd_v221_card_display_attest_test
+        test from: :crd_v221_inferno_response_validation
+        test from: :crd_v221_client_hook_response_support_coverage_information do
+          title 'Client supports the Coverage Information response type on the appointment-book hook'
+          verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-26'
+        end
       end
 
       group do
@@ -88,14 +100,11 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Response Handling'
-
-        test from: :crd_v221_inferno_response_validation
-        test from: :crd_v221_card_display_attest_test
-        test from: :crd_v221_client_hook_response_support_coverage_information do
-          title 'Client supports the Coverage Information response type on the appointment-book hook'
-          verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-26'
-        end
+        title 'Authorization'
+        test from: :crd_v221_decode_auth_token
+        test from: :crd_v221_retrieve_jwks
+        test from: :crd_v221_token_header
+        test from: :crd_v221_token_payload
       end
     end
   end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_attestations_group.rb

@@ -0,0 +1,49 @@
+require_relative 'attestations/attestation_instructions'
+require_relative 'attestations/client_authorized_scope_attestation_test'
+require_relative 'attestations/client_coverage_based_invocation_attestation_test'
+require_relative 'attestations/client_data_element_expectations_attestation_test'
+require_relative 'attestations/client_hook_invocation_logging_attestation_test'
+require_relative 'attestations/client_must_support_exposure_attestation_test'
+require_relative 'attestations/client_must_support_use_attestation_test'
+require_relative 'attestations/client_order_sign_support_attestation_test'
+require_relative 'attestations/client_prefetch_key_omission_attestation_test'
+require_relative 'attestations/client_resource_identifiers_attestation_test'
+require_relative 'attestations/client_response_case_distinction_attestation_test'
+require_relative 'attestations/client_security_and_privacy_attestation_test'
+require_relative 'attestations/client_workflow_integration_attestation_test'
+
+module DaVinciCRDTestKit
+  module V221
+    class CRDClientAttestationsGroup < Inferno::TestGroup
+      id :crd_v221_client_attestations
+      title 'Visual Inspection and Attestation'
+      description %(
+        Each test in this group asks the tester to confirm system conformance to one or more
+        **SHALL** requirements from the [CRD v2.2.1 Implementation Guide](https://hl7.org/fhir/us/davinci-crd/2.2.1)
+        or the [CDS Hooks specification](https://cds-hooks.hl7.org/2026Jan/en/).
+        The tester attests that the client system under test meets the statement by selecting "Yes",
+        and may record supporting details in the accompanying notes field. Selecting "No" fails the
+        test. Notes provided are recorded in the test result.
+
+        Testers are responsible for confirming that their system meets all requirements associated with a test
+        before selecting "Yes" on the attestation input with the same name as the test. The text of the
+        attested requirement(s) for each input can be reviewed by clicking the "View Specification Requirements" link
+        in the "About" tab of the test with the same name.
+      )
+      input_instructions ATTESTATION_INPUT_INSTRUCTIONS
+
+      test from: :crd_v221_security_and_privacy_attestation
+      test from: :crd_v221_response_case_distinction_attestation
+      test from: :crd_v221_data_element_expectations_attestation
+      test from: :crd_v221_resource_identifiers_attestation
+      test from: :crd_v221_must_support_exposure_attestation
+      test from: :crd_v221_workflow_integration_attestation
+      test from: :crd_v221_coverage_based_invocation_attestation
+      test from: :crd_v221_prefetch_key_omission_attestation
+      test from: :crd_v221_hook_invocation_logging_attestation
+      test from: :crd_v221_order_sign_support_attestation
+      test from: :crd_v221_authorized_scope_attestation
+      test from: :crd_v221_must_support_use_attestation
+    end
+  end
+end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_cross_hook_group.rb

@@ -3,6 +3,7 @@ require_relative 'cross_hook/client_location_address_propagation_test'
 require_relative 'cross_hook/client_fhirpath_collection_as_comma_delimited_string_test'
 require_relative 'cross_hook/client_hook_instances_unique_test'
 require_relative 'cross_hook/client_prefetch_complete_and_subset_test'
+require_relative 'client_cross_hook_interaction_group'
 
 module DaVinciCRDTestKit
   module V221
@@ -11,18 +12,33 @@ module DaVinciCRDTestKit
       id :crd_v221_client_cross_hook
       description <<~DESCRIPTION
         This group checks CRD requirements that pertain across all hooks
-        rather than a specific one.
+        and hook requests rather than specific ones.
 
         These tests must be run after the tests in the "Hooks" group are run.
+        Clients may, but are not required to, make additional hook requests
+        during these tests to show additional features not demonstrated during
+        previous hook requests. Note that only the requests made during the
+        most recent execution of a given group will be included in the analysis.
       DESCRIPTION
 
       run_as_group
 
-      test from: :crd_v221_client_card_must_support_coverage_information
-      test from: :crd_v221_client_location_address_propagation
-      test from: :crd_v221_client_fhir_path_collection_as_comma_delimited_string
-      test from: :crd_v221_client_hook_instances_unique
-      test from: :crd_v221_client_prefetch_complete_and_subset
+      group from: :crd_v221_client_cross_hook_interaction
+      group do
+        id :crd_v221_client_cross_hook_must_support
+        title 'Must Support'
+
+        test from: :crd_v221_client_card_must_support_coverage_information
+      end
+      group do
+        id :crd_v221_client_cross_hook_additional_capabilities
+        title 'Additional Capabilities'
+
+        test from: :crd_v221_client_location_address_propagation
+        test from: :crd_v221_client_fhir_path_collection_as_comma_delimited_string
+        test from: :crd_v221_client_hook_instances_unique
+        test from: :crd_v221_client_prefetch_complete_and_subset
+      end
     end
   end
 end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_cross_hook_interaction_group.rb

@@ -0,0 +1,98 @@
+require_relative 'invocation/cross_hooks_receive_request_test'
+require_relative 'auth/decode_auth_token_test'
+require_relative 'auth/retrieve_jwks_test'
+require_relative 'auth/token_header_test'
+require_relative 'auth/token_payload_test'
+require_relative 'verify_request/hook_request_conformance_test'
+require_relative 'verify_request/hook_request_requested_version_test'
+require_relative 'verify_request/hook_request_prefetch_profiles_test'
+require_relative 'verify_request/hook_request_prefetch_complete_test'
+require_relative 'verify_request/hook_request_granted_scopes_test'
+require_relative 'verify_request/hook_request_secured_transport_test'
+require_relative 'verify_request/hook_request_coverage_verification_test'
+require_relative 'verify_request/hook_request_data_fetch_verification_test'
+require_relative 'verify_response/inferno_response_validation'
+require_relative 'verify_response/client_display_cards_attest'
+require_relative 'verify_response/hook_response_support_coverage_information_test'
+require_relative 'client_urls'
+
+module DaVinciCRDTestKit
+  module V221
+    class ClientCrossHookInteractionGroup < Inferno::TestGroup
+      title 'Additional Hook Invocations for Cross Hook Support Demonstration'
+      id :crd_v221_client_cross_hook_interaction
+      description <<~DESCRIPTION
+        Optionally send more hook requests demonstrating additional cross-hook
+        features.
+
+        Inferno's simulated hook endpoints can be discovered at:
+        - Complete Prefetch: `#{ClientURLs.base_url}#{DISCOVERY_PATH}`
+        - Subset Prefetch: `#{ClientURLs.base_url}#{PREFETCH_DISCOVERY_PATH}`
+      DESCRIPTION
+      run_as_group
+
+      input_order :cross_hooks_response_approach,
+                  :cross_hooks_selected_response_types,
+                  :cross_hooks_custom_response_template
+
+      config(
+        inputs: {
+          auth_token_headers_json: { name: :cross_hooks_auth_token_headers_json },
+          auth_tokens: { name: :cross_hooks_auth_tokens },
+          auth_tokens_jwk_json: { name: :cross_hooks_auth_tokens_jwk_json },
+          client_access_token: { name: :cross_hooks_client_access_token },
+          client_fhir_server: { name: :cross_hooks_client_fhir_server },
+          crd_jwks_keys_json: { name: :cross_hooks_crd_jwks_keys_json },
+          custom_response_template: { name: :cross_hooks_custom_response_template },
+          selected_response_types: { name: :cross_hooks_selected_response_types }
+        },
+        outputs: {
+          auth_token_headers_json: { name: :cross_hooks_auth_token_headers_json },
+          auth_token_payloads_json: { name: :cross_hooks_auth_token_payloads_json },
+          auth_tokens: { name: :cross_hooks_auth_tokens },
+          auth_tokens_jwk_json: { name: :cross_hooks_auth_tokens_jwk_json },
+          client_access_token: { name: :cross_hooks_client_access_token },
+          client_fhir_server: { name: :cross_hooks_client_fhir_server },
+          crd_jwks_keys_json: { name: :cross_hooks_crd_jwks_keys_json }
+        },
+        options: {
+          hook_name: ANY_HOOK_TAG,
+          crd_interaction_group: 'additional-cross-hooks',
+          include_in_cross_hook_analysis: true
+        }
+      )
+
+      group do
+        title 'Interaction'
+        test from: :crd_v221_cross_hooks_request
+      end
+
+      group do
+        title 'Response Handling'
+
+        test from: :crd_v221_card_display_attest_test
+        test from: :crd_v221_inferno_response_validation
+      end
+
+      group do
+        title 'Requests'
+        test from: :crd_v221_hook_request_conformance
+        test from: :crd_v221_hook_request_requested_version
+        test from: :crd_v221_hook_request_prefetch_profiles
+        test from: :crd_v221_hook_request_prefetch_complete
+        test from: :crd_v221_hook_request_coverage_verification
+        test from: :crd_v221_hook_data_fetch_verification
+        test from: :crd_v221_hook_request_granted_scopes
+        test from: :crd_v221_hook_request_secured_transport
+      end
+
+      group do
+        title 'Authorization'
+        test from: :crd_v221_decode_auth_token
+        test from: :crd_v221_retrieve_jwks
+        test from: :crd_v221_token_header
+        test from: :crd_v221_token_payload
+      end
+    end
+  end
+end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_encounter_discharge_group.rb

@@ -25,12 +25,18 @@ module DaVinciCRDTestKit
         the notion of 'discharge' is relevant - typically an inpatient encounter.
         The CRD IG places [additional constraints on the use of the encounter-discharge hook](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#encounter-discharge),
         including the profiles that resources in each request must conform to.
+
+        Inferno's simulated `encounter-discharge` hook endpoints are available at:
+        - Complete Prefetch: `#{ClientURLs.base_url}#{ENCOUNTER_DISCHARGE_PATH}`
+        - Subset Prefetch: `#{ClientURLs.base_url}#{ENCOUNTER_DISCHARGE_PREFETCH_SUBSET_PATH}`
       DESCRIPTION
       run_as_group
 
       verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-2-A'
 
-      input_order :cds_jwt_iss, :cds_jwk_set
+      input_order :encounter_discharge_response_approach,
+                  :encounter_discharge_selected_response_types,
+                  :encounter_discharge_custom_response_template
 
       config(
         inputs: {
@@ -53,7 +59,9 @@ module DaVinciCRDTestKit
           crd_jwks_keys_json: { name: :encounter_discharge_crd_jwks_keys_json }
         },
         options: {
-          hook_name: 'encounter-discharge'
+          hook_name: 'encounter-discharge',
+          crd_interaction_group: 'hooks-encounter-discharge',
+          include_in_cross_hook_analysis: true
         }
       )
 
@@ -63,11 +71,10 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Authorization'
-        test from: :crd_v221_decode_auth_token
-        test from: :crd_v221_retrieve_jwks
-        test from: :crd_v221_token_header
-        test from: :crd_v221_token_payload
+        title 'Response Handling'
+
+        test from: :crd_v221_card_display_attest_test
+        test from: :crd_v221_inferno_response_validation
       end
 
       group do
@@ -86,10 +93,11 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Response Handling'
-
-        test from: :crd_v221_inferno_response_validation
-        test from: :crd_v221_card_display_attest_test
+        title 'Authorization'
+        test from: :crd_v221_decode_auth_token
+        test from: :crd_v221_retrieve_jwks
+        test from: :crd_v221_token_header
+        test from: :crd_v221_token_payload
       end
     end
   end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_encounter_start_group.rb

@@ -24,12 +24,18 @@ module DaVinciCRDTestKit
         when the user is initiating a new encounter. The CRD IG places [additional constraints on the use
         of the encounter-start hook](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#encounter-start),
         including the profiles that resources in each request must conform to.
+
+        Inferno's simulated `encounter-start` hook endpoints are available at:
+        - Complete Prefetch: `#{ClientURLs.base_url}#{ENCOUNTER_START_PATH}`
+        - Subset Prefetch: `#{ClientURLs.base_url}#{ENCOUNTER_START_PREFETCH_SUBSET_PATH}`
       DESCRIPTION
       run_as_group
 
       verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-2-A'
 
-      input_order :cds_jwt_iss, :cds_jwk_set
+      input_order :encounter_start_response_approach,
+                  :encounter_start_selected_response_types,
+                  :encounter_start_custom_response_template
 
       config(
         inputs: {
@@ -52,7 +58,9 @@ module DaVinciCRDTestKit
           crd_jwks_keys_json: { name: :encounter_start_crd_jwks_keys_json }
         },
         options: {
-          hook_name: 'encounter-start'
+          hook_name: 'encounter-start',
+          crd_interaction_group: 'hooks-encounter-start',
+          include_in_cross_hook_analysis: true
         }
       )
 
@@ -62,11 +70,10 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Authorization'
-        test from: :crd_v221_decode_auth_token
-        test from: :crd_v221_retrieve_jwks
-        test from: :crd_v221_token_header
-        test from: :crd_v221_token_payload
+        title 'Response Handling'
+
+        test from: :crd_v221_card_display_attest_test
+        test from: :crd_v221_inferno_response_validation
       end
 
       group do
@@ -85,10 +92,11 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Response Handling'
-
-        test from: :crd_v221_inferno_response_validation
-        test from: :crd_v221_card_display_attest_test
+        title 'Authorization'
+        test from: :crd_v221_decode_auth_token
+        test from: :crd_v221_retrieve_jwks
+        test from: :crd_v221_token_header
+        test from: :crd_v221_token_payload
       end
     end
   end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_fhir_api_group.rb

@@ -10,16 +10,13 @@ module DaVinciCRDTestKit
         CRD client systems are responsible for returning data requested by the CRD server needed to provide decision support.
         This group contains tests that verify the required 'server' FHIR API capabilities.
         These 'server' capabilities are based on the US Core Server Capability Statement for the US Core version chosen
-        when initiating the test session:
-        - [US Core 3.1.1 Server Capability Statement](http://hl7.org/fhir/us/core/STU3.1.1/CapabilityStatement-us-core-server.html)
-        - [US Core 6.1.0 Server Capability Statement](http://hl7.org/fhir/us/core/STU6.1/CapabilityStatement-us-core-server.html)
-        - [US Core 7.0.0 Server Capability Statement](http://hl7.org/fhir/us/core/STU7/CapabilityStatement-us-core-server.html)
+        when the test session was initiated.
       DESCRIPTION
       id :crd_v221_client_fhir_api
 
       verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@conf-1'
 
-      input_instructions %(
+      INPUT_INSTRUCTIONS = %(
         The location of and an access token for the client's FHIR server are expected to come in
         the CDS Hooks request. The following information will be auto-populated from
         the body of the latest hook invocation made during this session:
@@ -29,7 +26,9 @@ module DaVinciCRDTestKit
         If that access token will not be long-lived enough to perform
         a full test of the US Core FHIR API, provide an updated token and/or refresh
         token with Client ID and token endpoint so that Inferno can perform these tests.
-      )
+      ).freeze
+
+      input_instructions INPUT_INSTRUCTIONS
 
       input :url,
             title: 'FHIR Endpoint',
@@ -46,10 +45,11 @@ module DaVinciCRDTestKit
           This test group verifies that the CRD client can respond to queries as required by the
           [US Core 3.1.1 Server Capability Statement](http://hl7.org/fhir/us/core/STU3.1.1/CapabilityStatement-us-core-server.html).
 
-          Note: these tests do not look for crd-specific data and so only verify conformance against
-          US Core profiles. The hook tests take the CRD-specific profiles into account.
+          Note: unlike the hook tests, these US Core tests do not require CRD-specific data but
+          instead verify conformance against US Core profiles rather than the CRD-defined profiles.
         )
         required_suite_options CRDClientOptions::US_CORE_3_REQUIREMENT
+        input_instructions INPUT_INSTRUCTIONS
 
         group from: :crd_v221_client_update_verification,
               id: :crd_v221_us_core_311_client_update_verification
@@ -60,10 +60,11 @@ module DaVinciCRDTestKit
           This test group verifies that the CRD client can respond to queries as required by the
           [US Core 6.1.0 Server Capability Statement](http://hl7.org/fhir/us/core/STU6.1/CapabilityStatement-us-core-server.html).
 
-          Note: these tests do not look for crd-specific data and so only verify conformance against
-          US Core profiles. The hook tests take the CRD-specific profiles into account.
+          Note: unlike the hook tests, these US Core tests do not require CRD-specific data but
+          instead verify conformance against US Core profiles rather than the CRD-defined profiles.
         )
         required_suite_options CRDClientOptions::US_CORE_6_REQUIREMENT
+        input_instructions INPUT_INSTRUCTIONS
 
         group from: :crd_v221_client_update_verification,
               id: :crd_v221_us_core_610_client_update_verification
@@ -74,10 +75,11 @@ module DaVinciCRDTestKit
           This test group verifies that the CRD client can respond to queries as required by the
           [US Core 7.0.0 Server Capability Statement](http://hl7.org/fhir/us/core/STU7/CapabilityStatement-us-core-server.html).
 
-          Note: these tests do not look for crd-specific data and so only verify conformance against
-          US Core profiles. The hook tests take the CRD-specific profiles into account.
+          Note: unlike the hook tests, these US Core tests do not require CRD-specific data but
+          instead verify conformance against US Core profiles rather than the CRD-defined profiles.
         )
         required_suite_options CRDClientOptions::US_CORE_7_REQUIREMENT
+        input_instructions INPUT_INSTRUCTIONS
 
         group from: :crd_v221_client_update_verification,
               id: :crd_v221_us_core_700_client_update_verification

data/lib/davinci_crd_test_kit/client/v2.2.1/client_hooks_group.rb

@@ -4,6 +4,7 @@ require_relative 'client_encounter_start_group'
 require_relative 'client_order_dispatch_group'
 require_relative 'client_order_select_group'
 require_relative 'client_order_sign_group'
+require_relative 'client_urls'
 
 module DaVinciCRDTestKit
   module V221
@@ -14,10 +15,10 @@ module DaVinciCRDTestKit
         one of the [six hooks described in the CRD IG](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html):
         * [appointment-book](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#appointment-book)
         * [encounter-start](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#encounter-start)
-        * [encounter-discharge](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#encounter-discharge)
         * [order-select](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#order-select)
-        * [order-dispatch](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#order-dispatch)
         * [order-sign](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#order-sign)
+        * [order-dispatch](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#order-dispatch)
+        * [encounter-discharge](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#encounter-discharge)
 
         Each hook-specific group follows the same pattern:
         1. Allow the client to make hook invocations for the tested hook, waiting until the tester indicates
@@ -28,6 +29,25 @@ module DaVinciCRDTestKit
         The CRD IG does not require support for any specific hook, so all the hook-specific sub-groups are
         optional. A conformant CRD client will have implemented at least one hook and will run and pass
         the hook-specific groups corresponding to each hook that it implements.
+
+        Inferno simulates two CRD discovery endpoints, each with service endpoints for all six CRD hooks
+        but with different service ids:
+        - Discovery endpoint for services requesting the complete [standard prefetch data set](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/foundation.html#standard-prefetch):
+          `#{ClientURLs.discovery_url}`
+          * `appointment-book` service id: `appointment-book-service`
+          * `encounter-start` service id: `encounter-start-service`
+          * `order-select` service id: `order-select-service`
+          * `order-sign` service id: `order-sign-service`
+          * `order-dispatch` service id: `order-dispatch-service`
+          * `encounter-discharge` service id: `encounter-discharge-service`
+        - Discovery endpoint for services requesting the a subset of the [standard prefetch data set](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/foundation.html#standard-prefetch):
+          `#{ClientURLs.prefetch_subset_discovery_url}`
+          * `appointment-book` service id: `appointment-book-subset`
+          * `encounter-start` service id: `encounter-start-subset`
+          * `order-select` service id: `order-select-subset`
+          * `order-sign` service id: `order-sign-subset`
+          * `order-dispatch` service id: `order-dispatch-subset`
+          * `encounter-discharge` service id: `encounter-discharge-subset`
       DESCRIPTION
       id :crd_v221_client_hooks
 
@@ -48,16 +68,16 @@ module DaVinciCRDTestKit
       group from: :crd_v221_client_encounter_start,
             optional: true
 
-      group from: :crd_v221_client_encounter_discharge,
+      group from: :crd_v221_client_order_select,
             optional: true
 
-      group from: :crd_v221_client_order_select,
+      group from: :crd_v221_client_order_sign,
             optional: true
 
       group from: :crd_v221_client_order_dispatch,
             optional: true
 
-      group from: :crd_v221_client_order_sign,
+      group from: :crd_v221_client_encounter_discharge,
             optional: true
     end
   end

data/lib/davinci_crd_test_kit/client/v2.2.1/client_long_running_hook_group.rb

@@ -16,12 +16,13 @@ module DaVinciCRDTestKit
 
       run_as_group
 
-      input_order :cds_jwt_iss
+      input_order :long_running_pause_time
 
       config(
         options: {
           hook_name: ANY_HOOK_TAG,
-          crd_test_group: LONG_RUNNING_GROUP_TAG
+          crd_interaction_group: LONG_RUNNING_GROUP_TAG,
+          include_in_cross_hook_analysis: false
         }
       )
 

data/lib/davinci_crd_test_kit/client/v2.2.1/client_order_dispatch_group.rb

@@ -26,12 +26,18 @@ module DaVinciCRDTestKit
         that was not tied to a specific performer. The CRD IG places [additional constraints on the use
         of the order-dispatch hook](https://hl7.org/fhir/us/davinci-crd/2.2.1/en/hooks.html#order-dispatch),
         including the profiles that resources in each request must conform to.
+
+        Inferno's simulated `order-dispatch` hook endpoints are available at:
+        - Complete Prefetch: `#{ClientURLs.base_url}#{ORDER_DISPATCH_PATH}`
+        - Subset Prefetch: `#{ClientURLs.base_url}#{ORDER_DISPATCH_PREFETCH_SUBSET_PATH}`
       DESCRIPTION
       run_as_group
 
       verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-2-A', 'hl7.fhir.us.davinci-crd_2.2.1@hook-2-B'
 
-      input_order :cds_jwt_iss, :cds_jwk_set
+      input_order :order_dispatch_response_approach,
+                  :order_dispatch_selected_response_types,
+                  :order_dispatch_custom_response_template
 
       config(
         inputs: {
@@ -54,7 +60,9 @@ module DaVinciCRDTestKit
           crd_jwks_keys_json: { name: :order_dispatch_crd_jwks_keys_json }
         },
         options: {
-          hook_name: 'order-dispatch'
+          hook_name: 'order-dispatch',
+          crd_interaction_group: 'hooks-order-dispatch',
+          include_in_cross_hook_analysis: true
         }
       )
 
@@ -64,11 +72,14 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Authorization'
-        test from: :crd_v221_decode_auth_token
-        test from: :crd_v221_retrieve_jwks
-        test from: :crd_v221_token_header
-        test from: :crd_v221_token_payload
+        title 'Response Handling'
+
+        test from: :crd_v221_card_display_attest_test
+        test from: :crd_v221_inferno_response_validation
+        test from: :crd_v221_client_hook_response_support_coverage_information do
+          title 'Client supports the Coverage Information response type on the order-dispatch hook'
+          verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-33'
+        end
       end
 
       group do
@@ -87,14 +98,11 @@ module DaVinciCRDTestKit
       end
 
       group do
-        title 'Response Handling'
-
-        test from: :crd_v221_inferno_response_validation
-        test from: :crd_v221_card_display_attest_test
-        test from: :crd_v221_client_hook_response_support_coverage_information do
-          title 'Client supports the Coverage Information response type on the order-dispatch hook'
-          verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-33'
-        end
+        title 'Authorization'
+        test from: :crd_v221_decode_auth_token
+        test from: :crd_v221_retrieve_jwks
+        test from: :crd_v221_token_header
+        test from: :crd_v221_token_payload
       end
     end
   end