davinci_pas_test_kit 0.15.2 → 0.16.0

data/lib/davinci_pas_test_kit/cross_suite/pas_constants.rb

@@ -7,6 +7,13 @@ module DaVinciPASTestKit
     CLAIM_INQUIRY_RESPONSE_PROFILE = 'http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-claiminquiryresponse'.freeze
     DATA_ABSENT_REASON_EXTENSION_URL = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason'.freeze
 
+    # US Core versions that PAS v2.2 lets supporting information resources conform to
+    US_CORE_VERSION_3_1_1 = '3.1.1'.freeze
+    US_CORE_VERSION_6_1_0 = '6.1.0'.freeze
+    US_CORE_VERSION_7_0_0 = '7.0.0'.freeze
+    # Validated against by suites that do not offer the US Core Version option (the v2.2 server suite)
+    DEFAULT_US_CORE_VERSION = US_CORE_VERSION_6_1_0
+
     BUNDLE_PROFILES_FOR_OPERATION_TYPE = {
       submit_request: 'http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-pas-request-bundle',
       submit_response: 'http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-pas-response-bundle',

data/lib/davinci_pas_test_kit/cross_suite/pas_subscription_verification.rb

@@ -7,16 +7,20 @@ module DaVinciPASTestKit
 
     def verify_pas_subscription(subscription_json_str, ig_version: 'v2.0.1')
       assert_valid_json(subscription_json_str)
-      subscription = JSON.parse(subscription_json_str)
+      add_pas_subscription_messages(JSON.parse(subscription_json_str), ig_version:)
 
+      assert messages.none? { |msg| msg[:type] == 'error' },
+             'The Subscription does not conform to PAS requirements - see messages for details.'
+    end
+
+    # Adds a message for each PAS requirement that the parsed Subscription does not meet without failing the
+    # test, so that callers checking several Subscriptions can report on all of them.
+    def add_pas_subscription_messages(subscription, ig_version: 'v2.0.1')
       if ig_version == 'v2.0.1'
         verify_pas_subscription_v201(subscription)
       else
         verify_pas_subscription_v221(subscription)
       end
-
-      assert messages.none? { |msg| msg[:type] == 'error' },
-             'The Subscription does not conform to PAS requirements - see messages for details.'
     end
 
     private

data/lib/davinci_pas_test_kit/cross_suite/referenced_resource_presence_validation.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module DaVinciPASTestKit
+  # Validates that resources referenced within a FHIR resource are present exactly once in a
+  # given set of bundle entries. Kept independent of PasBundleValidation's profile-conformance
+  # logic so it can be included on its own (e.g. by tests that only need reference-presence
+  # checks, such as PASClientClaimUpdateReferencedResourcesTest).
+  module ReferencedResourcePresenceValidation
+    # This method traverses references within a FHIR resource, ensuring that referenced resources
+    # are populated in the bundle. It also enforces that a referenced resource appears only once in the bundle,
+    # as required by the PAS IG.
+    # @param target_resource [FHIR::Model] The FHIR resource to traverse and validate.
+    # @param base_url [String] The server base url.
+    # @param resources_to_match [Array<FHIR:Bundle:Entry] The list of FHIR bundle entries to match references against.
+    # @param skip_claim_related [Boolean] When true, a Claim's `related` element is not traversed. This is set
+    #   for any Claim reached by following a reference (i.e. a non-primary Claim in a Claim Update chain), whose
+    #   own Claim.related.claim (the grandparent) is deliberately omitted from the Bundle per spec-65/66. The
+    #   primary Claim passed in by the caller keeps `skip_claim_related: false`, so its parent reference - and the
+    #   parent's own referenced resources - are still checked.
+    # @return [Array<String>] The error messages found during traversal.
+    def check_presence_of_referenced_resources(target_resource, base_url, resources_to_match,
+                                               skip_claim_related: false)
+      # Indexed once per call rather than linearly scanned per reference encountered during the
+      # traversal below. Grouped (not a plain Hash) so a fullUrl appearing on more than one entry
+      # is still detected as an error instead of being silently collapsed to the last match.
+      entries_by_full_url = resources_to_match.group_by(&:fullUrl)
+      traverse_referenced_resources(target_resource, base_url, entries_by_full_url,
+                                    skip_claim_related:, errors: [])
+    end
+
+    # ClaimResponse.request is a back-reference to the submitted Claim. The PAS IG response bundle
+    # profile (profile-pas-response-bundle) has no required Claim entry slice, so the Claim need
+    # not be present in the response bundle. Skipping here matches the identical guard in
+    # ResponseGenerator#referenced_entities, which also skips ClaimResponse.request when
+    # building mock response bundles.
+    def claim_response_request_attr?(resource, attr)
+      attr.to_s == 'request' &&
+        resource.respond_to?(:resourceType) &&
+        resource.resourceType == 'ClaimResponse'
+    end
+
+    # Claim.related.claim points to the Claim being updated. For a non-primary Claim in a Claim Update
+    # chain (one reached by following a reference), that prior Claim is the grandparent, which spec-65/66
+    # require to be omitted from the Bundle. Used with the `skip_claim_related` flag so the generic
+    # reference-presence check does not flag the deliberately-omitted grandparent as missing.
+    def claim_related_attr?(resource, attr)
+      attr.to_s == 'related' &&
+        resource.respond_to?(:resourceType) &&
+        resource.resourceType == 'Claim'
+    end
+
+    # Generates a message for a resource that appears more than once in a bundle.
+    #
+    # @param reference_resource_type [String] The resource type being referenced.
+    # @param reference_resource_id [String] The resource ID being referenced.
+    # @param total_matches [Integer] The total number of matches found in the bundle.
+    #
+    # This method generates an error message when a referenced resource appears more than once
+    # in a FHIR bundle, which is not allowed.
+    def resource_shall_appear_once_message(absolute_ref, total_matches)
+      " The referenced #{absolute_ref} resource SHALL appear exactly once in the Bundle, but found #{total_matches}."
+    end
+
+    def absolute_url(reference, base_url)
+      return if reference.blank?
+      return reference if base_url.blank? || reference.starts_with?('urn:uuid:') || URI(reference).absolute?
+
+      "#{base_url}/#{reference}"
+    rescue URI::InvalidURIError
+      # left as-is so it is reported as not found in the Bundle rather than erroring the validation
+      reference
+    end
+
+    # Extracts the base URL from an absolute URL by removing the resource type and ID.
+    # Expects a non-versioned [base]/[type]/[id] url, as Bundle fullUrls must be (bdl-8).
+    # @param absolute_url [String] The absolute URL.
+    # @return [String] The base URL, or an empty string if the url is not an absolute url with a host
+    #   (e.g., a urn:uuid, a relative url, or an invalid url - reported separately by the fullUrl checks).
+    def extract_base_url(absolute_url)
+      return '' if absolute_url.blank?
+
+      # Use the raw components rather than URI#authority, which drops an explicit default port (e.g., :443)
+      # and userinfo, so that the base URL is exactly what the client sent and relative references resolved
+      # against it match the Bundle's fullUrls.
+      scheme, userinfo, host, port, _registry, path = URI::RFC3986_PARSER.split(absolute_url)
+      return '' if scheme.blank? || host.blank?
+
+      authority = "#{"#{userinfo}@" if userinfo.present?}#{host}#{":#{port}" if port.present?}"
+
+      # Split the path segments and remove the last two segments (resource type and id)
+      base_path = path.split('/')[0...-2].join('/')
+
+      "#{scheme}://#{authority}#{base_path}"
+    rescue URI::InvalidURIError
+      ''
+    end
+
+    private
+
+    # Recursive worker for check_presence_of_referenced_resources; errors is threaded through the
+    # recursive calls and is private so callers can't pass in (and so corrupt) their own accumulator.
+    # entries_by_full_url is a fullUrl => Array<Bundle::Entry> index built once by the public method,
+    # so each reference encountered is an O(1) lookup instead of a linear scan of every entry.
+    def traverse_referenced_resources(target_resource, base_url, entries_by_full_url, skip_claim_related:, errors:)
+      return errors if target_resource.blank?
+
+      if target_resource.is_a?(FHIR::Reference) && target_resource.reference.present?
+        ref = target_resource.reference
+        absolute_ref = absolute_url(ref, base_url)
+        matching_resources = entries_by_full_url[absolute_ref] || []
+
+        if matching_resources.length != 1
+          errors << resource_shall_appear_once_message(absolute_ref, matching_resources.length)
+        end
+
+        if matching_resources.length.positive?
+          # A resource reached by following a reference is an included resource, not the primary Claim
+          # being validated; if it is itself a Claim Update, its referenced grandparent Claim is omitted.
+          traverse_referenced_resources(matching_resources.first.resource, base_url, entries_by_full_url,
+                                        skip_claim_related: true, errors:)
+        end
+      else
+        target_resource.source_hash.each_key do |attr|
+          next if claim_response_request_attr?(target_resource, attr)
+          next if skip_claim_related && claim_related_attr?(target_resource, attr)
+
+          value = target_resource.send(attr.to_sym)
+          if value.is_a?(FHIR::Model)
+            traverse_referenced_resources(value, base_url, entries_by_full_url, skip_claim_related:, errors:)
+          elsif value.is_a?(Array) && value.all?(FHIR::Model)
+            value.each do |elmt|
+              traverse_referenced_resources(elmt, base_url, entries_by_full_url, skip_claim_related:, errors:)
+            end
+          end
+        end
+      end
+
+      errors
+    end
+  end
+end

data/lib/davinci_pas_test_kit/cross_suite/response_selection_utils.rb

@@ -2,16 +2,18 @@ require_relative 'fhirpath_utils'
 
 module DaVinciPASTestKit
   # Selection of a response from a tester-provided list of candidates. Each candidate
-  # is either a bare FHIR Bundle or a plain JSON wrapper object pairing the response
-  # Bundle ("bundle") with the selection criteria ("criteria") that the incoming
-  # request must meet for that Bundle to be returned. The wrapper is plain JSON
-  # rather than FHIR because Bundle resources cannot carry top-level extensions.
-  # Candidates are handled as parsed JSON hashes; the inner Bundle is a clean FHIR
-  # resource and needs no modification before use.
+  # is either a bare response resource - a FHIR Bundle, or a Parameters wrapping Bundles
+  # (e.g., a v2.2.1 $inquire response) - or a plain JSON wrapper object pairing the
+  # response resource ("bundle") with the selection criteria ("criteria") that the
+  # incoming request must meet for that response to be returned. The wrapper is plain
+  # JSON rather than FHIR because Bundle resources cannot carry top-level extensions.
+  # Candidates are handled as parsed JSON hashes; the inner response resource is a clean
+  # FHIR resource and needs no modification before use.
   # Requires FhirpathUtils and access to `result` (Inferno::Entities::Result).
   module ResponseSelectionUtils
     CRITERIA_KEY = 'criteria'.freeze
     BUNDLE_KEY = 'bundle'.freeze
+    RESPONSE_RESOURCE_TYPES = %w[Bundle Parameters].freeze
     REQUEST_RANGE_KEY = 'requestRange'.freeze
     FHIRPATH_KEY = 'fhirpath'.freeze
 
@@ -19,16 +21,16 @@ module DaVinciPASTestKit
     # Candidate handling
     # ***********************************************************************
 
-    def bare_bundle?(entity)
-      entity.is_a?(Hash) && entity['resourceType'] == 'Bundle'
+    def bare_response?(entity)
+      entity.is_a?(Hash) && RESPONSE_RESOURCE_TYPES.include?(entity['resourceType'])
     end
 
-    def entity_bundle(entity)
-      bare_bundle?(entity) ? entity : entity[BUNDLE_KEY]
+    def entity_response(entity)
+      bare_response?(entity) ? entity : entity[BUNDLE_KEY]
     end
 
     def entity_criteria(entity)
-      criteria = bare_bundle?(entity) ? nil : entity[CRITERIA_KEY]
+      criteria = bare_response?(entity) ? nil : entity[CRITERIA_KEY]
       criteria.is_a?(Hash) ? criteria : {}
     end
 

data/lib/davinci_pas_test_kit/cross_suite/tags.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'subscriptions_test_kit/tags'
+
 module DaVinciPASTestKit
   AUTH_TAG = 'pas_auth'
   SUBMIT_TAG = 'pas_submit'
@@ -15,12 +17,15 @@ module DaVinciPASTestKit
   CLAIM_UPDATE_ADD_ITEM_TAG = 'pas_claim_update_add_item'
   CLAIM_UPDATE_MODIFY_CANCEL_TAG = 'pas_claim_update_modify_cancel'
   CLAIM_UPDATE_CANCEL_ALL_TAG = 'pas_claim_update_cancel_all'
-  NOTIFICATION_TAG = 'subscription_notification'
-  SUBSCRIPTION_CREATE_TAG = 'subscription_create'
-  SUBSCRIPTION_READ_TAG = 'subscription_read'
-  SUBSCRIPTION_STATUS_TAG = 'subscription_status'
-  REST_HOOK_HANDSHAKE_NOTIFICATION_TAG = 'rest_hook_handshake_notification'
-  REST_HOOK_EVENT_NOTIFICATION_TAG = 'rest_hook_event_notification'
+  # Subscription tags must match the Subscriptions Test Kit, whose tests load requests tagged by PAS endpoints
+  NOTIFICATION_TAG = SubscriptionsTestKit::NOTIFICATION_TAG
+  SUBSCRIPTION_CREATE_TAG = SubscriptionsTestKit::SUBSCRIPTION_CREATE_TAG
+  SUBSCRIPTION_READ_TAG = SubscriptionsTestKit::SUBSCRIPTION_READ_TAG
+  SUBSCRIPTION_UPDATE_TAG = SubscriptionsTestKit::SUBSCRIPTION_UPDATE_TAG
+  SUBSCRIPTION_DELETE_TAG = SubscriptionsTestKit::SUBSCRIPTION_DELETE_TAG
+  SUBSCRIPTION_STATUS_TAG = SubscriptionsTestKit::SUBSCRIPTION_STATUS_TAG
+  REST_HOOK_HANDSHAKE_NOTIFICATION_TAG = SubscriptionsTestKit::REST_HOOK_HANDSHAKE_NOTIFICATION_TAG
+  REST_HOOK_EVENT_NOTIFICATION_TAG = SubscriptionsTestKit::REST_HOOK_EVENT_NOTIFICATION_TAG
   OTHER_AUTH_TAG = 'other_auth'
   OPERATION_FAILURE_WORKFLOW_TAG = 'pas_operation_failure_workflow'
   PROCESSING_ERROR_WORKFLOW_TAG = 'pas_processing_error_workflow'

data/lib/davinci_pas_test_kit/cross_suite/validator_configuration.rb

@@ -0,0 +1,16 @@
+module DaVinciPASTestKit
+  # Shared FHIR resource validator configuration for the PAS suites.
+
+  # IGs loaded by the validators in each version's suites.
+  V201_VALIDATOR_IGS = ['hl7.fhir.us.davinci-pas#2.0.1'].freeze
+  V221_VALIDATOR_IGS = ['hl7.fhir.us.davinci-pas#2.2.1', 'hl7.fhir.us.core#6.1.0'].freeze
+
+  # The validator for resources Inferno sends to the system under test, which may be tester-provided.
+  # It doesn't allow extensions beyond those defined in the IGs it loads, so that the system under
+  # test drives its behavior only from standard information. Currently defined by the client suites.
+  # Bundles should be validated with it using PasBundleValidation#perform_no_custom_extensions_validation.
+  NO_CUSTOM_EXTENSIONS_VALIDATOR = :no_custom_extensions
+
+  # SNOMED CT US Edition, used by the validators for SNOMED CT code validation.
+  SNOMED_CT_US_EDITION = '731000124108'.freeze
+end

data/lib/davinci_pas_test_kit/cross_suite/validator_suppressions.rb

@@ -222,6 +222,10 @@ module DaVinciPASTestKit
   ].freeze
   # rubocop:enable Layout/LineLength
 
+  # Validator messages are of the form `<ResourceType>: <FHIRPath>: <message>`. This prefix is
+  # stripped before matching messages against the suppressions.
+  VALIDATOR_MESSAGE_LOCATION_PREFIX = /\A\S+: \S+: /
+
   V221_SUPPRESSED_MESSAGES = Regexp.union(V221_SUPPRESSIONS)
   V201_SUPPRESSED_MESSAGES = Regexp.union(LEGACY_SUPPRESSIONS + V221_SUPPRESSIONS)
 end

data/lib/davinci_pas_test_kit/docs/demo/PAS Client Suite Demonstration.postman_collection.json

@@ -41,7 +41,7 @@
 			]
 		},
 		{
-			"name": "Approval Workflow",
+			"name": "Approval Scenario",
 			"item": [
 				{
 					"name": "Prior Auth Request For Approval",
@@ -81,7 +81,7 @@
 			]
 		},
 		{
-			"name": "Denial Workflow",
+			"name": "Denial Scenario",
 			"item": [
 				{
 					"name": "Prior Auth Request For Denial",
@@ -121,7 +121,7 @@
 			]
 		},
 		{
-			"name": "Pended Workflow",
+			"name": "Pended Scenario",
 			"item": [
 				{
 					"name": "Prior Auth Request For Pended",

data/lib/davinci_pas_test_kit/ext/inferno_core/runnable.rb

@@ -6,6 +6,7 @@ module Inferno
           200,
           {
             'Access-Control-Allow-Origin' => '*',
+            'Access-Control-Allow-Methods' => 'GET, POST, PUT, DELETE, OPTIONS',
             'Access-Control-Allow-Headers' => 'Content-Type, Authorization'
           },
           ['']

data/lib/davinci_pas_test_kit/generator/client_must_support_group_generator.rb

@@ -12,7 +12,7 @@ module DaVinciPASTestKit
           new(ig_metadata, 'submit', submit_request_profiles, base_client_output_dir).generate
 
           submit_response_profiles = ig_metadata.profiles.select do |profile|
-            MustSupportTargetProfiles.submit_response_profile?(profile)
+            MustSupportTargetProfiles.client_submit_response_profile?(profile)
           end
           new(ig_metadata, 'submit', submit_response_profiles, base_client_output_dir, 'response').generate
 
@@ -22,7 +22,7 @@ module DaVinciPASTestKit
           new(ig_metadata, 'inquire', inquire_request_profiles, base_client_output_dir).generate
 
           inquire_response_profiles = ig_metadata.profiles.select do |profile|
-            MustSupportTargetProfiles.inquire_response_profile?(profile)
+            MustSupportTargetProfiles.client_inquire_response_profile?(profile)
           end
           new(ig_metadata, 'inquire', inquire_response_profiles, base_client_output_dir, 'response').generate
         end
@@ -147,17 +147,25 @@ module DaVinciPASTestKit
         ig_version == 'v2.2.1'
       end
 
+      # for now, disabling the attestation option and optional response tests. they are expected to be
+      # re-enabled for some ig versions in some form in the future, so leaving the structure in place.
+      def enable_lax_checks?
+        false
+      end
+
       # The Claim (request) / ClaimResponse (response) profiles remain mandatory standalone tests.
       def mandatory_profile?(profile_metadata)
         %w[Claim ClaimResponse].include?(profile_metadata.resource)
       end
 
-      # Response groups: pairs each per-profile test id with whether it should be marked optional.
+      # Response groups: pairs each per-profile test id with whether it should be marked optional and
+      # whether it verifies response_verifies_requirement (only the ClaimResponse profile does).
       def profile_tests
         profiles.map do |profile_metadata|
           {
             id: test_id_for_profile(profile_metadata),
-            optional: optional_must_support_enabled? && !mandatory_profile?(profile_metadata)
+            optional: optional_must_support_enabled? && !mandatory_profile?(profile_metadata) && enable_lax_checks?,
+            verifies_response_requirement: mandatory_profile?(profile_metadata)
           }
         end
       end
@@ -191,24 +199,47 @@ module DaVinciPASTestKit
         target_profiles.map { |profile_metadata| test_file_for_profile(profile_metadata) }
       end
 
+      # Requirement verified by the ClaimResponse per-profile test in response groups
+      # (clients SHALL be capable of receiving must support elements).
+      def response_verifies_requirement
+        case ig_version
+        when 'v2.2.1' then 'hl7.fhir.us.davinci-pas_2.2.1@conf-7'
+        when 'v2.0.1' then "hl7.fhir.us.davinci-pas_2.0.1@#{operation == 'submit' ? '39' : '40'}"
+        end
+      end
+
       def verifies_requirements
-        case "#{operation}_#{ig_version}"
-        when 'submit_v2.0.1'
-          return nil if type == 'response'
+        case "#{operation}_#{type}_#{ig_version}"
+        when 'submit_request_v2.2.1', 'inquire_request_v2.2.1'
+          ['hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-1']
+        end
+      end
 
-          ['hl7.fhir.us.davinci-pas_2.0.1@58', 'hl7.fhir.us.davinci-pas_2.0.1@62',
-           'hl7.fhir.us.davinci-pas_2.0.1@70', 'hl7.fhir.us.davinci-pas_2.0.1@202']
+      # Names of the profiles that must always be demonstrated, e.g. "PAS Claim Inquiry".
+      def mandatory_profile_names
+        target_profiles = type == 'response' ? profiles : required_profiles
+        target_profiles.select { |profile_metadata| mandatory_profile?(profile_metadata) }
+          .map(&:profile_name).to_sentence
+      end
+
+      # Only v2.2.1 has optional response tests and the request attestation option.
+      def optional_profiles_description
+        return '' unless optional_must_support_enabled? && enable_lax_checks?
+
+        if type == 'response'
+          "\nDemonstration of the #{mandatory_profile_names} profile is strictly required\n" \
+            'while all others are optional.'
+        else
+          "\nFor all profiles other than #{mandatory_profile_names}, testers can attest\n" \
+            'that the missing elements are not supported by their PAS client to pass the tests.'
         end
       end
 
       def description
         if type == 'response'
           <<~DESCRIPTION
-            Check that `$#{operation}` responses provided to the 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.
+            Check that `$#{operation}` responses provided to the PAS client contain
+            all PAS-defined profiles and their must support elements.#{optional_profiles_description}
 
             For `$#{operation}` responses, this includes the following profiles:
 
@@ -216,8 +247,8 @@ module DaVinciPASTestKit
           DESCRIPTION
         else
           <<~DESCRIPTION
-            Check that the client can demonstrate `$#{operation}` requests that contain
-            all PAS-defined profiles and their must support elements.
+            Check that the PAS client demonstrated `$#{operation}` requests that contain
+            all PAS-defined profiles and their must support elements.#{optional_profiles_description}
 
             For `$#{operation}` requests, this includes the following profiles:
 

data/lib/davinci_pas_test_kit/generator/must_support_target_profiles.rb

@@ -53,6 +53,11 @@ module DaVinciPASTestKit
         'PAS Task'
       ].freeze
 
+      # Response profiles not included in the client must support tests (server tests still include them).
+      CLIENT_RESPONSE_EXCLUDED_PROFILES = [
+        'PAS Task'
+      ].freeze
+
       REQUEST_PROFILES = [
         'PAS Medication Request',
         'PAS Service Request',
@@ -77,6 +82,18 @@ module DaVinciPASTestKit
           INQUIRY_RESPONSE_REQUIRED_PROFILES.include?(profile_metadata.profile_name)
         end
 
+        def client_submit_response_profile?(profile_metadata)
+          submit_response_profile?(profile_metadata) && !client_response_excluded_profile?(profile_metadata)
+        end
+
+        def client_inquire_response_profile?(profile_metadata)
+          inquire_response_profile?(profile_metadata) && !client_response_excluded_profile?(profile_metadata)
+        end
+
+        def client_response_excluded_profile?(profile_metadata)
+          CLIENT_RESPONSE_EXCLUDED_PROFILES.include?(profile_metadata.profile_name)
+        end
+
         def request_profile?(profile_metadata)
           REQUEST_PROFILES.include?(profile_metadata.profile_name)
         end

data/lib/davinci_pas_test_kit/generator/must_support_test_generator.rb

@@ -26,6 +26,8 @@ module DaVinciPASTestKit
           end
           submit_response_profiles.each do |profile|
             new(ig_metadata, profile, base_server_output_dir, 'response', 'submit').generate
+            next if MustSupportTargetProfiles.client_response_excluded_profile?(profile)
+
             new(ig_metadata, profile, base_client_output_dir, 'response', 'submit', 'client').generate
           end
 
@@ -37,13 +39,15 @@ module DaVinciPASTestKit
           end
           inquiry_response_profiles.each do |profile|
             new(ig_metadata, profile, base_server_output_dir, 'response', 'inquire').generate
+            next if MustSupportTargetProfiles.client_response_excluded_profile?(profile)
+
             new(ig_metadata, profile, base_client_output_dir, 'response', 'inquire', 'client').generate
           end
         end
 
-        # For v2.2.1 the client request must support tests are collapsed into the attestation tests
+        # For v2.2.1 the client request must support tests are collapsed into shared tests
         # (see ClientMustSupportGroupGenerator), so only the mandatory Claim profile keeps a
-        # standalone per-profile client request test. Other profiles are covered by the attestation
+        # standalone per-profile client request test. Other profiles are covered by the shared
         # tests and their per-profile client request tests are not generated. Server tests and
         # earlier IG versions are unaffected.
         def generate_client_request_test?(ig_metadata, profile)
@@ -127,6 +131,8 @@ module DaVinciPASTestKit
           ['hl7.fhir.us.davinci-pas_2.0.1@37', 'hl7.fhir.us.davinci-pas_2.0.1@110']
         when 'server_inquire_response_v2.0.1'
           ['hl7.fhir.us.davinci-pas_2.0.1@38']
+        when 'client_inquire_response_v2.2.1', 'client_submit_response_v2.2.1'
+          ['hl7.fhir.us.davinci-pas_2.2.1@hrex-conf-2']
         end
       end
 

data/lib/davinci_pas_test_kit/generator/profile_metadata.rb

@@ -42,7 +42,7 @@ module DaVinciPASTestKit
 
       # A sorted, bulleted markdown list of this profile's must support elements (slices, elements,
       # extensions, and choices), each line prefixed with `indent` spaces. Shared by the per-profile
-      # must support tests and the collapsed attestation tests so both stay in sync with the metadata.
+      # must support tests and the collapsed tests so both stay in sync with the metadata.
       def must_support_list_string(indent: 8)
         slice_names = must_supports[:slices].map { |slice| slice[:slice_id] }
         element_names = must_supports[:elements].map { |element| "#{resource}.#{element[:path]}" }

data/lib/davinci_pas_test_kit/generator/server_suite_generator.rb

@@ -46,15 +46,10 @@ module DaVinciPASTestKit
         "Da Vinci PAS Server Suite #{ig_metadata.ig_version}"
       end
 
-      def ig_identifier
-        version = ig_metadata.ig_version[1..] # Remove leading 'v'
-        "hl7.fhir.us.davinci-pas##{version}"
-      end
-
-      def validator_igs_expression
-        identifiers = [ig_identifier]
-        identifiers << 'hl7.fhir.us.core#6.1.0' if ig_metadata.ig_version.start_with?('v2.2')
-        identifiers.map(&:inspect).join(', ')
+      # The validator_configuration.rb constant listing the IGs for this version, e.g. V221_VALIDATOR_IGS.
+      # A version without one fails when the generated suite loads.
+      def validator_igs_constant
+        "V#{ig_metadata.ig_version.delete('v.')}_VALIDATOR_IGS"
       end
 
       # v2.2+ suites use the targeted suppression list; v2.0.1 keeps the legacy list plus the

data/lib/davinci_pas_test_kit/generator/templates/client_must_support_group.rb.erb

@@ -24,8 +24,13 @@ module DaVinciPASTestKit
       
 <%- if optional_must_support_enabled? -%>
 <%- if operation == 'submit' -%>
+<%- if enable_lax_checks? -%>
       # 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.
+<%- else -%>
+      # At least one of the PAS request profiles must be present, with all of its must support
+      # elements observed.
+<%- end -%>
       test from: :pas_client_<%= ig_version_for_id %>_must_support_with_attestation_option do
         id :pas_client_<%= ig_version_for_id %>_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'
@@ -37,20 +42,30 @@ module DaVinciPASTestKit
             ],
             ig_version: '<%= ig_version %>',
             type: 'request',
-            operation: '<%= operation %>'
+            operation: '<%= operation %>',
+            disable_attestation: <%= !enable_lax_checks? %>
           }
         )
         description MustSupportWithAttestationOption.build_description(config.options)
+        <%- if verifies_requirements -%>
+        verifies_requirements(*verifies_requirements, <%= verifies_requirements.map { |r| "'#{r}'" }.join(', ') %>)
+        <%- end -%>
       end
 
 <%- end -%>
 <%- claim_profiles.each do |profile_metadata| -%>
       # Mandatory - the <%= profile_metadata.profile_name %> profile must always be demonstrated.
-      test from: :<%= test_id_for_profile(profile_metadata) %>
+      test from: :<%= test_id_for_profile(profile_metadata) %> <%- if verifies_requirements -%> do
+        verifies_requirements(*verifies_requirements, <%= verifies_requirements.map { |r| "'#{r}'" }.join(', ') %>)
+      end<%- end -%>
 
 <%- end -%>
+<%- if enable_lax_checks? -%>
       # All other <%= operation %> request profiles - unobserved must support elements may be
       # attested as not collected by the client system.
+<%- else -%>
+      # All other <%= operation %> request profiles - all must support elements must be observed.
+<%- end -%>
       test from: :pas_client_<%= ig_version_for_id %>_must_support_with_attestation_option do
         id :pas_client_<%= ig_version_for_id %>_<%= operation %>_request_other_must_support_with_attestation_option
         title '<%= other_profiles_title %>'
@@ -62,10 +77,14 @@ module DaVinciPASTestKit
             ],
             ig_version: '<%= ig_version %>',
             type: 'request',
-            operation: '<%= operation %>'
+            operation: '<%= operation %>',
+            disable_attestation: <%= !enable_lax_checks? %>
           }
         )
         description MustSupportWithAttestationOption.build_description(config.options)
+        <%- if verifies_requirements -%>
+        verifies_requirements(*verifies_requirements, <%= verifies_requirements.map { |r| "'#{r}'" }.join(', ') %>)
+        <%- end -%>
       end
 <%- else -%>
       <%- if operation == 'submit' -%>

data/lib/davinci_pas_test_kit/generator/templates/client_must_support_response_group.rb.erb

@@ -1,7 +1,6 @@
 <%- profile_test_files.each do |file_name| -%>
 require_relative '<%= file_name %>'
 <%- end -%>
-require_relative '../../<%= ig_version %>/workflows/pas_client_response_attest'
 
 module DaVinciPASTestKit
   module <%= module_name %>
@@ -17,27 +16,19 @@ module DaVinciPASTestKit
       <%- if profile_test[:optional] -%>
       test from: :<%= profile_test[:id] %> do
         optional
+        simulation_verification
+      end
+      <%- elsif profile_test[:verifies_response_requirement] -%>
+      test from: :<%= profile_test[:id] %> do
+        verifies_requirements(*verifies_requirements, '<%= response_verifies_requirement %>')
+        simulation_verification
       end
       <%- else -%>
       test from: :<%= profile_test[:id] %> do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-7'
+        simulation_verification
       end
       <%- end -%>
       <%- end -%>
-      test from: :pas_client_<%= ig_version_for_id %>_response_attest,
-           title: 'PAS client handled the $<%= operation %> 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
-             $<%= operation %> 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 $<%= operation %> responses received from Inferno and did not error."
-           } } do
-        verifies_requirements 'hl7.fhir.us.davinci-pas_2.2.1@conf-8'
-      end
     end
   end
 end