davinci_dtr_test_kit 0.17.0 → 0.18.0

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire → full_ehr/v2.0.1/adaptive_interaction}/dtr_adaptive_next_question_request_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../descriptions'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRAdaptiveNextQuestionRequestTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire → full_ehr/v2.0.1/adaptive_interaction}/dtr_adaptive_next_question_request_validation_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRAdaptiveNextQuestionRequestValidationTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire → full_ehr/v2.0.1/adaptive_interaction}/dtr_adaptive_response_validation_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../urls'
-require_relative '../../dtr_questionnaire_response_validation'
+require_relative '../../../urls'
+require_relative '../../../cross_suite/v2.0.1/dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
   class DTRAdaptiveResponseValidationTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire/dinner_order → full_ehr/v2.0.1}/dtr_full_ehr_adaptive_dinner_workflow_group.rb

@@ -1,10 +1,10 @@
-require_relative '../../../tags'
-require_relative 'dtr_full_ehr_adaptive_initial_retrieval_group'
-require_relative '../../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
-require_relative '../../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
-require_relative 'dtr_adaptive_followup_questions_group'
-require_relative 'dtr_adaptive_completion_group'
-require_relative '../../full_ehr/dtr_full_ehr_store_attestation_test'
+require_relative '../../tags'
+require_relative 'adaptive_dinner/dtr_full_ehr_adaptive_initial_retrieval_group'
+require_relative 'shared/dtr_full_ehr_prepopulation_attestation_test'
+require_relative 'shared/dtr_full_ehr_prepopulation_override_attestation_test'
+require_relative 'adaptive_dinner/dtr_adaptive_followup_questions_group'
+require_relative 'adaptive_dinner/dtr_adaptive_completion_group'
+require_relative 'shared/dtr_full_ehr_store_attestation_test'
 
 module DaVinciDTRTestKit
   class DTRFullEHRAdaptiveDinnerWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire/custom → full_ehr/v2.0.1}/dtr_full_ehr_custom_adaptive_workflow_group.rb

@@ -1,17 +1,17 @@
-require_relative '../../../tags'
-require_relative '../../full_ehr/dtr_full_ehr_launch_attestation_test'
-require_relative 'dtr_full_ehr_custom_adaptive_request_test'
-require_relative '../../shared/dtr_questionnaire_package_request_validation_test'
-require_relative '../dtr_adaptive_next_question_request_validation_test'
-require_relative '../dtr_adaptive_response_validation_test'
-require_relative '../../shared/dtr_custom_questionnaire_package_validation_test'
-require_relative '../../shared/dtr_custom_questionnaire_libraries_test'
-require_relative 'dtr_custom_next_question_response_validation_test'
-require_relative '../../shared/dtr_custom_questionnaire_extensions_test'
-require_relative '../../shared/dtr_custom_questionnaire_expressions_test'
-require_relative '../../shared/dtr_prepopulation_attestation_test'
-require_relative '../../shared/dtr_prepopulation_override_attestation_test'
-require_relative '../../full_ehr/dtr_full_ehr_store_attestation_test'
+require_relative '../../tags'
+require_relative 'shared/dtr_full_ehr_launch_attestation_test'
+require_relative 'adaptive_custom/dtr_full_ehr_custom_adaptive_request_test'
+require_relative 'shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'adaptive_interaction/dtr_adaptive_next_question_request_validation_test'
+require_relative 'adaptive_interaction/dtr_adaptive_response_validation_test'
+require_relative 'shared/dtr_custom_questionnaire_package_validation_test'
+require_relative 'shared/dtr_custom_questionnaire_libraries_test'
+require_relative 'adaptive_custom/dtr_custom_next_question_response_validation_test'
+require_relative 'shared/dtr_custom_questionnaire_extensions_test'
+require_relative 'shared/dtr_custom_questionnaire_expressions_test'
+require_relative 'shared/dtr_prepopulation_attestation_test'
+require_relative 'shared/dtr_prepopulation_override_attestation_test'
+require_relative 'shared/dtr_full_ehr_store_attestation_test'
 
 module DaVinciDTRTestKit
   class DTRFullEHRCustomAdaptiveWorkflowGroup < Inferno::TestGroup
@@ -92,17 +92,19 @@ module DaVinciDTRTestKit
       # Test 8: verify the custom responses has the necessary extensions for pre-population
       test from: :dtr_custom_questionnaire_extensions do
         title %(
-          [USER INPUT VERIFICATION] Custom Questionnaires for $next-question Responses contain extensions
+          Custom Questionnaires for $next-question Responses contain extensions
           necessary for pre-population
         )
+        simulation_verification
         input :custom_next_question_questionnaires
       end
       # Test 9: verify custom responses has necessary expressions for pre-population
       test from: :dtr_custom_questionnaire_expressions do
         title %(
-          [USER INPUT VERIFICATION] Custom Questionnaires for $next-question Responses contain items with
+          Custom Questionnaires for $next-question Responses contain items with
           expressions necessary for pre-population
         )
+        simulation_verification
         input :custom_next_question_questionnaires
       end
     end

data/lib/davinci_dtr_test_kit/{client_groups/custom_static → full_ehr/v2.0.1}/dtr_full_ehr_custom_static_workflow_group.rb

@@ -1,14 +1,14 @@
-require_relative '../shared/dtr_custom_questionnaire_package_validation_test'
-require_relative '../shared/dtr_custom_questionnaire_libraries_test'
-require_relative '../shared/dtr_custom_questionnaire_extensions_test'
-require_relative '../shared/dtr_custom_questionnaire_expressions_test'
-require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_questionnaire_package_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative '../shared/dtr_prepopulation_attestation_test'
-require_relative '../shared/dtr_rendering_attestation_test'
-require_relative '../shared/dtr_prepopulation_override_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_saving_questionnaire_response_group'
+require_relative 'shared/dtr_custom_questionnaire_package_validation_test'
+require_relative 'shared/dtr_custom_questionnaire_libraries_test'
+require_relative 'shared/dtr_custom_questionnaire_extensions_test'
+require_relative 'shared/dtr_custom_questionnaire_expressions_test'
+require_relative 'shared/dtr_full_ehr_launch_attestation_test'
+require_relative 'shared/dtr_full_ehr_questionnaire_package_request_test'
+require_relative 'shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'shared/dtr_prepopulation_attestation_test'
+require_relative 'shared/dtr_rendering_attestation_test'
+require_relative 'shared/dtr_prepopulation_override_attestation_test'
+require_relative 'shared/dtr_full_ehr_saving_questionnaire_response_group'
 
 module DaVinciDTRTestKit
   class DTRFullEHRCustomStaticWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/must_support → full_ehr/v2.0.1}/dtr_full_ehr_questionnaire_must_support_group.rb

@@ -1,10 +1,10 @@
 require_relative '../../urls'
-require_relative 'dtr_full_ehr_ms_questionnaire_package_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative '../shared/dtr_custom_questionnaire_package_validation_test'
-require_relative 'dtr_must_support_attestation_test'
-require_relative 'dtr_questionnaire_must_support_test'
-require_relative 'questionnaire_must_support_elements'
+require_relative 'must_support/dtr_full_ehr_ms_questionnaire_package_request_test'
+require_relative 'shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'shared/dtr_custom_questionnaire_package_validation_test'
+require_relative 'must_support/dtr_must_support_attestation_test'
+require_relative 'must_support/dtr_questionnaire_must_support_test'
+require_relative 'must_support/questionnaire_must_support_elements'
 
 module DaVinciDTRTestKit
   class DTRFullEHRQuestionnaireMustSupportGroup < Inferno::TestGroup
@@ -70,7 +70,8 @@ module DaVinciDTRTestKit
     test from: :dtr_custom_qp_validation
     # Test 4: must support test
     test from: :dtr_questionnaire_must_support,
-         title: '[USER INPUT VALIDATION] All must support elements are provided in the static Questionnaire resources provided', # rubocop:disable Layout/LineLength
+         title: 'All must support elements are provided in the static Questionnaire resources provided',
+         simulation_verification: true,
          description: <<~DESCRIPTION
            The DTR client SHALL be able to handle all `mustSupport` elements defined in the
            [DTR Standard Questionnaire](http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/dtr-std-questionnaire)

data/lib/davinci_dtr_test_kit/{client_groups/dinner_static → full_ehr/v2.0.1}/dtr_full_ehr_static_dinner_workflow_group.rb

@@ -1,10 +1,10 @@
-require_relative '../full_ehr/dtr_full_ehr_launch_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_questionnaire_package_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative '../full_ehr/dtr_full_ehr_prepopulation_attestation_test'
-require_relative 'dtr_static_dinner_enabled_questions_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_prepopulation_override_attestation_test'
-require_relative '../full_ehr/dtr_full_ehr_saving_questionnaire_response_group'
+require_relative 'shared/dtr_full_ehr_launch_attestation_test'
+require_relative 'shared/dtr_full_ehr_questionnaire_package_request_test'
+require_relative 'shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'shared/dtr_full_ehr_prepopulation_attestation_test'
+require_relative 'static_dinner/dtr_static_dinner_enabled_questions_attestation_test'
+require_relative 'shared/dtr_full_ehr_prepopulation_override_attestation_test'
+require_relative 'shared/dtr_full_ehr_saving_questionnaire_response_group'
 
 module DaVinciDTRTestKit
   class DTRFullEHRStaticDinnerWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{dtr_full_ehr_suite.rb → full_ehr/v2.0.1/dtr_full_ehr_suite.rb}

@@ -1,27 +1,26 @@
 require 'udap_security_test_kit'
 require 'smart_app_launch_test_kit'
-require_relative 'client_groups/custom_static/dtr_full_ehr_custom_static_workflow_group'
-require_relative 'client_groups/dinner_static/dtr_full_ehr_static_dinner_workflow_group'
-require_relative 'client_groups/adaptive_questionnaire/dinner_order/dtr_full_ehr_adaptive_dinner_workflow_group'
-require_relative 'client_groups/adaptive_questionnaire/custom/dtr_full_ehr_custom_adaptive_workflow_group'
-require_relative 'client_groups/payer_registration/dtr_client_registration_group'
-require_relative 'client_groups/must_support/dtr_full_ehr_questionnaire_must_support_group'
-require_relative 'client_groups/auth/dtr_client_payer_auth_smart_group'
-require_relative 'client_groups/auth/dtr_client_payer_auth_udap_group'
-require_relative 'endpoints/cors'
-require_relative 'endpoints/mock_udap_smart_server/token_endpoint'
-require_relative 'endpoints/mock_payer/full_ehr_questionnaire_package_endpoint'
-require_relative 'endpoints/mock_payer/full_ehr_next_question_endpoint'
-require_relative 'version'
-require_relative 'dtr_client_options'
+require_relative 'dtr_full_ehr_custom_static_workflow_group'
+require_relative 'dtr_full_ehr_static_dinner_workflow_group'
+require_relative 'dtr_full_ehr_adaptive_dinner_workflow_group'
+require_relative 'dtr_full_ehr_custom_adaptive_workflow_group'
+require_relative 'dtr_payer_registration_group'
+require_relative 'dtr_full_ehr_questionnaire_must_support_group'
+require_relative 'dtr_client_payer_auth_smart_group'
+require_relative 'dtr_client_payer_auth_udap_group'
+require_relative '../../cross_suite/cors'
+require_relative '../endpoints/mock_udap_smart_server/token_endpoint'
+require_relative 'full_ehr_questionnaire_package_endpoint'
+require_relative 'full_ehr_next_question_endpoint'
+require_relative '../dtr_full_ehr_options'
 
 module DaVinciDTRTestKit
   class DTRFullEHRSuite < Inferno::TestSuite
     extend CORS
 
     id :dtr_full_ehr
-    title 'Da Vinci DTR Full EHR Test Suite'
-    description File.read(File.join(__dir__, 'docs', 'dtr_full_ehr_suite_description_v201.md'))
+    title 'Da Vinci DTR Full EHR Test Suite v2.0.1'
+    description File.read(File.join(__dir__, 'dtr_full_ehr_suite_description_v201.md'))
 
     links [
       {
@@ -55,11 +54,11 @@ module DaVinciDTRTestKit
                  list_options: [
                    {
                      label: 'SMART Backend Services',
-                     value: DTRClientOptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
+                     value: DTRFullEHROptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
                    },
                    {
                      label: 'UDAP B2B Client Credentials',
-                     value: DTRClientOptions::UDAP_CLIENT_CREDENTIALS
+                     value: DTRFullEHROptions::UDAP_CLIENT_CREDENTIALS
                    }
                  ]
 
@@ -70,6 +69,10 @@ module DaVinciDTRTestKit
       exclude_message do |message|
         message.message.match?(/\A\S+: \S+: URL value '.*' does not resolve/)
       end
+
+      validation_context do
+        snomedCT '731000124108'
+      end
     end
 
     allow_cors QUESTIONNAIRE_PACKAGE_PATH, NEXT_PATH
@@ -118,11 +121,11 @@ module DaVinciDTRTestKit
 
     group from: :dtr_client_payer_auth_smart,
           required_suite_options: {
-            client_type: DTRClientOptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
+            client_type: DTRFullEHROptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
           }
     group from: :dtr_client_payer_auth_udap,
           required_suite_options: {
-            client_type: DTRClientOptions::UDAP_CLIENT_CREDENTIALS
+            client_type: DTRFullEHROptions::UDAP_CLIENT_CREDENTIALS
           }
   end
 end

data/lib/davinci_dtr_test_kit/{client_groups/payer_registration/dtr_client_registration_group.rb → full_ehr/v2.0.1/dtr_payer_registration_group.rb}

@@ -1,8 +1,8 @@
 require 'udap_security_test_kit'
 require 'smart_app_launch_test_kit'
-require_relative '../../dtr_client_options'
-require_relative 'configuration_display_smart_test'
-require_relative 'configuration_display_udap_test'
+require_relative '../dtr_full_ehr_options'
+require_relative 'payer_registration/configuration_display_smart_test'
+require_relative 'payer_registration/configuration_display_udap_test'
 
 module DaVinciDTRTestKit
   class DTRPayerRegistrationGroup < Inferno::TestGroup
@@ -18,31 +18,31 @@ module DaVinciDTRTestKit
     # smart registration tests
     test from: :smart_client_registration_bsca_verification,
          required_suite_options: {
-           client_type: DTRClientOptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
+           client_type: DTRFullEHROptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
          }
     test from: :dtr_client_payer_reg_smart_config_display,
          required_suite_options: {
-           client_type: DTRClientOptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
+           client_type: DTRFullEHROptions::SMART_BACKEND_SERVICES_CONFIDENTIAL_ASYMMETRIC
          }
 
     # udap registration tests
     test from: :udap_client_registration_interaction,
          required_suite_options: {
-           client_type: DTRClientOptions::UDAP_CLIENT_CREDENTIALS
+           client_type: DTRFullEHROptions::UDAP_CLIENT_CREDENTIALS
          },
          config: {
            options: { endpoint_suite_id: :dtr_full_ehr }
          }
     test from: :udap_client_registration_cc_verification,
          required_suite_options: {
-           client_type: DTRClientOptions::UDAP_CLIENT_CREDENTIALS
+           client_type: DTRFullEHROptions::UDAP_CLIENT_CREDENTIALS
          },
          config: {
            options: { endpoint_suite_id: :dtr_full_ehr }
          }
     test from: :dtr_client_payer_reg_udap_config_display,
          required_suite_options: {
-           client_type: DTRClientOptions::UDAP_CLIENT_CREDENTIALS
+           client_type: DTRFullEHROptions::UDAP_CLIENT_CREDENTIALS
          }
   end
 end

data/lib/davinci_dtr_test_kit/{endpoints/mock_payer/next_question_endpoint.rb → full_ehr/v2.0.1/full_ehr_next_question_endpoint.rb}

@@ -1,14 +1,18 @@
-require_relative '../mock_authorization'
-require_relative '../mock_payer'
-require_relative '../../fixtures'
+require 'udap_security_test_kit'
+require_relative '../endpoints/mock_payer'
+require_relative '../fixtures'
 
 module DaVinciDTRTestKit
   module MockPayer
-    class NextQuestionEndpoint < Inferno::DSL::SuiteEndpoint
+    class FullEHRNextQuestionEndpoint < Inferno::DSL::SuiteEndpoint
       include MockPayer
 
       def test_run_identifier
-        MockAuthorization.extract_client_id_from_bearer_token(request)
+        return request.params[:session_path] if request.params[:session_path].present?
+
+        UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+          request.headers['authorization']&.delete_prefix('Bearer ')
+        )
       end
 
       def tags
@@ -16,6 +20,8 @@ module DaVinciDTRTestKit
       end
 
       def make_response
+        return if response.status == 401 # set in update_result (expired token handling there)
+
         response.status = 200
         response.format = 'application/fhir+json'
         response.headers['Access-Control-Allow-Origin'] = '*'
@@ -46,6 +52,11 @@ module DaVinciDTRTestKit
       end
 
       def update_result
+        if UDAPSecurityTestKit::MockUDAPServer.request_has_expired_token?(request)
+          UDAPSecurityTestKit::MockUDAPServer.update_response_for_expired_token(response, 'Bearer token')
+          return
+        end
+
         results_repo.update_result(result.id, 'pass') unless test.config.options[:accepts_multiple_requests]
       end
 
@@ -57,8 +68,6 @@ module DaVinciDTRTestKit
 
       def build_questionnaire_next_response
         input_parameters = parse_fhir_object(request.body.string)
-        return input_parameters if input_parameters.is_a?(FHIR::OperationOutcome)
-
         questionnaire_response = extract_questionnaire_response(input_parameters)
         return questionnaire_response if questionnaire_response.is_a?(FHIR::OperationOutcome)
 
@@ -83,6 +92,8 @@ module DaVinciDTRTestKit
         end
 
         questionnaire_response
+      rescue MockPayer::ParseError => e
+        operation_outcome('error', 'invalid', e.message)
       end
 
       def extract_questionnaire_response(input_parameters)

data/lib/davinci_dtr_test_kit/{endpoints/mock_payer/questionnaire_package_endpoint.rb → full_ehr/v2.0.1/full_ehr_questionnaire_package_endpoint.rb}

@@ -1,14 +1,18 @@
-require_relative '../mock_authorization'
-require_relative '../mock_payer'
-require_relative '../../fixtures'
+require 'udap_security_test_kit'
+require_relative '../endpoints/mock_payer'
+require_relative '../fixtures'
 
 module DaVinciDTRTestKit
   module MockPayer
-    class QuestionnairePackageEndpoint < Inferno::DSL::SuiteEndpoint
+    class FullEHRQuestionnairePackageEndpoint < Inferno::DSL::SuiteEndpoint
       include MockPayer
 
       def test_run_identifier
-        MockAuthorization.extract_client_id_from_bearer_token(request)
+        return request.params[:session_path] if request.params[:session_path].present?
+
+        UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
+          request.headers['authorization']&.delete_prefix('Bearer ')
+        )
       end
 
       def tags
@@ -16,6 +20,8 @@ module DaVinciDTRTestKit
       end
 
       def make_response
+        return if response.status == 401 # set in update_result (expired token handling there)
+
         response.status = 200
         response.format = 'application/fhir+json'
         response.headers['Access-Control-Allow-Origin'] = '*'
@@ -29,14 +35,21 @@ module DaVinciDTRTestKit
       end
 
       def update_result
+        if UDAPSecurityTestKit::MockUDAPServer.request_has_expired_token?(request)
+          UDAPSecurityTestKit::MockUDAPServer.update_response_for_expired_token(response, 'Bearer token')
+          return
+        end
+
         results_repo.update_result(result.id, 'pass') unless test.config.options[:accepts_multiple_requests]
       end
 
       private
 
-      def build_questionnaire_package_response
+      def build_questionnaire_package_response # rubocop:disable Metrics/CyclomaticComplexity
         input_parameters = parse_fhir_object(request.body.string)
-        return input_parameters if input_parameters.is_a?(FHIR::OperationOutcome)
+        unless input_parameters.is_a?(FHIR::Parameters)
+          return operation_outcome('error', 'invalid', 'Request body must be a FHIR Parameters resource.')
+        end
 
         questionnaire_package = Fixtures.questionnaire_package_for_test(test.id)
         unless questionnaire_package
@@ -58,6 +71,8 @@ module DaVinciDTRTestKit
         outcome_param = build_outcome_param(issues)
 
         FHIR::Parameters.new(parameter: [package_bundle_param, outcome_param])
+      rescue MockPayer::ParseError => e
+        operation_outcome('error', 'invalid', e.message)
       end
 
       def find_questionnaire_canonical(questionnaire_package)

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/must_support/dtr_full_ehr_ms_questionnaire_package_request_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../descriptions'
-require_relative '../../urls'
+require_relative '../../../urls'
 require_relative 'questionnaire_must_support_elements'
 
 module DaVinciDTRTestKit

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/must_support/dtr_must_support_attestation_test.rb

@@ -1,8 +1,9 @@
 require 'securerandom'
-require_relative '../../urls'
+require_relative '../../../urls'
 module DaVinciDTRTestKit
   class DTRMustSupportAttestationTest < Inferno::Test
     include URLs
+
     id :dtr_must_support_attest
     title 'Support for mustSupport Elements in Questionnaire (Attestation)'
     description %(

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/must_support/dtr_questionnaire_must_support_test.rb

@@ -1,8 +1,9 @@
-require_relative '../../cql_test'
+require_relative '../../../cross_suite/v2.0.1/cql_test'
 
 module DaVinciDTRTestKit
   class DTRQuestionnaireMustSupportTes < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
+
     id :dtr_questionnaire_must_support
     verifies_requirements 'hl7.fhir.us.davinci-dtr_2.0.1@15', 'hl7.fhir.us.davinci-dtr_2.0.1@65',
                           'hl7.fhir.us.davinci-dtr_2.0.1@66', 'hl7.fhir.us.davinci-dtr_2.0.1@206'
@@ -33,7 +34,7 @@ module DaVinciDTRTestKit
         questionnaires = custom_questionnaires.map { |q| FHIR.from_contents(q.to_json) }.compact
       end
 
-      skip_if questionnaires.blank? || questionnaires.none? { |q| q.is_a?(FHIR::Questionnaire) },
+      skip_if questionnaires.blank? || questionnaires.none?(FHIR::Questionnaire),
               'No Questionnaire resources found.'
 
       skip { assert_must_support_elements_present(questionnaires, profile_url) }

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/payer_registration/configuration_display_smart_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRPayerRegistrationConfigurationSMARTDisplay < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/payer_registration/configuration_display_udap_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRPayerRegistrationConfigurationUDAPDisplay < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/shared/dtr_custom_questionnaire_expressions_test.rb

@@ -1,17 +1,18 @@
-require_relative '../../cql_test'
+require_relative '../../../cross_suite/v2.0.1/cql_test'
 module DaVinciDTRTestKit
   class DTRCustomQuestionnaireExpressionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_custom_questionnaire_expressions
     title %(
-      [USER INPUT VERIFICATION] Custom questionnaire(s) contain items with expressions
+      Custom questionnaire(s) contain items with expressions
       necessary for pre-population
     )
     description %(
       Inferno checks that the custom response has appropriate expressions and that expressions are
       written in cql.
     )
+    simulation_verification
 
     def form_type
       config.options[:form_type] || 'static'

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/shared/dtr_custom_questionnaire_extensions_test.rb

@@ -1,14 +1,15 @@
-require_relative '../../cql_test'
+require_relative '../../../cross_suite/v2.0.1/cql_test'
 module DaVinciDTRTestKit
   class DTRCustomQuestionnaireExtensionsTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_custom_questionnaire_extensions
-    title '[USER INPUT VERIFICATION] Custom questionnaire(s) contain extensions necessary for pre-population'
+    title 'Custom questionnaire(s) contain extensions necessary for pre-population'
     description %(
       Inferno checks that the custom response has appropriate extensions and references to libraries within
       those extensions.
     )
+    simulation_verification
 
     def form_type
       config.options[:form_type] || 'static'

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/shared/dtr_custom_questionnaire_libraries_test.rb

@@ -1,17 +1,18 @@
-require_relative '../../cql_test'
+require_relative '../../../cross_suite/v2.0.1/cql_test'
 module DaVinciDTRTestKit
   class DTRCustomQuestionnaireLibrariesTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_custom_questionnaire_libraries
     title %(
-      [USER INPUT VERIFICATION] Custom Questionnaire Package response parameters contain libraries
+      Custom Questionnaire Package response parameters contain libraries
       necessary for pre-population
     )
     description %(
       Inferno check that the custom response contains no duplicate library names
       and that libraries contain cql and elm data.
     )
+    simulation_verification
 
     def form_type
       config.options[:form_type] || 'static'

data/lib/davinci_dtr_test_kit/{client_groups → full_ehr/v2.0.1}/shared/dtr_custom_questionnaire_package_validation_test.rb

@@ -1,10 +1,10 @@
-require_relative '../../cql_test'
+require_relative '../../../cross_suite/v2.0.1/cql_test'
 module DaVinciDTRTestKit
   class DTRCustomQuestionnairePackageValidationTest < Inferno::Test
     include DaVinciDTRTestKit::CQLTest
 
     id :dtr_custom_qp_validation
-    title '[USER INPUT VERIFICATION] Custom Questionnaire Package response is valid'
+    title 'Custom Questionnaire Package response is valid'
     description %(
       Inferno will validate that the user provided response to the questionnaire-package operation is conformant
       to the
@@ -19,6 +19,7 @@ module DaVinciDTRTestKit
       to the bound ValueSet. Quantity, Coding, and code element bindings will fail if their code/system are not found in
       the valueset.
     )
+    simulation_verification
 
     input :custom_questionnaire_package_response,
           title: 'Custom Questionnaire Package Response JSON',

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_adaptive_request_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../descriptions'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRFullEHRAdaptiveRequestTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_launch_attestation_test.rb

@@ -1,5 +1,5 @@
 require 'securerandom'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRFullEHRLaunchAttestationTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_prepopulation_attestation_test.rb

@@ -1,5 +1,5 @@
 require 'securerandom'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRFullEHRPrepopulationAttestationTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_prepopulation_override_attestation_test.rb

@@ -1,5 +1,5 @@
 require 'securerandom'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRFullEHRPrepopulationOverrideAttestationTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_questionnaire_package_request_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../descriptions'
-require_relative '../../urls'
+require_relative '../../../urls'
 
 module DaVinciDTRTestKit
   class DTRFullEHRQuestionnairePackageRequestTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_questionnaire_response_conformance_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../dtr_questionnaire_response_validation'
+require_relative '../../../cross_suite/v2.0.1/dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
   class DTRFullEHRQuestionnaireResponseConformanceTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{client_groups/full_ehr → full_ehr/v2.0.1/shared}/dtr_full_ehr_questionnaire_response_correctness_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../dtr_questionnaire_response_validation'
+require_relative '../../../cross_suite/v2.0.1/dtr_questionnaire_response_validation'
 
 module DaVinciDTRTestKit
   class DTRFullEHRQuestionnaireResponseCorrectnessTest < Inferno::Test