davinci_dtr_test_kit 0.17.0 → 0.18.0

data/lib/davinci_dtr_test_kit/server/v2.2.0/value_set_expand_support/small_value_set_expansion_test.rb

@@ -0,0 +1,120 @@
+require_relative '../../../tags'
+require_relative '../questionnaire_operation_validation'
+require_relative 'value_set_expansion_validation'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+
+module DaVinciDTRTestKit
+  module DTRPayerServerV220
+    class SmallValueSetExpansionTest < Inferno::Test
+      include QuestionnaireOperationValidation
+      include ValueSetExpansionValidation
+      include MultiRequestMessageHelper
+
+      id :dtr_v220_payer_small_value_set_expansion
+      title 'Verify small ValueSets are expanded'
+      description %(
+        This test verifies that ValueSets with fewer than 40 entries returned by
+        $questionnaire-package are expanded.
+      )
+
+      verifies_requirements 'hl7.fhir.us.davinci-dtr_2.2.0@oper-15'
+
+      run do
+        requests = load_tagged_requests(QUESTIONNAIRE_TAG)
+        skip_if requests.empty?, 'No $questionnaire-package requests were made.'
+
+        expansion_sizes = expansion_sizes_by_url
+
+        requests.each_with_index do |request, request_index|
+          next unless [200, 201].include? request.status
+
+          resource = FHIR.from_contents(request.response_body)
+
+          extract_questionnaire_bundles(resource).each do |bundle|
+            bundle.entry.filter_map(&:resource).grep(FHIR::ValueSet).each do |value_set|
+              url = value_set.url
+              expansion_size = expansion_sizes[url]
+
+              if value_set_expanded?(value_set)
+                if value_set.expansion.present? && !value_set_expansion_current?(value_set)
+                  add_request_message('error', expansion_timestamp_error(value_set, Date.current), request_index)
+                end
+                next
+              end
+
+              next if expansion_size.nil? || expansion_size >= 40
+
+              add_request_message(
+                'error',
+                "ValueSet `#{url}` has #{expansion_size} codes and is not expanded in the " \
+                '$questionnaire-package response.',
+                request_index
+              )
+            end
+          end
+        rescue JSON::ParserError, FHIR::ClientException
+          add_request_message('error', '$questionnaire-package response is not a valid FHIR resource.', request_index)
+        end
+
+        assert_no_error_messages(
+          "#{requests_with_errors_prefix}Small ValueSets returned by $questionnaire-package must be expanded."
+        )
+      end
+
+      def expansion_sizes_by_url
+        load_tagged_requests(VALUE_SET_EXPAND_TAG).filter_map do |request|
+          url = value_set_url_from_expand_request(request)
+          next if url.blank?
+
+          expanded_value_set = FHIR.from_contents(request.response_body)
+
+          next unless expanded_value_set.is_a?(FHIR::ValueSet) &&
+                      expanded_value_set.expansion.present?
+
+          [url, expansion_entry_count(expanded_value_set.expansion.contains)]
+        rescue JSON::ParserError, FHIR::ClientException
+          nil
+        end.to_h
+      end
+
+      def value_set_expanded?(value_set)
+        value_set_expansion_contains_codes?(value_set) ||
+          value_set_compose_contains_only_codes?(value_set)
+      end
+
+      def value_set_expansion_contains_codes?(value_set)
+        value_set.expansion&.contains.present?
+      end
+
+      def value_set_compose_contains_only_codes?(value_set)
+        compose = value_set.compose
+        return false if compose.blank? || compose.exclude.present?
+
+        compose.include.present? &&
+          compose.include.all? do |include|
+            include.concept.present? &&
+              include.filter.blank? &&
+              include.valueSet.blank?
+          end
+      end
+
+      def expansion_entry_count(contains)
+        return 0 if contains.blank?
+
+        contains.sum do |entry|
+          1 + expansion_entry_count(entry.contains)
+        end
+      end
+
+      def value_set_url_from_expand_request(request)
+        parameters = FHIR.from_contents(request.request_body)
+
+        url = parameters.parameter
+          .find { |parameter| parameter.name == 'url' }
+          &.valueUri
+
+        url&.split('|', 2)&.first
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/server/v2.2.0/value_set_expand_support/value_set_expansion_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'value_set_expansion_validation'
+require_relative '../../../tags'
+require_relative '../../../cross_suite/v2.2.0/multi_request_message_helper'
+
+module DaVinciDTRTestKit
+  module DTRPayerServerV220
+    class ValueSetExpansionTest < Inferno::Test
+      include ValueSetExpansionValidation
+      include MultiRequestMessageHelper
+
+      id :dtr_v220_payer_value_set_expansion
+      title 'ValueSet expansions use the current date and active codes'
+      description %(
+        This test verifies that ValueSets returned from `ValueSet/$expand` use the
+        current date as their expansion timestamp and contain only active codes,
+        including codes nested within the expansion hierarchy.
+      )
+      verifies_requirements 'hl7.fhir.us.davinci-dtr_2.2.0@oper-5'
+
+      run do
+        requests = load_tagged_requests(VALUE_SET_EXPAND_TAG)
+        skip_if requests.empty?, 'No ValueSet/$expand requests were made.'
+
+        requests.each_with_index do |request, request_index|
+          value_set = FHIR.from_contents(request.response_body)
+          unless value_set.is_a?(FHIR::ValueSet)
+            add_request_message('error', 'ValueSet/$expand response is not a ValueSet resource.', request_index)
+            next
+          end
+
+          unless value_set.expansion.present?
+            add_request_message('error', 'ValueSet response does not contain an expansion.', request_index)
+            next
+          end
+
+          value_set_expansion_errors(value_set).each do |error|
+            add_request_message('error', error, request_index)
+          end
+        rescue JSON::ParserError, FHIR::ClientException
+          add_request_message('error', 'ValueSet/$expand response is not a valid FHIR resource.', request_index)
+        end
+
+        error_message = "#{requests_with_errors_prefix}ValueSet expansions must use the current date " \
+                        'and contain only active codes. See Messages for details.'
+        assert_no_error_messages(error_message)
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/server/v2.2.0/value_set_expand_support/value_set_expansion_validation.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'date'
+
+module DaVinciDTRTestKit
+  module DTRPayerServerV220
+    module ValueSetExpansionValidation
+      def value_set_expansion_errors(value_set, current_date: Date.current)
+        errors = []
+        unless value_set_expansion_current?(value_set, current_date)
+          errors << expansion_timestamp_error(value_set, current_date)
+        end
+
+        inactive_expansion_codes(value_set).each do |code|
+          errors << inactive_code_error(code)
+        end
+
+        errors
+      end
+
+      def value_set_expansion_current?(value_set, current_date = Date.current)
+        timestamp = value_set.expansion&.timestamp
+        timestamp.present? && Date.parse(timestamp.to_s) == current_date
+      rescue Date::Error
+        false
+      end
+
+      def inactive_expansion_codes(value_set)
+        inactive_codes_in(value_set.expansion&.contains)
+      end
+
+      def inactive_codes_in(contains)
+        Array(contains).flat_map do |code|
+          inactive_code_array = code.inactive == true ? [code] : []
+          inactive_code_array + inactive_codes_in(code.contains)
+        end
+      end
+
+      def expansion_code_identifier(code)
+        [code.system, code.code].compact.join('|').presence || code.display
+      end
+
+      def expansion_timestamp_error(value_set, current_date)
+        timestamp = value_set.expansion&.timestamp
+        return "expansion.timestamp is missing; expected current date `#{current_date}`" if timestamp.blank?
+
+        "expansion.timestamp `#{timestamp}` is not the current date `#{current_date}`"
+      end
+
+      def inactive_code_error(code)
+        identifier = expansion_code_identifier(code)
+        return 'expansion contains an inactive code' if identifier.blank?
+
+        "expansion contains inactive code `#{identifier}`"
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/{endpoints → smart_app/endpoints}/mock_authorization/token_endpoint.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../urls'
+require_relative '../../../urls'
 require_relative '../mock_authorization'
 
 module DaVinciDTRTestKit

data/lib/davinci_dtr_test_kit/{endpoints → smart_app/endpoints}/mock_ehr/fhir_get_endpoint.rb

@@ -51,7 +51,7 @@ module DaVinciDTRTestKit
       def ehr_input_bundle(test, test_result)
         input_name = "#{input_group_prefix(test)}_ehr_bundle"
         ehr_bundle_input = JSON.parse(test_result.input_json).find { |input| input['name'] == input_name }
-        ehr_bundle_input_value = ehr_bundle_input_value = ehr_bundle_input['value'] if ehr_bundle_input.present?
+        ehr_bundle_input_value = ehr_bundle_input['value'] if ehr_bundle_input.present?
         ehr_bundle = FHIR.from_contents(ehr_bundle_input_value) if ehr_bundle_input_value.present?
         ehr_bundle if ehr_bundle.is_a?(FHIR::Bundle)
       rescue StandardError

data/lib/davinci_dtr_test_kit/smart_app/endpoints/mock_payer/smart_app_next_question_endpoint.rb

@@ -0,0 +1,12 @@
+require_relative '../mock_authorization'
+require_relative '../../../full_ehr/v2.0.1/full_ehr_next_question_endpoint'
+
+module DaVinciDTRTestKit
+  module MockPayer
+    class SMARTAppNextQuestionEndpoint < FullEHRNextQuestionEndpoint
+      def test_run_identifier
+        MockAuthorization.extract_client_id_from_bearer_token(request)
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/smart_app/endpoints/mock_payer/smart_app_questionnaire_package_endpoint.rb

@@ -0,0 +1,12 @@
+require_relative '../mock_authorization'
+require_relative '../../../full_ehr/v2.0.1/full_ehr_questionnaire_package_endpoint'
+
+module DaVinciDTRTestKit
+  module MockPayer
+    class SMARTAppQuestionnairePackageEndpoint < FullEHRQuestionnairePackageEndpoint
+      def test_run_identifier
+        MockAuthorization.extract_client_id_from_bearer_token(request)
+      end
+    end
+  end
+end

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire/custom → smart_app/v2.0.1/adaptive_custom}/dtr_smart_app_custom_adaptive_workflow_group.rb

@@ -1,17 +1,17 @@
 require_relative '../../../tags'
 require_relative 'dtr_smart_app_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 '../../shared/dtr_custom_questionnaire_extensions_test'
-require_relative '../../shared/dtr_custom_questionnaire_expressions_test'
-require_relative 'dtr_custom_next_question_response_validation_test'
-require_relative '../../shared/dtr_prepopulation_attestation_test'
-require_relative '../../shared/dtr_prepopulation_override_attestation_test'
-require_relative '../../smart_app/dtr_smart_app_saving_questionnaire_response_group'
-require_relative '../../shared/dtr_questionnaire_response_prepopulation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_interaction/dtr_adaptive_next_question_request_validation_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_interaction/dtr_adaptive_response_validation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_package_validation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_libraries_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_extensions_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_expressions_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_custom/dtr_custom_next_question_response_validation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_prepopulation_attestation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_prepopulation_override_attestation_test'
+require_relative '../tests/dtr_smart_app_saving_questionnaire_response_group'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppCustomAdaptiveWorkflowGroup < Inferno::TestGroup
@@ -88,20 +88,22 @@ module DaVinciDTRTestKit
       test from: :dtr_custom_questionnaire_libraries
       # Test 7: validate the user provided $next-question questionnaire
       test from: :dtr_custom_next_questionnaire_validation
-      # Test 8: verify the custom response has the necessaru extensions for pre-population
+      # Test 8: verify the custom response 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 response 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/adaptive_questionnaire/dinner_order → smart_app/v2.0.1/adaptive_dinner}/dtr_smart_app_adaptive_dinner_workflow_group.rb

@@ -1,10 +1,10 @@
 require_relative '../../../tags'
 require_relative 'dtr_smart_app_adaptive_initial_retrieval_group'
-require_relative '../../smart_app/dtr_smart_app_prepopulation_attestation_test'
-require_relative '../../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
-require_relative 'dtr_adaptive_followup_questions_group'
-require_relative 'dtr_adaptive_completion_group'
-require_relative '../../shared/dtr_questionnaire_response_prepopulation_test'
+require_relative '../tests/dtr_smart_app_prepopulation_attestation_test'
+require_relative '../tests/dtr_smart_app_prepopulation_override_attestation_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_dinner/dtr_adaptive_followup_questions_group'
+require_relative '../../../full_ehr/v2.0.1/adaptive_dinner/dtr_adaptive_completion_group'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppAdaptiveDinnerWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/adaptive_questionnaire/dinner_order → smart_app/v2.0.1/adaptive_dinner}/dtr_smart_app_adaptive_initial_retrieval_group.rb

@@ -1,8 +1,8 @@
 require_relative '../../../tags'
-require_relative '../../smart_app/dtr_smart_app_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 '../tests/dtr_smart_app_adaptive_request_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_interaction/dtr_adaptive_next_question_request_validation_test'
+require_relative '../../../full_ehr/v2.0.1/adaptive_interaction/dtr_adaptive_response_validation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppAdaptiveInitialRetrievalGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{auth_groups → smart_app/v2.0.1/auth}/token_request_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/custom_static → smart_app/v2.0.1}/dtr_smart_app_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 '../smart_app/dtr_smart_app_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 '../smart_app/dtr_smart_app_saving_questionnaire_response_group'
-require_relative '../smart_app/dtr_smart_app_questionnaire_response_correctness_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_package_validation_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_libraries_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_extensions_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_expressions_test'
+require_relative 'tests/dtr_smart_app_questionnaire_package_request_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_prepopulation_attestation_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_rendering_attestation_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_prepopulation_override_attestation_test'
+require_relative 'tests/dtr_smart_app_saving_questionnaire_response_group'
+require_relative 'tests/dtr_smart_app_questionnaire_response_correctness_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppCustomStaticWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/must_support → smart_app/v2.0.1}/dtr_smart_app_questionnaire_must_support_group.rb

@@ -1,10 +1,10 @@
 require_relative '../../urls'
-require_relative 'dtr_smart_app_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_questionnaire_must_support_test'
-require_relative 'dtr_must_support_attestation_test'
-require_relative 'questionnaire_must_support_elements'
+require_relative 'must_support/dtr_smart_app_ms_questionnaire_package_request_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_custom_questionnaire_package_validation_test'
+require_relative '../../full_ehr/v2.0.1/must_support/dtr_questionnaire_must_support_test'
+require_relative '../../full_ehr/v2.0.1/must_support/dtr_must_support_attestation_test'
+require_relative '../../full_ehr/v2.0.1/must_support/questionnaire_must_support_elements'
 
 module DaVinciDTRTestKit
   class DTRSmartAppQuestionnaireMustSupportGroup < 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/respiratory → smart_app/v2.0.1}/dtr_smart_app_respiratory_workflow_group.rb

@@ -1,6 +1,6 @@
-require_relative 'dtr_respiratory_questionnaire_package_group'
-require_relative 'dtr_respiratory_rendering_group'
-require_relative 'dtr_respiratory_questionnaire_response_group'
+require_relative 'static_respiratory/dtr_respiratory_questionnaire_package_group'
+require_relative 'static_respiratory/dtr_respiratory_rendering_group'
+require_relative 'static_respiratory/dtr_respiratory_questionnaire_response_group'
 
 module DaVinciDTRTestKit
   class DTRSmartAppRespiratoryWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/dinner_static → smart_app/v2.0.1}/dtr_smart_app_static_dinner_workflow_group.rb

@@ -1,10 +1,10 @@
-require_relative '../smart_app/dtr_smart_app_questionnaire_package_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
-require_relative '../smart_app/dtr_smart_app_prepopulation_attestation_test'
-require_relative '../smart_app/dtr_smart_app_prepopulation_override_attestation_test'
-require_relative 'dtr_static_dinner_enabled_questions_attestation_test'
-require_relative '../smart_app/dtr_smart_app_saving_questionnaire_response_group'
-require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
+require_relative 'tests/dtr_smart_app_questionnaire_package_request_test'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
+require_relative 'tests/dtr_smart_app_prepopulation_attestation_test'
+require_relative 'tests/dtr_smart_app_prepopulation_override_attestation_test'
+require_relative '../../full_ehr/v2.0.1/static_dinner/dtr_static_dinner_enabled_questions_attestation_test'
+require_relative 'tests/dtr_smart_app_saving_questionnaire_response_group'
+require_relative '../../full_ehr/v2.0.1/shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
   class DTRSmartAppStaticDinnerWorkflowGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{dtr_smart_app_suite.rb → smart_app/v2.0.1/dtr_smart_app_suite.rb}

@@ -1,28 +1,28 @@
-require_relative 'auth_groups/oauth2_authentication_group'
-require_relative 'client_groups/respiratory/dtr_smart_app_respiratory_workflow_group'
-require_relative 'client_groups/dinner_static/dtr_smart_app_static_dinner_workflow_group'
-require_relative 'client_groups/adaptive_questionnaire/dinner_order/dtr_smart_app_adaptive_dinner_workflow_group'
-require_relative 'client_groups/custom_static/dtr_smart_app_custom_static_workflow_group'
-require_relative 'client_groups/adaptive_questionnaire/custom/dtr_smart_app_custom_adaptive_workflow_group'
-require_relative 'client_groups/must_support/dtr_smart_app_questionnaire_must_support_group'
-require_relative 'endpoints/cors'
-require_relative 'endpoints/mock_authorization'
-require_relative 'endpoints/mock_authorization/authorize_endpoint'
-require_relative 'endpoints/mock_authorization/token_endpoint'
-require_relative 'endpoints/mock_payer/questionnaire_package_endpoint'
-require_relative 'endpoints/mock_payer/next_question_endpoint'
-require_relative 'endpoints/mock_ehr'
-require_relative 'endpoints/mock_ehr/questionnaire_response_endpoint'
-require_relative 'endpoints/mock_ehr/fhir_get_endpoint'
-require_relative 'version'
+# require_relative 'oauth2_authentication_group'
+require_relative 'dtr_smart_app_respiratory_workflow_group'
+require_relative 'dtr_smart_app_static_dinner_workflow_group'
+require_relative 'adaptive_dinner/dtr_smart_app_adaptive_dinner_workflow_group'
+require_relative 'dtr_smart_app_custom_static_workflow_group'
+require_relative 'adaptive_custom/dtr_smart_app_custom_adaptive_workflow_group'
+require_relative 'dtr_smart_app_questionnaire_must_support_group'
+require_relative '../../cross_suite/cors'
+require_relative '../endpoints/mock_authorization'
+require_relative '../endpoints/mock_authorization/authorize_endpoint'
+require_relative '../endpoints/mock_authorization/token_endpoint'
+require_relative '../endpoints/mock_payer/smart_app_questionnaire_package_endpoint'
+require_relative '../endpoints/mock_payer/smart_app_next_question_endpoint'
+require_relative '../endpoints/mock_ehr'
+require_relative '../endpoints/mock_ehr/questionnaire_response_endpoint'
+require_relative '../endpoints/mock_ehr/fhir_get_endpoint'
+require_relative '../../version'
 
 module DaVinciDTRTestKit
   class DTRSmartAppSuite < Inferno::TestSuite
     extend CORS
 
     id :dtr_smart_app
-    title 'Da Vinci DTR SMART App Test Suite'
-    description File.read(File.join(__dir__, 'docs', 'dtr_smart_app_suite_description_v201.md'))
+    title 'Da Vinci DTR SMART App Test Suite v2.0.1'
+    description File.read(File.join(__dir__, 'dtr_smart_app_suite_description_v201.md'))
 
     links [
       {
@@ -58,6 +58,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, QUESTIONNAIRE_RESPONSE_PATH, FHIR_RESOURCE_PATH, FHIR_SEARCH_PATH,
@@ -72,8 +76,8 @@ module DaVinciDTRTestKit
     suite_endpoint :post, EHR_TOKEN_PATH, MockAuthorization::TokenEndpoint
 
     # Payer
-    suite_endpoint :post, QUESTIONNAIRE_PACKAGE_PATH, MockPayer::QuestionnairePackageEndpoint
-    suite_endpoint :post, NEXT_PATH, MockPayer::NextQuestionEndpoint
+    suite_endpoint :post, QUESTIONNAIRE_PACKAGE_PATH, MockPayer::SMARTAppQuestionnairePackageEndpoint
+    suite_endpoint :post, NEXT_PATH, MockPayer::SMARTAppNextQuestionEndpoint
 
     # EHR
     route(:get, METADATA_PATH, MockEHR.method(:metadata))

data/lib/davinci_dtr_test_kit/{docs → smart_app/v2.0.1}/dtr_smart_app_suite_description_v201.md

@@ -197,3 +197,11 @@ to retrieve questionnaires.
 Not all questionnaire features that are must support within the DTR IG are currently represented
 in questionnaires tested by the IG. Additional questionnaires testing additional features will
 be added in the future.
+
+### Client data access
+
+DTR SMART Apps are required to support US Core client capabilities to access data used in
+the completion of questionnaires. While clients must be able to fetch data to demonstrate
+pre-population capabilities, this test suite does not currently check that the app
+can access all US Core and DTR data required by the
+[DTR SMART Client Capability Statement](https://hl7.org/fhir/us/davinci-dtr/STU2/CapabilityStatement-dtr-smart-client.html).

data/lib/davinci_dtr_test_kit/{client_groups → smart_app/v2.0.1}/must_support/dtr_smart_app_ms_questionnaire_package_request_test.rb

@@ -1,6 +1,6 @@
 require 'base64'
-require_relative '../../urls'
-require_relative 'questionnaire_must_support_elements'
+require_relative '../../../urls'
+require_relative '../../../full_ehr/v2.0.1/must_support/questionnaire_must_support_elements'
 
 module DaVinciDTRTestKit
   class DTRSmartAppMSQuestionnairePackageRequestTest < Inferno::Test

data/lib/davinci_dtr_test_kit/{auth_groups → smart_app/v2.0.1}/oauth2_authentication_group.rb

@@ -1,5 +1,5 @@
-require_relative 'token_request_test'
-require_relative 'token_validation_test'
+require_relative 'auth/token_request_test'
+require_relative 'auth/token_validation_test'
 
 module DaVinciDTRTestKit
   class OAuth2AuthenticationGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/respiratory → smart_app/v2.0.1/static_respiratory}/dtr_respiratory_questionnaire_package_group.rb

@@ -1,5 +1,5 @@
 require_relative 'dtr_respiratory_questionnaire_package_request_test'
-require_relative '../shared/dtr_questionnaire_package_request_validation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_package_request_validation_test'
 
 module DaVinciDTRTestKit
   class DTRRespiratoryQuestionnairePackageGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/respiratory → smart_app/v2.0.1/static_respiratory}/dtr_respiratory_questionnaire_package_request_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/respiratory → smart_app/v2.0.1/static_respiratory}/dtr_respiratory_questionnaire_response_group.rb

@@ -1,6 +1,6 @@
 require_relative 'dtr_respiratory_questionnaire_response_save_test'
-require_relative '../shared/dtr_questionnaire_response_basic_conformance_test'
-require_relative '../shared/dtr_questionnaire_response_prepopulation_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_response_basic_conformance_test'
+require_relative '../../../full_ehr/v2.0.1/shared/dtr_questionnaire_response_prepopulation_test'
 
 module DaVinciDTRTestKit
   class DTRRespiratoryQuestionnaireResponseGroup < Inferno::TestGroup

data/lib/davinci_dtr_test_kit/{client_groups/respiratory → smart_app/v2.0.1/static_respiratory}/dtr_respiratory_questionnaire_response_save_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/respiratory → smart_app/v2.0.1/static_respiratory}/dtr_respiratory_rendering_attestation_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/smart_app → smart_app/v2.0.1/tests}/dtr_smart_app_adaptive_request_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/smart_app → smart_app/v2.0.1/tests}/dtr_smart_app_prepopulation_attestation_test.rb

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

data/lib/davinci_dtr_test_kit/{client_groups/smart_app → smart_app/v2.0.1/tests}/dtr_smart_app_prepopulation_override_attestation_test.rb

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